From 9bb28e7b39d2a6e5623f2b1c90f86eaf86db690a Mon Sep 17 00:00:00 2001 From: Ben Ramey Date: Tue, 30 Apr 2024 20:42:09 -0500 Subject: [PATCH] Delete replaced views --- src/OAP/Oap.Theme/Views/ButtonPart.cshtml | 16 ------ .../Content-OapApplicationFormStep.cshtml | 11 ---- src/OAP/Oap.Theme/Views/Form-FlowPart.cshtml | 13 ----- src/OAP/Oap.Theme/Views/Form.Wrapper.cshtml | 36 ------------- .../Views/FormElementLabelPart.cshtml | 19 ------- src/OAP/Oap.Theme/Views/HtmlBodyPart.cshtml | 5 -- .../Oap.Theme/Views/Input-HtmlBodyPart.cshtml | 7 --- src/OAP/Oap.Theme/Views/InputPart.cshtml | 40 -------------- src/OAP/Oap.Theme/Views/LabelPart.cshtml | 8 --- .../Views/OapApplicationForm-ListPart.cshtml | 14 ----- .../Views/Select-FormElementLabelPart.cshtml | 23 -------- .../Views/Select-HtmlBodyPart.cshtml | 7 --- src/OAP/Oap.Theme/Views/SelectPart.cshtml | 53 ------------------- .../Views/TextArea-HtmlBodyPart.cshtml | 7 --- src/OAP/Oap.Theme/Views/TextAreaPart.cshtml | 21 -------- src/OAP/Oap.Theme/Views/Widget-Button.cshtml | 3 -- src/OAP/Oap.Theme/Views/Widget-Form.cshtml | 3 -- src/OAP/Oap.Theme/Views/Widget-Input.cshtml | 5 -- src/OAP/Oap.Theme/Views/Widget-Select.cshtml | 5 -- .../Oap.Theme/Views/Widget-TextArea.cshtml | 5 -- 20 files changed, 301 deletions(-) delete mode 100644 src/OAP/Oap.Theme/Views/ButtonPart.cshtml delete mode 100644 src/OAP/Oap.Theme/Views/Content-OapApplicationFormStep.cshtml delete mode 100644 src/OAP/Oap.Theme/Views/Form-FlowPart.cshtml delete mode 100644 src/OAP/Oap.Theme/Views/Form.Wrapper.cshtml delete mode 100644 src/OAP/Oap.Theme/Views/FormElementLabelPart.cshtml delete mode 100644 src/OAP/Oap.Theme/Views/HtmlBodyPart.cshtml delete mode 100644 src/OAP/Oap.Theme/Views/Input-HtmlBodyPart.cshtml delete mode 100644 src/OAP/Oap.Theme/Views/InputPart.cshtml delete mode 100644 src/OAP/Oap.Theme/Views/LabelPart.cshtml delete mode 100644 src/OAP/Oap.Theme/Views/OapApplicationForm-ListPart.cshtml delete mode 100644 src/OAP/Oap.Theme/Views/Select-FormElementLabelPart.cshtml delete mode 100644 src/OAP/Oap.Theme/Views/Select-HtmlBodyPart.cshtml delete mode 100644 src/OAP/Oap.Theme/Views/SelectPart.cshtml delete mode 100644 src/OAP/Oap.Theme/Views/TextArea-HtmlBodyPart.cshtml delete mode 100644 src/OAP/Oap.Theme/Views/TextAreaPart.cshtml delete mode 100644 src/OAP/Oap.Theme/Views/Widget-Button.cshtml delete mode 100644 src/OAP/Oap.Theme/Views/Widget-Form.cshtml delete mode 100644 src/OAP/Oap.Theme/Views/Widget-Input.cshtml delete mode 100644 src/OAP/Oap.Theme/Views/Widget-Select.cshtml delete mode 100644 src/OAP/Oap.Theme/Views/Widget-TextArea.cshtml diff --git a/src/OAP/Oap.Theme/Views/ButtonPart.cshtml b/src/OAP/Oap.Theme/Views/ButtonPart.cshtml deleted file mode 100644 index a5992ed..0000000 --- a/src/OAP/Oap.Theme/Views/ButtonPart.cshtml +++ /dev/null @@ -1,16 +0,0 @@ -@using OrchardCore.Forms.Models -@model OrchardCore.DisplayManagement.Views.ShapeViewModel -@{ - var formElementPart = Model.Value.ContentItem.As(); - var formInputElementPart = Model.Value.ContentItem.As(); - var elementId = formElementPart.Id; - var elementName = formInputElementPart.Name; - var id = !string.IsNullOrEmpty(elementId) ? elementId : !string.IsNullOrEmpty(elementName) ? Html.GenerateIdFromName(elementName) : default(string); -} - \ No newline at end of file diff --git a/src/OAP/Oap.Theme/Views/Content-OapApplicationFormStep.cshtml b/src/OAP/Oap.Theme/Views/Content-OapApplicationFormStep.cshtml deleted file mode 100644 index 81c0592..0000000 --- a/src/OAP/Oap.Theme/Views/Content-OapApplicationFormStep.cshtml +++ /dev/null @@ -1,11 +0,0 @@ -
-

- @Model.Header.TitlePart.Title -

- -
- @await DisplayAsync(Model.Content.HtmlBodyPart) -
- - @await DisplayAsync(Model.Content.FlowPart) -
\ No newline at end of file diff --git a/src/OAP/Oap.Theme/Views/Form-FlowPart.cshtml b/src/OAP/Oap.Theme/Views/Form-FlowPart.cshtml deleted file mode 100644 index d920e7d..0000000 --- a/src/OAP/Oap.Theme/Views/Form-FlowPart.cshtml +++ /dev/null @@ -1,13 +0,0 @@ -@model OrchardCore.Flows.ViewModels.FlowPartViewModel -@inject OrchardCore.ContentManagement.Display.IContentItemDisplayManager ContentItemDisplayManager - -@foreach (var widget in Model.FlowPart.Widgets) -{ - var widgetContent = await ContentItemDisplayManager.BuildDisplayAsync( - widget, - Model.BuildPartDisplayContext.Updater, - Model.BuildPartDisplayContext.DisplayType, - Model.BuildPartDisplayContext.GroupId); - - @await DisplayAsync(widgetContent) -} \ No newline at end of file diff --git a/src/OAP/Oap.Theme/Views/Form.Wrapper.cshtml b/src/OAP/Oap.Theme/Views/Form.Wrapper.cshtml deleted file mode 100644 index ae9f660..0000000 --- a/src/OAP/Oap.Theme/Views/Form.Wrapper.cshtml +++ /dev/null @@ -1,36 +0,0 @@ -@using Microsoft.AspNetCore.Html -@using OrchardCore.ContentManagement -@using OrchardCore.Forms.Models -@using OrchardCore.Mvc.Utilities -@using OrchardCore.Workflows - -@{ - var formPart = ((ContentItem)Model.ContentItem).As(); - string encType = formPart.Method == "POST" ? formPart.EncType : string.Empty; - var formContentTypeClassName = "form-" + ((string)Model.ContentItem.ContentType).HtmlClassify(); - - var elementId = ((ContentItem)Model.ContentItem).As()?.Id; - string formId = string.IsNullOrWhiteSpace(elementId) ? $"form_{Model.ContentItem.ContentItemId}" : elementId; -} - -
- @if (formPart.EnableAntiForgeryToken) - { - @Html.AntiForgeryToken() - } - - @if (formPart.SaveFormLocation) - { - - } - - @await DisplayAsync((IHtmlContent)Model.Metadata.ChildContent) -
diff --git a/src/OAP/Oap.Theme/Views/FormElementLabelPart.cshtml b/src/OAP/Oap.Theme/Views/FormElementLabelPart.cshtml deleted file mode 100644 index 24afaae..0000000 --- a/src/OAP/Oap.Theme/Views/FormElementLabelPart.cshtml +++ /dev/null @@ -1,19 +0,0 @@ -@using OrchardCore.Forms.ViewModels -@using OrchardCore.Forms.Models -@model ShapeViewModel -@{ - var formElementPart = Model.Value.ContentItem.As(); - var formInputElementPart = Model.Value.ContentItem.As(); - var elementId = formElementPart.Id; - var fieldName = formInputElementPart.Name; - var fieldId = !string.IsNullOrEmpty(elementId) ? elementId : !string.IsNullOrEmpty(fieldName) ? Html.GenerateIdFromName(fieldName) : default(string); -} - -@if (Model.Value.Option == LabelOptions.Standard) -{ - -} -else if (Model.Value.Option == LabelOptions.ScreenReaders) -{ - -} diff --git a/src/OAP/Oap.Theme/Views/HtmlBodyPart.cshtml b/src/OAP/Oap.Theme/Views/HtmlBodyPart.cshtml deleted file mode 100644 index e133731..0000000 --- a/src/OAP/Oap.Theme/Views/HtmlBodyPart.cshtml +++ /dev/null @@ -1,5 +0,0 @@ -@model OrchardCore.Html.ViewModels.HtmlBodyPartViewModel - -
- @Html.Raw(Model.Html) -
diff --git a/src/OAP/Oap.Theme/Views/Input-HtmlBodyPart.cshtml b/src/OAP/Oap.Theme/Views/Input-HtmlBodyPart.cshtml deleted file mode 100644 index 7331775..0000000 --- a/src/OAP/Oap.Theme/Views/Input-HtmlBodyPart.cshtml +++ /dev/null @@ -1,7 +0,0 @@ -@model OrchardCore.Html.ViewModels.HtmlBodyPartViewModel - -
-
- @Html.Raw(Model.Html) -
-
\ No newline at end of file diff --git a/src/OAP/Oap.Theme/Views/InputPart.cshtml b/src/OAP/Oap.Theme/Views/InputPart.cshtml deleted file mode 100644 index 07342f6..0000000 --- a/src/OAP/Oap.Theme/Views/InputPart.cshtml +++ /dev/null @@ -1,40 +0,0 @@ -@using OrchardCore.Forms.Models -@model ShapeViewModel -@{ - var formElementPart = Model.Value.ContentItem.As(); - var formInputElementPart = Model.Value.ContentItem.As(); - var elementId = formElementPart.Id; - var fieldName = formInputElementPart.Name; - var fieldId = !string.IsNullOrEmpty(elementId) ? elementId : !string.IsNullOrEmpty(fieldName) ? Html.GenerateIdFromName(fieldName) : default(string); - var fieldValue = Model.Value.DefaultValue; - var fieldClass = ""; - var isChecked = false; - - if (Model.Value.Type == "text") - { - fieldClass = "block w-full rounded-md border-0 py-1.5 px-2 text-gray-900 shadow-sm ring-1 ring-inset ring-gray-300 placeholder:text-gray-400 focus:ring-2 focus:ring-inset focus:ring-indigo-600"; - } - else if (Model.Value.Type == "number" || Model.Value.Type == "date") - { - fieldClass = "block w-1/3 rounded-md border-0 py-1.5 px-2 text-gray-900 shadow-sm ring-1 ring-inset ring-gray-300 placeholder:text-gray-400 focus:ring-2 focus:ring-inset focus:ring-indigo-600"; - } - - if (ViewData.ModelState.TryGetValue(fieldName, out var fieldEntry)) - { - if (Model.Value.Type == "checkbox") - { - isChecked = fieldEntry.AttemptedValue == fieldValue; - } - else - { - fieldValue = fieldEntry.AttemptedValue; - } - - if (fieldEntry.Errors.Count > 0) - { - fieldClass += " input-validation-error is-invalid"; - } - } -} - - diff --git a/src/OAP/Oap.Theme/Views/LabelPart.cshtml b/src/OAP/Oap.Theme/Views/LabelPart.cshtml deleted file mode 100644 index 7b14174..0000000 --- a/src/OAP/Oap.Theme/Views/LabelPart.cshtml +++ /dev/null @@ -1,8 +0,0 @@ -@using OrchardCore.Forms.Models -@model OrchardCore.DisplayManagement.Views.ShapeViewModel - -@{ - var contentItem = Model.Value.ContentItem; - var formElementPart = contentItem.As(); -} - diff --git a/src/OAP/Oap.Theme/Views/OapApplicationForm-ListPart.cshtml b/src/OAP/Oap.Theme/Views/OapApplicationForm-ListPart.cshtml deleted file mode 100644 index ab31c7b..0000000 --- a/src/OAP/Oap.Theme/Views/OapApplicationForm-ListPart.cshtml +++ /dev/null @@ -1,14 +0,0 @@ -@model OrchardCore.Lists.ViewModels.ListPartViewModel -@inject OrchardCore.ContentManagement.Display.IContentItemDisplayManager ContentItemDisplayManager - -
- @{ - var stepContent = await ContentItemDisplayManager.BuildDisplayAsync( - Model.ContentItems.First(), - Model.Context.Updater, - Model.Context.DisplayType, - Model.Context.GroupId); - } - - @await DisplayAsync(stepContent) -
\ No newline at end of file diff --git a/src/OAP/Oap.Theme/Views/Select-FormElementLabelPart.cshtml b/src/OAP/Oap.Theme/Views/Select-FormElementLabelPart.cshtml deleted file mode 100644 index 64da36e..0000000 --- a/src/OAP/Oap.Theme/Views/Select-FormElementLabelPart.cshtml +++ /dev/null @@ -1,23 +0,0 @@ -@using OrchardCore.Forms.ViewModels -@using OrchardCore.Forms.Models -@model ShapeViewModel -@{ - var formElementPart = Model.Value.ContentItem.As(); - var formInputElementPart = Model.Value.ContentItem.As(); - var elementId = formElementPart.Id; - var fieldName = formInputElementPart.Name; - var fieldId = !string.IsNullOrEmpty(elementId) ? elementId : !string.IsNullOrEmpty(fieldName) ? Html.GenerateIdFromName(fieldName) : default(string); -} - -@if (Model.Value.Option == LabelOptions.Standard) -{ - - @Model.Value.Label - -} -else if (Model.Value.Option == LabelOptions.ScreenReaders) -{ - - @Model.Value.Label - -} diff --git a/src/OAP/Oap.Theme/Views/Select-HtmlBodyPart.cshtml b/src/OAP/Oap.Theme/Views/Select-HtmlBodyPart.cshtml deleted file mode 100644 index b562ff9..0000000 --- a/src/OAP/Oap.Theme/Views/Select-HtmlBodyPart.cshtml +++ /dev/null @@ -1,7 +0,0 @@ -@model OrchardCore.Html.ViewModels.HtmlBodyPartViewModel - -
-
- @Html.Raw(Model.Html) -
-
\ No newline at end of file diff --git a/src/OAP/Oap.Theme/Views/SelectPart.cshtml b/src/OAP/Oap.Theme/Views/SelectPart.cshtml deleted file mode 100644 index 1d5db96..0000000 --- a/src/OAP/Oap.Theme/Views/SelectPart.cshtml +++ /dev/null @@ -1,53 +0,0 @@ -@using OrchardCore.Forms.Models -@model ShapeViewModel -@{ - var formElementPart = Model.Value.ContentItem.As(); - var formInputElementPart = Model.Value.ContentItem.As(); - var elementId = formElementPart.Id; - var fieldName = formInputElementPart.Name; - var fieldId = !string.IsNullOrEmpty(elementId) ? elementId : !string.IsNullOrEmpty(fieldName) ? - Html.GenerateIdFromName(fieldName) : default(string); - var fieldValue = Model.Value.DefaultValue; - var validationClass = ""; - - if (ViewData.ModelState.TryGetValue(fieldName, out var fieldEntry)) - { - fieldValue = fieldEntry.AttemptedValue; - if (fieldEntry.Errors.Count > 0) - { - validationClass += " input-validation-error is-invalid"; // TODO: use validation classes from tailwind! - } - } -} - -@if (Model.Value.Editor == SelectEditorOption.Checkbox || Model.Value.Editor == SelectEditorOption.Radio) -{ - int i = 0; - var htmlType = Model.Value.Editor == SelectEditorOption.Checkbox ? "checkbox" : "radio"; -
- @foreach (var option in Model.Value.Options) - { -
- - -
- i++; - } -
-} -else -{ -
- -
-} diff --git a/src/OAP/Oap.Theme/Views/TextArea-HtmlBodyPart.cshtml b/src/OAP/Oap.Theme/Views/TextArea-HtmlBodyPart.cshtml deleted file mode 100644 index b562ff9..0000000 --- a/src/OAP/Oap.Theme/Views/TextArea-HtmlBodyPart.cshtml +++ /dev/null @@ -1,7 +0,0 @@ -@model OrchardCore.Html.ViewModels.HtmlBodyPartViewModel - -
-
- @Html.Raw(Model.Html) -
-
\ No newline at end of file diff --git a/src/OAP/Oap.Theme/Views/TextAreaPart.cshtml b/src/OAP/Oap.Theme/Views/TextAreaPart.cshtml deleted file mode 100644 index 14e0ea7..0000000 --- a/src/OAP/Oap.Theme/Views/TextAreaPart.cshtml +++ /dev/null @@ -1,21 +0,0 @@ -@using OrchardCore.Forms.Models -@model ShapeViewModel -@{ - var formElementPart = Model.Value.ContentItem.As(); - var formInputElementPart = Model.Value.ContentItem.As(); - var elementId = formElementPart.Id; - var fieldName = formInputElementPart.Name; - var fieldId = !string.IsNullOrEmpty(elementId) ? elementId : !string.IsNullOrEmpty(fieldName) ? Html.GenerateIdFromName(fieldName) : default(string); - var fieldValue = Model.Value.DefaultValue?.Trim(); - var fieldClass = "block w-full rounded-md border-0 py-1.5 px-2 text-gray-900 shadow-sm ring-1 ring-inset ring-gray-300 placeholder:text-gray-400 focus:ring-2 focus:ring-inset focus:ring-indigo-600"; - - if (ViewData.ModelState.TryGetValue(fieldName, out var fieldEntry)) - { - fieldValue = fieldEntry.AttemptedValue; - if (fieldEntry.Errors.Count > 0) - { - fieldClass = "form-control input-validation-error is-invalid"; - } - } -} - diff --git a/src/OAP/Oap.Theme/Views/Widget-Button.cshtml b/src/OAP/Oap.Theme/Views/Widget-Button.cshtml deleted file mode 100644 index 0c0a646..0000000 --- a/src/OAP/Oap.Theme/Views/Widget-Button.cshtml +++ /dev/null @@ -1,3 +0,0 @@ -
- @await DisplayAsync(Model.Content) -
\ No newline at end of file diff --git a/src/OAP/Oap.Theme/Views/Widget-Form.cshtml b/src/OAP/Oap.Theme/Views/Widget-Form.cshtml deleted file mode 100644 index caa6324..0000000 --- a/src/OAP/Oap.Theme/Views/Widget-Form.cshtml +++ /dev/null @@ -1,3 +0,0 @@ -
- @await DisplayAsync(Model.Content) -
\ No newline at end of file diff --git a/src/OAP/Oap.Theme/Views/Widget-Input.cshtml b/src/OAP/Oap.Theme/Views/Widget-Input.cshtml deleted file mode 100644 index 71226e7..0000000 --- a/src/OAP/Oap.Theme/Views/Widget-Input.cshtml +++ /dev/null @@ -1,5 +0,0 @@ -
- @await DisplayAsync(Model.Content.FormElementLabelPart) - @await DisplayAsync(Model.Content.Explanation) - @await DisplayAsync(Model.Content.InputPart) -
\ No newline at end of file diff --git a/src/OAP/Oap.Theme/Views/Widget-Select.cshtml b/src/OAP/Oap.Theme/Views/Widget-Select.cshtml deleted file mode 100644 index 02d82af..0000000 --- a/src/OAP/Oap.Theme/Views/Widget-Select.cshtml +++ /dev/null @@ -1,5 +0,0 @@ -
- @await DisplayAsync(Model.Content.FormElementLabelPart) - @await DisplayAsync(Model.Content.Explanation) - @await DisplayAsync(Model.Content.SelectPart) -
\ No newline at end of file diff --git a/src/OAP/Oap.Theme/Views/Widget-TextArea.cshtml b/src/OAP/Oap.Theme/Views/Widget-TextArea.cshtml deleted file mode 100644 index 4aadb7f..0000000 --- a/src/OAP/Oap.Theme/Views/Widget-TextArea.cshtml +++ /dev/null @@ -1,5 +0,0 @@ -
- @await DisplayAsync(Model.Content.FormElementLabelPart) - @await DisplayAsync(Model.Content.Explanation) - @await DisplayAsync(Model.Content.TextAreaPart) -
\ No newline at end of file