Merge pull request #614 from cloudscribe/feature/487-v3

Feature/487 v3
cloudscribe · Dec 6, 2024 · 9965cc9 · 9965cc9
2 parents 954bff3 + 79e1bd6
commit 9965cc9
Show file tree

Hide file tree

Showing 25 changed files with 372 additions and 693 deletions.
diff --git a/cloudscribe.SimpleContent.sln b/cloudscribe.SimpleContent.sln
@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 16
-VisualStudioVersion = 16.0.29209.152
+# Visual Studio Version 17
+VisualStudioVersion = 17.12.35527.113 d17.12
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{5243DE57-7C89-4208-8876-405E13605D16}"
 EndProject

diff --git a/...loudscribe.Core.SimpleContent.CompiledViews.Bootstrap5/Views/ContentSettings/Index.cshtml b/...loudscribe.Core.SimpleContent.CompiledViews.Bootstrap5/Views/ContentSettings/Index.cshtml
@@ -303,30 +303,30 @@
         <span asp-validation-for="TwitterCreator" class="text-danger"></span>
     </div>
     <div class="mb-3">
-        <p>@sr["EditorialDetailsExplanation"]</p>
+        <p>@sr["Show / hide the following information below the main content of pages (site default)."]</p>
     </div>
     <div class="mb-3">
-        <div class="form-check" data-bs-toggle="tooltip" data-placement="left" title='@sr["ShowCreatedBy"]'>
+        <div class="form-check" data-bs-toggle="tooltip" data-placement="left" title='@sr["Show Created By"]'>
             <input asp-for="ShowCreatedBy" class="form-check-input" />
-            <label asp-for="ShowCreatedBy" class="form-check-label">@sr["ShowCreatedBy"]</label>
+            <label asp-for="ShowCreatedBy" class="form-check-label">@sr["Show Created By"]</label>
         </div>
     </div>
     <div class="mb-3">
-        <div class="form-check" data-bs-toggle="tooltip" data-placement="left" title='@sr["ShowCreatedDate"]'>
+        <div class="form-check" data-bs-toggle="tooltip" data-placement="left" title='@sr["Show Created Date"]'>
             <input asp-for="ShowCreatedDate" class="form-check-input" />
-            <label asp-for="ShowCreatedDate" class="form-check-label">@sr["ShowCreatedDate"]</label>
+            <label asp-for="ShowCreatedDate" class="form-check-label">@sr["Show Created Date"]</label>
         </div>
     </div>
     <div class="mb-3">
-        <div class="form-check" data-bs-toggle="tooltip" data-placement="left" title='@sr["ShowLastModifiedBy"]'>
+        <div class="form-check" data-bs-toggle="tooltip" data-placement="left" title='@sr["Show Last Modified By"]'>
             <input asp-for="ShowLastModifiedBy" class="form-check-input" />
-            <label asp-for="ShowLastModifiedBy" class="form-check-label">@sr["ShowLastModifiedBy"]</label>
+            <label asp-for="ShowLastModifiedBy" class="form-check-label">@sr["Show Last Modified By"]</label>
         </div>
     </div>
     <div class="mb-3">
-        <div class="form-check" data-bs-toggle="tooltip" data-placement="left" title='@sr["ShowLastModifiedDate"]'>
+        <div class="form-check" data-bs-toggle="tooltip" data-placement="left" title='@sr["Show Last Modified Date"]'>
             <input asp-for="ShowLastModifiedDate" class="form-check-input" />
-            <label asp-for="ShowLastModifiedDate" class="form-check-label">@sr["ShowLastModifiedDate"]</label>
+            <label asp-for="ShowLastModifiedDate" class="form-check-label">@sr["Show Last Modified Date"]</label>
         </div>
     </div>
     @if (uiOptions.ShowBlogSettings)

diff --git a/...t.CompiledViews.Bootstrap5/cloudscribe.Core.SimpleContent.CompiledViews.Bootstrap5.csproj b/...t.CompiledViews.Bootstrap5/cloudscribe.Core.SimpleContent.CompiledViews.Bootstrap5.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <Description>Bootstrap 5 pre-compiled views for cloudscribe Core and SimpleContent integration</Description>
-    <Version>8.0.2</Version>
+    <Version>8.0.3</Version>
     <TargetFramework>net8.0</TargetFramework>
     <Authors>Joe Audette</Authors>
     <AddRazorSupportForMvc>true</AddRazorSupportForMvc>

diff --git a/src/cloudscribe.SimpleContent.CompiledViews.Bootstrap5/Views/Page/Edit.cshtml b/src/cloudscribe.SimpleContent.CompiledViews.Bootstrap5/Views/Page/Edit.cshtml
@@ -55,33 +55,7 @@
                 <input asp-for="Author" class="form-control" />
                 <span asp-validation-for="Author" class="invalid-feedback"></span>
             </div>
-            <div class="mb-3">
-                <p>@sr["EditorialDetailsExplanation"]</p>
-            </div>
-            <div class="mb-3">
-                <div class="form-check" data-bs-toggle="tooltip" data-placement="left" title='@sr["ShowCreatedBy"]'>
-                    <input asp-for="ShowCreatedBy" type="checkbox" class="form-check-input" />
-                    <label asp-for="ShowCreatedBy" class="form-check-label">@sr["ShowCreatedBy"]</label>
-                </div>
-            </div>
-            <div class="mb-3">
-                <div class="form-check" data-bs-toggle="tooltip" data-placement="left" title='@sr["ShowCreatedDate"]'>
-                    <input asp-for="ShowCreatedDate" type="checkbox" class="form-check-input" />
-                    <label asp-for="ShowCreatedDate" class="form-check-label">@sr["ShowCreatedDate"]</label>
-                </div>
-            </div>
-            <div class="mb-3">
-                <div class="form-check" data-bs-toggle="tooltip" data-placement="left" title='@sr["ShowLastModifiedBy"]'>
-                    <input asp-for="ShowLastModifiedBy" type="checkbox" class="form-check-input" />
-                    <label asp-for="ShowLastModifiedBy" class="form-check-label">@sr["ShowLastModifiedBy"]</label>
-                </div>
-            </div>
-            <div class="mb-3">
-                <div class="form-check" data-bs-toggle="tooltip" data-placement="left" title='@sr["ShowLastModifiedDate"]'>
-                    <input asp-for="ShowLastModifiedDate" type="checkbox" class="form-check-input" />
-                    <label asp-for="ShowLastModifiedDate" class="form-check-label">@sr["ShowLastModifiedDate"]</label>
-                </div>
-            </div>
+            <partial name="EditorialShowHidePartial" model="@Model" />
         </div>
         <div class="tab-pane" id="tabSettings" role="tabpanel" aria-labelledby="tab2">
             <div class="mb-3 mt-2">

diff --git a/src/cloudscribe.SimpleContent.CompiledViews.Bootstrap5/Views/Page/EditWithTemplate.cshtml b/src/cloudscribe.SimpleContent.CompiledViews.Bootstrap5/Views/Page/EditWithTemplate.cshtml
@@ -64,33 +64,7 @@
                 <legend class="w-auto">@legend</legend>
                 <partial name="@Model.Template.EditView" model="@Model.TemplateModel" />
             </fieldset>
-            <div class="mb-3">
-                <p>@sr["EditorialDetailsExplanation"]</p>
-            </div>
-            <div class="mb-3">
-                <div class="form-check" data-bs-toggle="tooltip" data-placement="left" title='@sr["ShowCreatedBy"]'>
-                    <input asp-for="ShowCreatedBy" type="checkbox" class="form-check-input" />
-                    <label asp-for="ShowCreatedBy" class="form-check-label">@sr["ShowCreatedBy"]</label>
-                </div>
-            </div>
-            <div class="mb-3">
-                <div class="form-check" data-bs-toggle="tooltip" data-placement="left" title='@sr["ShowCreatedDate"]'>
-                    <input asp-for="ShowCreatedDate" type="checkbox" class="form-check-input" />
-                    <label asp-for="ShowCreatedDate" class="form-check-label">@sr["ShowCreatedDate"]</label>
-                </div>
-            </div>
-            <div class="mb-3">
-                <div class="form-check" data-bs-toggle="tooltip" data-placement="left" title='@sr["ShowLastModifiedBy"]'>
-                    <input asp-for="ShowLastModifiedBy" type="checkbox" class="form-check-input" />
-                    <label asp-for="ShowLastModifiedBy" class="form-check-label">@sr["ShowLastModifiedBy"]</label>
-                </div>
-            </div>
-            <div class="mb-3">
-                <div class="form-check" data-bs-toggle="tooltip" data-placement="left" title='@sr["ShowLastModifiedDate"]'>
-                    <input asp-for="ShowLastModifiedDate" type="checkbox" class="form-check-input" />
-                    <label asp-for="ShowLastModifiedDate" class="form-check-label">@sr["ShowLastModifiedDate"]</label>
-                </div>
-            </div>
+            <partial name="EditorialShowHidePartialTemplates" model="@Model" />
         </div>
         <div class="tab-pane" id="tabSettings" role="tabpanel" aria-labelledby="tab2">
             <div class="mb-3 mt-2">

diff --git a/...udscribe.SimpleContent.CompiledViews.Bootstrap5/Views/Page/EditorialDetailsPartial.cshtml b/...udscribe.SimpleContent.CompiledViews.Bootstrap5/Views/Page/EditorialDetailsPartial.cshtml
@@ -3,33 +3,33 @@
 @inject ISimpleContentThemeHelper themeHelper
 
 <div class="my-2">
-    @if (Model.CurrentPage.ShowCreatedDate != false && Model.CurrentPage.ShowCreatedBy != false && Model.CurrentPage.CreatedByUser != null)
+    @if (Model.ShowCreatedDate.HasValue && Model.ShowCreatedDate != false && Model.ShowCreatedBy.HasValue && Model.ShowCreatedBy != false && Model.CurrentPage.CreatedByUser != null)
     {
         <small>@sr["Created"]: @Model.CurrentPage.CreatedUtc.ToString("dd/MM/yyyy") By: @Model.CurrentPage.CreatedByUser</small>
     }
-    else if (Model.CurrentPage.ShowCreatedDate != false)
+    else if (Model.ShowCreatedDate.HasValue && Model.ShowCreatedDate != false)
     {
         <small>@sr["Created"]: @Model.CurrentPage.CreatedUtc.ToString("dd/MM/yyyy")</small>
     }
-    else if (Model.CurrentPage.ShowCreatedBy != false && Model.CurrentPage.CreatedByUser != null)
+    else if (Model.ShowCreatedBy.HasValue && Model.ShowCreatedBy != false && Model.CurrentPage.CreatedByUser != null)
     {
         <small>@sr["Created By"]: @Model.CurrentPage.CreatedByUser</small>
     }
 
-    @if ((Model.CurrentPage.ShowCreatedDate != false || Model.CurrentPage.ShowCreatedBy != false) && (Model.CurrentPage.ShowLastModifiedDate != false || Model.CurrentPage.ShowLastModifiedBy != false))
+    @if ((Model.ShowCreatedDate.HasValue && Model.ShowCreatedDate != false || Model.ShowCreatedBy.HasValue && Model.ShowCreatedBy != false) && (Model.ShowLastModifiedDate.HasValue && Model.ShowLastModifiedDate != false || Model.ShowLastModifiedBy.HasValue && Model.ShowLastModifiedBy != false))
     {
         @Html.Raw("&nbsp;|&nbsp;");
     }
 
-    @if (Model.CurrentPage.ShowLastModifiedDate != false && Model.CurrentPage.ShowLastModifiedBy != false && Model.CurrentPage.LastModifiedByUser != null)
+    @if (Model.ShowLastModifiedDate.HasValue && Model.ShowLastModifiedDate != false && Model.ShowLastModifiedBy.HasValue && Model.ShowLastModifiedBy != false && Model.CurrentPage.LastModifiedByUser != null)
     {
         <small>@sr["Last Updated"]: @Model.CurrentPage.LastModified.ToString("dd/MM/yyyy") By: @Model.CurrentPage.LastModifiedByUser</small>
     }
-    else if (Model.CurrentPage.ShowLastModifiedDate != false)
+    else if (Model.ShowLastModifiedDate.HasValue && Model.ShowLastModifiedDate != false)
     {
         <small>@sr["Updated"]: @Model.CurrentPage.LastModified.ToString("dd/MM/yyyy")</small>
     }
-    else if (Model.CurrentPage.ShowLastModifiedBy != false && Model.CurrentPage.LastModifiedByUser != null)
+    else if (Model.ShowLastModifiedBy.HasValue && Model.ShowLastModifiedBy != false && Model.CurrentPage.LastModifiedByUser != null)
     {
         <small>@sr["Updated By"]: @Model.CurrentPage.LastModifiedByUser</small>
     }

diff --git a/...dscribe.SimpleContent.CompiledViews.Bootstrap5/Views/Page/EditorialShowHidePartial.cshtml b/...dscribe.SimpleContent.CompiledViews.Bootstrap5/Views/Page/EditorialShowHidePartial.cshtml
@@ -0,0 +1,84 @@
+@model cloudscribe.SimpleContent.Web.ViewModels.PageEditViewModel
+@inject IStringLocalizer<SimpleContent> sr
+
+<div class="mb-3">
+    <p>@sr["Show / hide the following information below the main content of the page."]</p>
+</div>
+<div class="mb-3">
+    <div class="row">
+        <div class="col col-lg-2">&nbsp;</div>
+        <div class="col col-lg-1 text-center">
+            @sr["Use Site Default"]
+        </div>
+        <div class="col col-lg-1 text-center">
+            @sr["Show on this Page"]
+        </div>
+        <div class="col col-lg-1 text-center">
+            @sr["Hide on this Page"]
+        </div>
+    </div>
+    <div class="row" data-bs-toggle="tooltip" data-placement="left" title='@sr["Show Created By"]'>
+        <div class="col col-lg-2">
+            <label asp-for="ShowCreatedBy" class="form-check-label">
+                @sr["Show Created By"]
+            </label>
+        </div>
+        <div class="col col-lg-1 text-center">
+            <input id="ShowCreatedBy" name="ShowCreatedBy" type="radio" value="" @(Model.ShowCreatedBy.HasValue || Model.ShowCreatedBy != null ? "" : "checked")>
+        </div>
+        <div class="col col-lg-1 text-center">
+            <input asp-for="ShowCreatedBy" type="radio" value="true">
+        </div>
+        <div class="col col-lg-1 text-center">
+            <input asp-for="ShowCreatedBy" type="radio" value="false">
+        </div>
+    </div>
+    <div class="row" data-bs-toggle="tooltip" data-placement="left" title='@sr["Show Created Date"]'>
+        <div class="col col-lg-2">
+            <label asp-for="ShowCreatedDate" class="form-check-label">
+                @sr["Show Created Date"]
+            </label>
+        </div>
+        <div class="col col-lg-1 text-center">
+            <input id="ShowCreatedDate" name="ShowCreatedDate" type="radio" value="" @(Model.ShowCreatedDate.HasValue || Model.ShowCreatedDate != null ? "" : "checked")>
+        </div>
+        <div class="col col-lg-1 text-center">
+            <input asp-for="ShowCreatedDate" type="radio" value="true">
+        </div>
+        <div class="col col-lg-1 text-center">
+            <input asp-for="ShowCreatedDate" type="radio" value="false">
+        </div>
+    </div>
+    <div class="row" data-bs-toggle="tooltip" data-placement="left" title='@sr["Show Last Modified By"]'>
+        <div class="col col-lg-2">
+            <label asp-for="ShowLastModifiedBy" class="form-check-label">
+                @sr["Show Last Modified By"]
+            </label>
+        </div>
+        <div class="col col-lg-1 text-center">
+            <input id="ShowLastModifiedBy" name="ShowLastModifiedBy" type="radio" value="" @(Model.ShowLastModifiedBy.HasValue || Model.ShowLastModifiedBy != null ? "" : "checked")>
+        </div>
+        <div class="col col-lg-1 text-center">
+            <input asp-for="ShowLastModifiedBy" type="radio" value="true">
+        </div>
+        <div class="col col-lg-1 text-center">
+            <input asp-for="ShowLastModifiedBy" type="radio" value="false">
+        </div>
+    </div>
+    <div class="row" data-bs-toggle="tooltip" data-placement="left" title='@sr["Show Last Modified Date"]'>
+        <div class="col col-lg-2">
+            <label asp-for="ShowLastModifiedDate" class="form-check-label">
+                @sr["Show Last Modified Date"]
+            </label>
+        </div>
+        <div class="col col-lg-1 text-center">
+            <input id="ShowLastModifiedDate" name="ShowLastModifiedDate" type="radio" value="" @(Model.ShowLastModifiedDate.HasValue || Model.ShowLastModifiedDate != null ? "" : "checked")>
+        </div>
+        <div class="col col-lg-1 text-center">
+            <input asp-for="ShowLastModifiedDate" type="radio" value="true">
+        </div>
+        <div class="col col-lg-1 text-center">
+            <input asp-for="ShowLastModifiedDate" type="radio" value="false">
+        </div>
+    </div>
+</div>
diff --git a/...impleContent.CompiledViews.Bootstrap5/Views/Page/EditorialShowHidePartialTemplates.cshtml b/...impleContent.CompiledViews.Bootstrap5/Views/Page/EditorialShowHidePartialTemplates.cshtml
@@ -0,0 +1,84 @@
+@model cloudscribe.SimpleContent.Web.ViewModels.PageEditWithTemplateViewModel
+@inject IStringLocalizer<SimpleContent> sr
+
+<div class="mb-3">
+    <p>@sr["Show / hide the following information below the main content of the page."]</p>
+</div>
+<div class="mb-3">
+    <div class="row">
+        <div class="col col-lg-2">&nbsp;</div>
+        <div class="col col-lg-1 text-center">
+            @sr["Use Site Default"]
+        </div>
+        <div class="col col-lg-1 text-center">
+            @sr["Show on this Page"]
+        </div>
+        <div class="col col-lg-1 text-center">
+            @sr["Hide on this Page"]
+        </div>
+    </div>
+    <div class="row" data-bs-toggle="tooltip" data-placement="left" title='@sr["Show Created By"]'>
+        <div class="col col-lg-2">
+            <label asp-for="ShowCreatedBy" class="form-check-label">
+                @sr["Show Created By"]
+            </label>
+        </div>
+        <div class="col col-lg-1 text-center">
+            <input id="ShowCreatedBy" name="ShowCreatedBy" type="radio" value="" @(Model.ShowCreatedBy.HasValue || Model.ShowCreatedBy != null ? "" : "checked")>
+        </div>
+        <div class="col col-lg-1 text-center">
+            <input asp-for="ShowCreatedBy" type="radio" value="true">
+        </div>
+        <div class="col col-lg-1 text-center">
+            <input asp-for="ShowCreatedBy" type="radio" value="false">
+        </div>
+    </div>
+    <div class="row" data-bs-toggle="tooltip" data-placement="left" title='@sr["Show Created Date"]'>
+        <div class="col col-lg-2">
+            <label asp-for="ShowCreatedDate" class="form-check-label">
+                @sr["Show Created Date"]
+            </label>
+        </div>
+        <div class="col col-lg-1 text-center">
+            <input id="ShowCreatedDate" name="ShowCreatedDate" type="radio" value="" @(Model.ShowCreatedDate.HasValue || Model.ShowCreatedDate != null ? "" : "checked")>
+        </div>
+        <div class="col col-lg-1 text-center">
+            <input asp-for="ShowCreatedDate" type="radio" value="true">
+        </div>
+        <div class="col col-lg-1 text-center">
+            <input asp-for="ShowCreatedDate" type="radio" value="false">
+        </div>
+    </div>
+    <div class="row" data-bs-toggle="tooltip" data-placement="left" title='@sr["Show Last Modified By"]'>
+        <div class="col col-lg-2">
+            <label asp-for="ShowLastModifiedBy" class="form-check-label">
+                @sr["Show Last Modified By"]
+            </label>
+        </div>
+        <div class="col col-lg-1 text-center">
+            <input id="ShowLastModifiedBy" name="ShowLastModifiedBy" type="radio" value="" @(Model.ShowLastModifiedBy.HasValue || Model.ShowLastModifiedBy != null ? "" : "checked")>
+        </div>
+        <div class="col col-lg-1 text-center">
+            <input asp-for="ShowLastModifiedBy" type="radio" value="true">
+        </div>
+        <div class="col col-lg-1 text-center">
+            <input asp-for="ShowLastModifiedBy" type="radio" value="false">
+        </div>
+    </div>
+    <div class="row" data-bs-toggle="tooltip" data-placement="left" title='@sr["Show Last Modified Date"]'>
+        <div class="col col-lg-2">
+            <label asp-for="ShowLastModifiedDate" class="form-check-label">
+                @sr["Show Last Modified Date"]
+            </label>
+        </div>
+        <div class="col col-lg-1 text-center">
+            <input id="ShowLastModifiedDate" name="ShowLastModifiedDate" type="radio" value="" @(Model.ShowLastModifiedDate.HasValue || Model.ShowLastModifiedDate != null ? "" : "checked")>
+        </div>
+        <div class="col col-lg-1 text-center">
+            <input asp-for="ShowLastModifiedDate" type="radio" value="true">
+        </div>
+        <div class="col col-lg-1 text-center">
+            <input asp-for="ShowLastModifiedDate" type="radio" value="false">
+        </div>
+    </div>
+</div>
diff --git a/...ontent.CompiledViews.Bootstrap5/cloudscribe.SimpleContent.CompiledViews.Bootstrap5.csproj b/...ontent.CompiledViews.Bootstrap5/cloudscribe.SimpleContent.CompiledViews.Bootstrap5.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <Description>Bootstrap 5 pre-compiled views for cloudscribe.SimpleContent.Web</Description>
-    <Version>8.0.5</Version>
+    <Version>8.0.6</Version>
     <TargetFramework>net8.0</TargetFramework>
     <Authors>Joe Audette</Authors>
     <AddRazorSupportForMvc>true</AddRazorSupportForMvc>