Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Improve performance for CssClass extensions #14615

Merged
merged 6 commits into from
Nov 2, 2023
Merged

Improve performance for CssClass extensions #14615

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
b2d58eb
Improve performance for CssClass extensions
MikeAlhayek Oct 31, 2023
d5ff620
Cleanup
MikeAlhayek Oct 31, 2023
24cdea4
update AppendValue helper
MikeAlhayek Oct 31, 2023
0360eef
cleanup
MikeAlhayek Nov 1, 2023
6c8aa7d
Cleanup
MikeAlhayek Nov 2, 2023
3041bba
cleanup
MikeAlhayek Nov 2, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions src/OrchardCore.Modules/OrchardCore.AdminDashboard/Views/DashboardPart.Edit.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,25 +1,25 @@
@using OrchardCore
@model DashboardPartViewModel

<div class="@Orchard.GetWrapperCssClasses()" asp-validation-class-for="Position">
<label asp-for="Position" class="@Orchard.GetLabelCssClasses()">@T["Position"] </label>
<div class="@Orchard.GetEndCssClasses()">
<div class="@Orchard.GetWrapperClasses()" asp-validation-class-for="Position">
<label asp-for="Position" class="@Orchard.GetLabelClasses()">@T["Position"] </label>
<div class="@Orchard.GetEndClasses()">
<input asp-for="Position" class="form-control" />
<span asp-validation-for="Position"></span>
</div>
</div>

<div class="@Orchard.GetWrapperCssClasses()" asp-validation-class-for="Width">
<div class="@Orchard.GetWrapperClasses()" asp-validation-class-for="Width">
<label asp-for="Width" class="@Orchard.GetLabelCssClasses()">@T["Width"] </label>

Check warning on line 13 in src/OrchardCore.Modules/OrchardCore.AdminDashboard/Views/DashboardPart.Edit.cshtml

View workflow job for this annotation

GitHub Actions / Build & Test (ubuntu-latest) 

'CssOrchardHelperExtensions.GetLabelCssClasses(IOrchardHelper, params string[])' is obsolete: 'Please use GetLabelClasses instead, as this method is deprecated and will be removed in upcoming versions.'

Check warning on line 13 in src/OrchardCore.Modules/OrchardCore.AdminDashboard/Views/DashboardPart.Edit.cshtml

View workflow job for this annotation

GitHub Actions / Build & Test (windows-latest) 

'CssOrchardHelperExtensions.GetLabelCssClasses(IOrchardHelper, params string[])' is obsolete: 'Please use GetLabelClasses instead, as this method is deprecated and will be removed in upcoming versions.'
<div class="@Orchard.GetEndCssClasses()">

Check warning on line 14 in src/OrchardCore.Modules/OrchardCore.AdminDashboard/Views/DashboardPart.Edit.cshtml

View workflow job for this annotation

GitHub Actions / Build & Test (windows-latest) 

'CssOrchardHelperExtensions.GetEndCssClasses(IOrchardHelper, params string[])' is obsolete: 'Please use GetEndClasses instead, as this method is deprecated and will be removed in upcoming versions.'
<input asp-for="Width" class="form-control" />
<span asp-validation-for="Width"></span>
</div>
</div>

<div class="@Orchard.GetWrapperCssClasses()" asp-validation-class-for="Height">
<div class="@Orchard.GetWrapperClasses()" asp-validation-class-for="Height">
<label asp-for="Height" class="@Orchard.GetLabelCssClasses()">@T["Height"] </label>

Check warning on line 21 in src/OrchardCore.Modules/OrchardCore.AdminDashboard/Views/DashboardPart.Edit.cshtml

View workflow job for this annotation

GitHub Actions / Build & Test (windows-latest) 

'CssOrchardHelperExtensions.GetLabelCssClasses(IOrchardHelper, params string[])' is obsolete: 'Please use GetLabelClasses instead, as this method is deprecated and will be removed in upcoming versions.'
<div class="@Orchard.GetEndCssClasses()">

Check warning on line 22 in src/OrchardCore.Modules/OrchardCore.AdminDashboard/Views/DashboardPart.Edit.cshtml

View workflow job for this annotation

GitHub Actions / Build & Test (windows-latest) 

'CssOrchardHelperExtensions.GetEndCssClasses(IOrchardHelper, params string[])' is obsolete: 'Please use GetEndClasses instead, as this method is deprecated and will be removed in upcoming versions.'
<input asp-for="Height" class="form-control" />
<span asp-validation-for="Height"></span>
</div>
Expand Down
6 changes: 3 additions & 3 deletions src/OrchardCore.Modules/OrchardCore.Alias/Views/AliasPart.Edit.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@
var culture = await Orchard.GetContentCultureAsync(Model.AliasPart.ContentItem);
}

<div class="@Orchard.GetWrapperCssClasses()" asp-validation-class-for="Alias">
<label asp-for="Alias" class="@Orchard.GetLabelCssClasses()">@T["Alias"] </label>
<div class="@Orchard.GetEndCssClasses()">
<div class="@Orchard.GetWrapperClasses()" asp-validation-class-for="Alias">
<label asp-for="Alias" class="@Orchard.GetLabelClasses()">@T["Alias"] </label>
<div class="@Orchard.GetEndClasses()">
<input asp-for="Alias" class="form-control text-muted" disabled="@(Model.Settings?.Options == AliasPartOptions.GeneratedDisabled)" dir="@culture.GetLanguageDirection()" />
<span asp-validation-for="Alias"></span>
<span class="hint">
Expand Down
26 changes: 13 additions & 13 deletions src/OrchardCore.Modules/OrchardCore.Autoroute/Views/AutoroutePart.Edit.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@

@if (Model.Settings.AllowDisabled)
{
<div class="@Orchard.GetWrapperCssClasses()">
<div class="@Orchard.GetEndCssClasses(true)">
<div class="@Orchard.GetWrapperClasses()">
<div class="@Orchard.GetEndClasses(true)">
<div class="form-check">
<input type="checkbox" class="form-check-input" asp-for="Disabled" checked="@Model.Disabled" />
<label class="form-check-label" asp-for="Disabled">@T["Disabled"]</label>
Expand All @@ -27,9 +27,9 @@
}

<div class="autoroute-disabled" style="@(Model.Disabled ? "display: none" : string.Empty)">
<div class="@Orchard.GetWrapperCssClasses()" asp-validation-class-for="Path">
<label asp-for="Path" class="@Orchard.GetLabelCssClasses()">@T["Permalink"]</label>
<div class="@Orchard.GetEndCssClasses()">
<div class="@Orchard.GetWrapperClasses()" asp-validation-class-for="Path">
<label asp-for="Path" class="@Orchard.GetLabelClasses()">@T["Permalink"]</label>
<div class="@Orchard.GetEndClasses()">
<div class="input-group">
@if (!string.IsNullOrWhiteSpace(site.BaseUrl))
{
Expand Down Expand Up @@ -64,8 +64,8 @@
{
if (showHomepageOption)
{
<div class="@Orchard.GetWrapperCssClasses()">
<div class="@Orchard.GetEndCssClasses(true)">
<div class="@Orchard.GetWrapperClasses()">
<div class="@Orchard.GetEndClasses(true)">
<div class="form-check">
<input type="checkbox" class="form-check-input" asp-for="SetHomepage" checked="@Model.SetHomepage" />
<label class="form-check-label" asp-for="SetHomepage">@T["Set as homepage"]</label>
Expand All @@ -79,8 +79,8 @@

@if (Model.Settings.AllowUpdatePath)
{
<div class="@Orchard.GetWrapperCssClasses()">
<div class="@Orchard.GetEndCssClasses(true)">
<div class="@Orchard.GetWrapperClasses()">
<div class="@Orchard.GetEndClasses(true)">
<div class="form-check">
<input type="checkbox" class="form-check-input" asp-for="UpdatePath" checked="@Model.UpdatePath" />
<label class="form-check-label" asp-for="UpdatePath">@T["Refresh the path"]</label>
Expand All @@ -92,8 +92,8 @@

@if (containedContentItemsAspect.Accessors.Any() && Model.Settings.AllowRouteContainedItems)
{
<div class="@Orchard.GetWrapperCssClasses()">
<div class="@Orchard.GetEndCssClasses(true)">
<div class="@Orchard.GetWrapperClasses()">
<div class="@Orchard.GetEndClasses(true)">
<div class="form-check">
<input type="checkbox" class="form-check-input" asp-for="RouteContainedItems" checked="@Model.RouteContainedItems" />
<label class="form-check-label" asp-for="RouteContainedItems">@T["Route contained items"]</label>
Expand All @@ -105,8 +105,8 @@

@if (Model.Settings.ManageContainedItemRoutes && Model.Settings.AllowAbsolutePath)
{
<div class="@Orchard.GetWrapperCssClasses()">
<div class="@Orchard.GetEndCssClasses(true)">
<div class="@Orchard.GetWrapperClasses()">
<div class="@Orchard.GetEndClasses(true)">
<div class="form-check">
<input type="checkbox" class="form-check-input" asp-for="Absolute" checked="@Model.Absolute" />
<label class="form-check-label" asp-for="Absolute">@T["Absolute"]</label>
Expand Down
32 changes: 16 additions & 16 deletions src/OrchardCore.Modules/OrchardCore.BackgroundTasks/Views/BackgroundTask/Edit.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,23 +19,23 @@
<div class="tab-content" id="tabs">
<div class="tab-pane fade show active" id="properties" role="tabpanel" aria-labelledby="properties-tab">

<div class="@Orchard.GetWrapperCssClasses()" asp-validation-class-for="Title">
<label asp-for="Title" class="@Orchard.GetLabelCssClasses()">@T["Title"]</label>
<div class="@Orchard.GetEndCssClasses()">
<div class="@Orchard.GetWrapperClasses()" asp-validation-class-for="Title">
<label asp-for="Title" class="@Orchard.GetLabelClasses()">@T["Title"]</label>
<div class="@Orchard.GetEndClasses()">
<input asp-for="Title" class="form-control-plaintext" readonly />
</div>
</div>

<div class="@Orchard.GetWrapperCssClasses()" asp-validation-class-for="Description">
<label asp-for="Description" class="@Orchard.GetLabelCssClasses()">@T["Description"]</label>
<div class="@Orchard.GetEndCssClasses()">
<div class="@Orchard.GetWrapperClasses()" asp-validation-class-for="Description">
<label asp-for="Description" class="@Orchard.GetLabelClasses()">@T["Description"]</label>
<div class="@Orchard.GetEndClasses()">
<input asp-for="Description" class="form-control-plaintext" />
</div>
</div>

<div class="@Orchard.GetWrapperCssClasses()" asp-validation-class-for="Schedule">
<label asp-for="Schedule" class="@Orchard.GetLabelCssClasses()">@T["Schedule"]</label>
<div class="@Orchard.GetWrapperClasses()" asp-validation-class-for="Schedule">
<label asp-for="Schedule" class="@Orchard.GetLabelClasses()">@T["Schedule"]</label>
<div class="@Orchard.GetEndCssClasses()">

Check warning on line 38 in src/OrchardCore.Modules/OrchardCore.BackgroundTasks/Views/BackgroundTask/Edit.cshtml

View workflow job for this annotation

GitHub Actions / Build & Test (ubuntu-latest) 

'CssOrchardHelperExtensions.GetEndCssClasses(IOrchardHelper, params string[])' is obsolete: 'Please use GetEndClasses instead, as this method is deprecated and will be removed in upcoming versions.'

Check warning on line 38 in src/OrchardCore.Modules/OrchardCore.BackgroundTasks/Views/BackgroundTask/Edit.cshtml

View workflow job for this annotation

GitHub Actions / Build & Test (windows-latest) 

'CssOrchardHelperExtensions.GetEndCssClasses(IOrchardHelper, params string[])' is obsolete: 'Please use GetEndClasses instead, as this method is deprecated and will be removed in upcoming versions.'
<div class="input-group mb-3">
<input asp-for="Schedule" class="form-control" />
<button id="use-default-schedule" class="btn btn-outline-success">@T["Reset Schedule"]</button>
Expand All @@ -44,8 +44,8 @@
</div>
</div>

<div class="@Orchard.GetWrapperCssClasses()">
<div class="@Orchard.GetEndCssClasses(true)">
<div class="@Orchard.GetWrapperClasses()">
<div class="@Orchard.GetEndClasses(true)">
<div class="form-check">
<input type="checkbox" class="form-check-input" asp-for="UsePipeline" checked="@Model.UsePipeline" />
<label class="form-check-label" asp-for="UsePipeline">@T["Use Tenant Pipeline"]</label>
Expand All @@ -59,18 +59,18 @@
</div>

<div class="tab-pane fade" id="advanced" role="tabpanel" aria-labelledby="advanced-tab">
<div class="@Orchard.GetWrapperCssClasses()" asp-validation-class-for="LockTimeout">
<label asp-for="LockTimeout" class="@Orchard.GetLabelCssClasses()">@T["Lock timeout (ms)"]</label>
<div class="@Orchard.GetEndCssClasses()">
<div class="@Orchard.GetWrapperClasses()" asp-validation-class-for="LockTimeout">
<label asp-for="LockTimeout" class="@Orchard.GetLabelClasses()">@T["Lock timeout (ms)"]</label>
<div class="@Orchard.GetEndClasses()">
<input asp-for="LockTimeout" type="number" min="0" max="30000" class="form-control">
<span class="hint">@T["The timeout in milliseconds to acquire a lock before executing the task atomically. Leave it to zero to not use any locking."]</span>
<span class="hint">@T["Ignored if there is no distributed lock feature enabled."]</span>
</div>
</div>

<div class="@Orchard.GetWrapperCssClasses()" asp-validation-class-for="LockExpiration">
<label asp-for="LockExpiration" class="@Orchard.GetLabelCssClasses()">@T["Lock expiration (ms)"]</label>
<div class="@Orchard.GetEndCssClasses()">
<div class="@Orchard.GetWrapperClasses()" asp-validation-class-for="LockExpiration">
<label asp-for="LockExpiration" class="@Orchard.GetLabelClasses()">@T["Lock expiration (ms)"]</label>
<div class="@Orchard.GetEndClasses()">
<input asp-for="LockExpiration" type="number" min="0" max="30000" class="form-control">
<span class="hint">@T["The expiration in milliseconds of the lock acquired before executing the task atomically. Leave it to zero to not use any locking."]</span>
<span class="hint">@T["Ignored if there is no distributed lock feature enabled."]</span>
Expand Down
4 changes: 2 additions & 2 deletions src/OrchardCore.Modules/OrchardCore.ContentFields/Views/BooleanField-Switch.Edit.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
var settings = Model.PartFieldDefinition.GetSettings<BooleanFieldSettings>();
}

<div class="@Orchard.GetFieldWrapperCssClasses(Model.PartFieldDefinition)" id="@Html.IdFor(x => x.Value)_FieldWrapper">
<div class="@Orchard.GetEndCssClasses(true)">
<div class="@Orchard.GetFieldWrapperClasses(Model.PartFieldDefinition)" id="@Html.IdFor(x => x.Value)_FieldWrapper">
<div class="@Orchard.GetEndClasses(true)">
<div class="form-check form-switch">
<input asp-for="Value" type="checkbox" class="form-check-input content-preview-select" checked="@Model.Value" />
<label asp-for="Value" class="form-check-label">@(string.IsNullOrEmpty(settings.Label) ? Model.PartFieldDefinition.DisplayName() : settings.Label)</label>
Expand Down
4 changes: 2 additions & 2 deletions src/OrchardCore.Modules/OrchardCore.ContentFields/Views/BooleanField.Edit.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
var settings = Model.PartFieldDefinition.GetSettings<BooleanFieldSettings>();
}

<div class="@Orchard.GetFieldWrapperCssClasses(Model.PartFieldDefinition)" id="@Html.IdFor(x => x.Value)_FieldWrapper">
<div class="@Orchard.GetEndCssClasses(true)">
<div class="@Orchard.GetFieldWrapperClasses(Model.PartFieldDefinition)" id="@Html.IdFor(x => x.Value)_FieldWrapper">
<div class="@Orchard.GetEndClasses(true)">
<div class="form-check">
<input asp-for="Value" type="checkbox" class="form-check-input content-preview-select" checked="@Model.Value" />
<label class="form-check-label" asp-for="Value">
Expand Down
6 changes: 3 additions & 3 deletions src/OrchardCore.Modules/OrchardCore.ContentFields/Views/ContentPickerField.Edit.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@
<script asp-name="vue-multiselect-wrapper" asp-src="~/OrchardCore.ContentFields/Scripts/vue-multiselect-wrapper.js" at="Foot" depends-on="vuejs, vue-multiselect, sortable, vuedraggable"></script>
<style asp-name="vue-multiselect" at="Foot"></style>

<div class="@Orchard.GetFieldWrapperCssClasses(Model.PartFieldDefinition)" id="@Html.IdFor(x => x.ContentItemIds)_FieldWrapper">
<label asp-for="ContentItemIds" class="@Orchard.GetLabelCssClasses()">@Model.PartFieldDefinition.DisplayName()</label>
<div class="@Orchard.GetEndCssClasses()">
<div class="@Orchard.GetFieldWrapperClasses(Model.PartFieldDefinition)" id="@Html.IdFor(x => x.ContentItemIds)_FieldWrapper">
<label asp-for="ContentItemIds" class="@Orchard.GetLabelClasses()">@Model.PartFieldDefinition.DisplayName()</label>
<div class="@Orchard.GetEndClasses()">
<div id="@vueElementId" class="vue-multiselect" data-part="@partName" data-field="@fieldName" data-editor-type="ContentPicker" data-selected-items="@selectedItems" data-search-url="@searchUrl" data-multiple="@multiple">

<ul class="mb-1 list-group w-lg-75 w-xxl-50 content-picker-default__list" v-show="arrayOfItems.length" v-cloak>
Expand Down
10 changes: 5 additions & 5 deletions src/OrchardCore.Modules/OrchardCore.ContentFields/Views/DateField-Localized.Edit.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@
var datepickerId = Html.IdFor(m => m.Value);
}

<div class="@Orchard.GetWrapperCssClasses()">
<label asp-for="Value" class="@Orchard.GetLabelCssClasses()">@Model.PartFieldDefinition.DisplayName()</label>
<div class="@Orchard.GetEndCssClasses()">
<div class="@Orchard.GetLimitedWidthWrapperCssClasses()">
<div class="@Orchard.GetLimitedWidthCssClasses()">
<div class="@Orchard.GetWrapperClasses()">
<label asp-for="Value" class="@Orchard.GetLabelClasses()">@Model.PartFieldDefinition.DisplayName()</label>
<div class="@Orchard.GetEndClasses()">
<div class="@Orchard.GetLimitedWidthWrapperClasses()">
<div class="@Orchard.GetLimitedWidthClasses()">
<input asp-for="Value" type="text" class="form-control content-preview-select datepicker" required="@settings.Required" />
</div>
</div>
Expand Down
10 changes: 5 additions & 5 deletions src/OrchardCore.Modules/OrchardCore.ContentFields/Views/DateField.Edit.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@
}

<script asp-name="jQuery-ui-i18n" at="Foot"></script>
<div class="@Orchard.GetFieldWrapperCssClasses(Model.PartFieldDefinition)" id="@Html.IdFor(x => x.Value)_FieldWrapper">
<label asp-for="Value" class="@Orchard.GetLabelCssClasses()">@Model.PartFieldDefinition.DisplayName()</label>
<div class="@Orchard.GetEndCssClasses()">
<div class="@Orchard.GetLimitedWidthWrapperCssClasses()">
<div class="@Orchard.GetLimitedWidthCssClasses()">
<div class="@Orchard.GetFieldWrapperClasses(Model.PartFieldDefinition)" id="@Html.IdFor(x => x.Value)_FieldWrapper">
<label asp-for="Value" class="@Orchard.GetLabelClasses()">@Model.PartFieldDefinition.DisplayName()</label>
<div class="@Orchard.GetEndClasses()">
<div class="@Orchard.GetLimitedWidthWrapperClasses()">
<div class="@Orchard.GetLimitedWidthClasses()">
<input asp-for="Value" type="date" class="form-control content-preview-select" required="@settings.Required" />
</div>
</div>
Expand Down
10 changes: 5 additions & 5 deletions src/OrchardCore.Modules/OrchardCore.ContentFields/Views/DateTimeField.Edit.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@
var settings = Model.PartFieldDefinition.GetSettings<DateTimeFieldSettings>();
}
<script asp-name="jQuery-ui-i18n" at="Foot"></script>
<div class="@Orchard.GetFieldWrapperCssClasses(Model.PartFieldDefinition)" id="@Html.IdFor(x => x.LocalDateTime)_FieldWrapper">
<label asp-for="LocalDateTime" class="@Orchard.GetLabelCssClasses()">@Model.PartFieldDefinition.DisplayName()</label>
<div class="@Orchard.GetEndCssClasses()">
<div class="@Orchard.GetLimitedWidthWrapperCssClasses()">
<div class="@Orchard.GetLimitedWidthCssClasses()">
<div class="@Orchard.GetFieldWrapperClasses(Model.PartFieldDefinition)" id="@Html.IdFor(x => x.LocalDateTime)_FieldWrapper">
<label asp-for="LocalDateTime" class="@Orchard.GetLabelClasses()">@Model.PartFieldDefinition.DisplayName()</label>
<div class="@Orchard.GetEndClasses()">
<div class="@Orchard.GetLimitedWidthWrapperClasses()">
<div class="@Orchard.GetLimitedWidthClasses()">
<input asp-for="LocalDateTime" type="datetime-local" class="form-control content-preview-select" required="@settings.Required" />
</div>
</div>
Expand Down
6 changes: 3 additions & 3 deletions src/OrchardCore.Modules/OrchardCore.ContentFields/Views/HtmlField-Monaco.Edit.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@
var culture = await Orchard.GetContentCultureAsync(Model.Field.ContentItem);
}

<div class="@Orchard.GetFieldWrapperCssClasses(Model.PartFieldDefinition)" id="@Html.IdFor(x => x.Html)_FieldWrapper">
<label asp-for="Html" class="@Orchard.GetLabelCssClasses()">@Model.PartFieldDefinition.DisplayName()</label>
<div class="@Orchard.GetEndCssClasses()">
<div class="@Orchard.GetFieldWrapperClasses(Model.PartFieldDefinition)" id="@Html.IdFor(x => x.Html)_FieldWrapper">
<label asp-for="Html" class="@Orchard.GetLabelClasses()">@Model.PartFieldDefinition.DisplayName()</label>
<div class="@Orchard.GetEndClasses()">
@await DisplayAsync(await New.ShortcodeModal())
<div id="@Html.IdFor(x => x.Html)_editor" asp-for="Text" style="min-height: 400px;" class="form-control" dir="@culture.GetLanguageDirection()"></div>
<textarea asp-for="Html" hidden>@Html.Raw(Model.Html)</textarea>
Expand Down
6 changes: 3 additions & 3 deletions src/OrchardCore.Modules/OrchardCore.ContentFields/Views/HtmlField-Multiline.Edit.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@
var culture = await Orchard.GetContentCultureAsync(Model.Field.ContentItem);
}

<div class="@Orchard.GetFieldWrapperCssClasses(Model.PartFieldDefinition)" id="@Html.IdFor(x => x.Html)_FieldWrapper">
<label asp-for="Html" class="@Orchard.GetLabelCssClasses()">@Model.PartFieldDefinition.DisplayName()</label>
<div class="@Orchard.GetEndCssClasses()">
<div class="@Orchard.GetFieldWrapperClasses(Model.PartFieldDefinition)" id="@Html.IdFor(x => x.Html)_FieldWrapper">
<label asp-for="Html" class="@Orchard.GetLabelClasses()">@Model.PartFieldDefinition.DisplayName()</label>
<div class="@Orchard.GetEndClasses()">
@await DisplayAsync(await New.ShortcodeModal())
<textarea asp-for="Html" rows="5" class="form-control content-preview-text shortcode-modal-input" dir="@culture.GetLanguageDirection()"></textarea>
@if (!string.IsNullOrEmpty(settings.Hint))
Expand Down
6 changes: 3 additions & 3 deletions src/OrchardCore.Modules/OrchardCore.ContentFields/Views/HtmlField-Trumbowyg.Edit.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,9 @@ else
<script asp-src="~/OrchardCore.ContentFields/Scripts/trumbowyg.media.tag.min.js" debug-src="~/OrchardCore.ContentFields/Scripts/trumbowyg.media.tag.js" depends-on="trumbowyg" at="Foot"></script>
}

<div class="@Orchard.GetFieldWrapperCssClasses(Model.PartFieldDefinition)" id="@Html.IdFor(x => x.Html)_FieldWrapper">
<label asp-for="Html" class="@Orchard.GetLabelCssClasses()">@Model.PartFieldDefinition.DisplayName()</label>
<div class="@Orchard.GetEndCssClasses()">
<div class="@Orchard.GetFieldWrapperClasses(Model.PartFieldDefinition)" id="@Html.IdFor(x => x.Html)_FieldWrapper">
<label asp-for="Html" class="@Orchard.GetLabelClasses()">@Model.PartFieldDefinition.DisplayName()</label>
<div class="@Orchard.GetEndClasses()">
@await DisplayAsync(await New.ShortcodeModal())
@if (culture.IsRightToLeft())
{
Expand Down
6 changes: 3 additions & 3 deletions src/OrchardCore.Modules/OrchardCore.ContentFields/Views/HtmlField-Wysiwyg.Edit.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@
<script asp-name="trumbowyg-shortcodes" at="Foot"></script>


<div class="@Orchard.GetFieldWrapperCssClasses(Model.PartFieldDefinition)" id="@Html.IdFor(x => x.Html)_FieldWrapper">
<label asp-for="Html" class="@Orchard.GetLabelCssClasses()">@Model.PartFieldDefinition.DisplayName()</label>
<div class="@Orchard.GetEndCssClasses()">
<div class="@Orchard.GetFieldWrapperClasses(Model.PartFieldDefinition)" id="@Html.IdFor(x => x.Html)_FieldWrapper">
<label asp-for="Html" class="@Orchard.GetLabelClasses()">@Model.PartFieldDefinition.DisplayName()</label>
<div class="@Orchard.GetEndClasses()">
@await DisplayAsync(await New.ShortcodeModal())
@if (culture.IsRightToLeft())
{
Expand Down
Loading
Loading