Skip to content

NEST-561: Add label editors and fix already existing ones #201

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

Merged
merged 5 commits into from
May 14, 2025
Merged

NEST-561: Add label editors and fix already existing ones #201

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
240c4a6
Adding label editors
wAsnk Apr 24, 2025
7014eb0
Fix input
wAsnk Apr 24, 2025
17c1600
Merge remote-tracking branch 'origin/dev' into issue/NEST-561
wAsnk Apr 28, 2025
6c8eeed
Merge remote-tracking branch 'origin/dev' into issue/NEST-561
wAsnk Apr 29, 2025
a12898a
Merge remote-tracking branch 'origin/dev' into issue/NEST-561
BenedekFarkas May 6, 2025
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
6 changes: 6 additions & 0 deletions Lombiq.HelpfulExtensions/Constants/Editors.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
namespace Lombiq.HelpfulExtensions.Constants;

public static class Editors
{
public const string Label = nameof(Label);
}
28 changes: 28 additions & 0 deletions Lombiq.HelpfulExtensions/Views/BooleanField-Label.Edit.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
@model OrchardCore.ContentFields.ViewModels.EditBooleanFieldViewModel
@using OrchardCore
@using OrchardCore.ContentFields.Settings
@using OrchardCore.ContentManagement.Metadata.Models

@{
var settings = Model.PartFieldDefinition.GetSettings<BooleanFieldSettings>();
}

<div class="@Orchard.GetFieldWrapperClasses(Model.PartFieldDefinition)" id="@Html.IdFor(x => x.Value)_FieldWrapper">
<div class="@Orchard.GetEndClasses(true)">
<div>
<label class="form-check-label">
@(string.IsNullOrEmpty(settings.Label) ? Model.PartFieldDefinition.DisplayName() : settings.Label)
</label>
</div>
<div>
<input hidden asp-for="Value"/>
<strong>@Model.Value</strong>
</div>
@if (!string.IsNullOrEmpty(settings.Hint))
{
<div>
<span class="hint">@settings.Hint</span>
</div>
}
</div>
</div>
4 changes: 4 additions & 0 deletions Lombiq.HelpfulExtensions/Views/BooleanField-Label.Option.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
@{
string currentEditor = Model.Editor;
}
<option value="Label" selected="@(currentEditor == "Label")">@T["Label (read-only)"]</option>
24 changes: 24 additions & 0 deletions Lombiq.HelpfulExtensions/Views/DateTimeField-Label.Edit.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
@model OrchardCore.ContentFields.ViewModels.EditDateTimeFieldViewModel
@using OrchardCore
@using OrchardCore.ContentFields.Settings
@using OrchardCore.ContentManagement.Metadata.Models
@{
var settings = Model.PartFieldDefinition.GetSettings<DateTimeFieldSettings>();
}
<script asp-name="jQuery-ui-i18n" at="Foot"></script>
<div class="@Orchard.GetFieldWrapperClasses(Model.PartFieldDefinition)" id="@Html.IdFor(x => x.LocalDateTime)_FieldWrapper">
<label class="@Orchard.GetLabelClasses(inputRequired: settings.Required)">@Model.PartFieldDefinition.DisplayName()</label>
<div class="@Orchard.GetEndClasses()">
<div class="@Orchard.GetLimitedWidthWrapperClasses()">
<div class="@Orchard.GetLimitedWidthClasses()">
<input hidden asp-for="LocalDateTime" />
<strong>@(Model.LocalDateTime.HasValue ? Model.LocalDateTime.Value : T["Not set."])</strong>
</div>
</div>

@if (!string.IsNullOrEmpty(settings.Hint))
{
<span class="hint">@settings.Hint</span>
}
</div>
</div>
4 changes: 4 additions & 0 deletions Lombiq.HelpfulExtensions/Views/DateTimeField-Label.Option.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
@{
string currentEditor = Model.Editor;
}
<option value="Label" selected="@(currentEditor == "Label")">@T["Label (read-only)"]</option>
1 change: 1 addition & 0 deletions Lombiq.HelpfulExtensions/Views/NumericField-Label.Edit.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
<span class="input-group-text">@max</span>
}
</div>
<input hidden asp-for="Value" />
<span asp-validation-for="Value"></span>
</div>
</div>
Expand Down
3 changes: 2 additions & 1 deletion Lombiq.HelpfulExtensions/Views/TextField-Label.Edit.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,11 @@
<div class="@Orchard.GetFieldWrapperClasses(Model.PartFieldDefinition)" id="@Html.IdFor(x => x.Text)_FieldWrapper">
<label class="@Orchard.GetLabelClasses()">@Model.PartFieldDefinition.DisplayName()</label>
<div class="@Orchard.GetEndClasses()">
<input hidden asp-for="Text" />
<strong>@(Model.Text ?? T["<empty>"].Value)</strong>
@if (!string.IsNullOrEmpty(settings.Hint))
{
<span class="hint">@settings.Hint</span>
<span class="hint">@settings.Hint</span>
}
</div>
</div>
Loading