Merge pull request #284 from cloudscribe/dev

merge changes from dev
cloudscribe · May 26, 2018 · 9ba76ce · 9ba76ce
2 parents c438acb + 6d7fbc6
commit 9ba76ce
Show file tree

Hide file tree

Showing 13 changed files with 76 additions and 53 deletions.
diff --git a/src/cloudscribe.SimpleContent.Web.Mvc/cloudscribe.SimpleContent.Web.Mvc.csproj b/src/cloudscribe.SimpleContent.Web.Mvc/cloudscribe.SimpleContent.Web.Mvc.csproj
@@ -2,8 +2,8 @@
 
   <PropertyGroup>
     <Description>MVC Controllers for cloudscribe.SimpleContent.Web</Description>
-    <VersionPrefix>2.0.30</VersionPrefix>
-    <AssemblyVersion>2.0.30</AssemblyVersion>
+    <VersionPrefix>2.0.31</VersionPrefix>
+    <AssemblyVersion>2.0.31</AssemblyVersion>
     <Authors>Joe Audette</Authors>
     <TargetFrameworks>netstandard2.0</TargetFrameworks>
     <DebugType>portable</DebugType>

diff --git a/src/cloudscribe.SimpleContent.Web.Views.Bootstrap3/Views/Blog/Edit.cshtml b/src/cloudscribe.SimpleContent.Web.Views.Bootstrap3/Views/Blog/Edit.cshtml
@@ -98,18 +98,8 @@
             </div>
         </div>
     </div>
-    <div class="form-group">
-        <label asp-for="PubDate" class="col-md-2 control-label">@sr["Publication Date"]</label>
-        <div class="col-md-10">
-            <input asp-for="PubDate" class="form-control"
-                   data-bs-datepicker="true"
-                   data-bs-datepicker-debug="false"
-                   data-bs-datepicker-keepOpen="false"
-                   data-bs-datepicker-allowInputToggle="true"
-                   data-bs-datepicker-locale="@CultureInfo.CurrentCulture.Name" />
-            <span asp-validation-for="PubDate" class="text-danger"></span>
-        </div>
-    </div>
+    @{ Html.RenderPartial("EditPubDate", Model); }
+
     @if (Model.TeasersEnabled)
     {
         if (Model.ContentType == "markdown")

diff --git a/src/cloudscribe.SimpleContent.Web.Views.Bootstrap3/Views/Blog/EditPubDate.cshtml b/src/cloudscribe.SimpleContent.Web.Views.Bootstrap3/Views/Blog/EditPubDate.cshtml
@@ -0,0 +1,18 @@
+@model cloudscribe.SimpleContent.Web.ViewModels.PostEditViewModel
+@using System.Globalization
+@using Microsoft.Extensions.Localization
+@using cloudscribe.SimpleContent.Web
+@inject IStringLocalizer<SimpleContent> sr
+
+<div class="form-group">
+    <label asp-for="PubDate" class="col-md-2 control-label">@sr["Publication Date"]</label>
+    <div class="col-md-10">
+        <input asp-for="PubDate" class="form-control"
+               data-bs-datepicker="true"
+               data-bs-datepicker-debug="false"
+               data-bs-datepicker-keepOpen="false"
+               data-bs-datepicker-allowInputToggle="true"
+               data-bs-datepicker-locale="@CultureInfo.CurrentCulture.Name" />
+        <span asp-validation-for="PubDate" class="text-danger"></span>
+    </div>
+</div>
diff --git a/src/cloudscribe.SimpleContent.Web.Views.Bootstrap3/Views/Page/Edit.cshtml b/src/cloudscribe.SimpleContent.Web.Views.Bootstrap3/Views/Page/Edit.cshtml
@@ -83,18 +83,8 @@
                     </div>
                 </div>
             </div>
-            <div class="form-group">
-                <label asp-for="PubDate" class="col-md-2 control-label">@sr["Publication Date"]</label>
-                <div class="col-md-10">
-                    <input asp-for="PubDate" class="form-control"
-                           data-bs-datepicker="true"
-                           data-bs-datepicker-debug="false"
-                           data-bs-datepicker-keepOpen="false"
-                           data-bs-datepicker-allowInputToggle="true"
-                           data-bs-datepicker-locale="@CultureInfo.CurrentCulture.Name" />
-                    <span asp-validation-for="PubDate" class="text-danger"></span>
-                </div>
-            </div>
+            @{ await Html.RenderPartialAsync("EditPubDate", Model); }
+
         </div>
         <div class="tab-pane" id="tabSettings" role="tabpanel" aria-labelledby="tab2">
             <div class="col-md-12">

diff --git a/src/cloudscribe.SimpleContent.Web.Views.Bootstrap3/Views/Page/EditPubDate.cshtml b/src/cloudscribe.SimpleContent.Web.Views.Bootstrap3/Views/Page/EditPubDate.cshtml
@@ -0,0 +1,17 @@
+@model cloudscribe.SimpleContent.Web.ViewModels.PageEditViewModel
+@using System.Globalization
+@using Microsoft.Extensions.Localization
+@using cloudscribe.SimpleContent.Web
+@inject IStringLocalizer<SimpleContent> sr
+<div class="form-group">
+    <label asp-for="PubDate" class="col-md-2 control-label">@sr["Publication Date"]</label>
+    <div class="col-md-10">
+        <input asp-for="PubDate" class="form-control"
+               data-bs-datepicker="true"
+               data-bs-datepicker-debug="false"
+               data-bs-datepicker-keepOpen="false"
+               data-bs-datepicker-allowInputToggle="true"
+               data-bs-datepicker-locale="@CultureInfo.CurrentCulture.Name" />
+        <span asp-validation-for="PubDate" class="text-danger"></span>
+    </div>
+</div>
diff --git a/....SimpleContent.Web.Views.Bootstrap3/cloudscribe.SimpleContent.Web.Views.Bootstrap3.csproj b/....SimpleContent.Web.Views.Bootstrap3/cloudscribe.SimpleContent.Web.Views.Bootstrap3.csproj
@@ -2,8 +2,8 @@
 
   <PropertyGroup>
     <Description>Bootstrap 3 views for cloudscribe.SimpleContent.Web</Description>
-    <VersionPrefix>2.0.19</VersionPrefix>
-    <AssemblyVersion>2.0.19</AssemblyVersion>
+    <VersionPrefix>2.0.20</VersionPrefix>
+    <AssemblyVersion>2.0.20</AssemblyVersion>
     <Authors>Joe Audette</Authors>
     <TargetFrameworks>netstandard2.0</TargetFrameworks>
     <AssemblyName>cloudscribe.SimpleContent.Web.Views.Bootstrap3</AssemblyName>

diff --git a/src/cloudscribe.SimpleContent.Web.Views.Bootstrap4/Views/Blog/Edit.cshtml b/src/cloudscribe.SimpleContent.Web.Views.Bootstrap4/Views/Blog/Edit.cshtml
@@ -63,16 +63,8 @@
             <label asp-for="IsFeatured" class="form-check-label">@sr["Is Featured"]</label>
         </div>
     </div>
-    <div class="form-group">
-        <label asp-for="PubDate">@sr["Publication Date"]</label>
-        <input asp-for="PubDate" class="form-control"
-                data-bs-datepicker="true"
-                data-bs-datepicker-debug="false"
-                data-bs-datepicker-keepOpen="false"
-                data-bs-datepicker-allowInputToggle="true"
-                data-bs-datepicker-locale="@CultureInfo.CurrentCulture.Name" />
-        <span asp-validation-for="PubDate" class="text-danger"></span>
-    </div>
+    @{ Html.RenderPartial("EditPubDate", Model); }
+
     @if (Model.TeasersEnabled)
     {
         if (Model.ContentType == "markdown")

diff --git a/src/cloudscribe.SimpleContent.Web.Views.Bootstrap4/Views/Blog/EditPubDate.cshtml b/src/cloudscribe.SimpleContent.Web.Views.Bootstrap4/Views/Blog/EditPubDate.cshtml
@@ -0,0 +1,12 @@
+@model cloudscribe.SimpleContent.Web.ViewModels.PostEditViewModel
+@inject IStringLocalizer<SimpleContent> sr
+<div class="form-group">
+    <label asp-for="PubDate">@sr["Publication Date"]</label>
+    <input asp-for="PubDate" class="form-control"
+           data-bs-datepicker="true"
+           data-bs-datepicker-debug="false"
+           data-bs-datepicker-keepOpen="false"
+           data-bs-datepicker-allowInputToggle="true"
+           data-bs-datepicker-locale="@CultureInfo.CurrentCulture.Name" />
+    <span asp-validation-for="PubDate" class="invalid-feedback"></span>
+</div>
diff --git a/src/cloudscribe.SimpleContent.Web.Views.Bootstrap4/Views/Page/Edit.cshtml b/src/cloudscribe.SimpleContent.Web.Views.Bootstrap4/Views/Page/Edit.cshtml
@@ -52,16 +52,7 @@
                     <label asp-for="IsPublished" class="form-check-label">@sr["Is Published"]</label>
                 </div>
             </div>
-            <div class="form-group">
-                <label asp-for="PubDate">@sr["Publication Date"]</label>
-                <input asp-for="PubDate" class="form-control"
-                       data-bs-datepicker="true"
-                       data-bs-datepicker-debug="false"
-                       data-bs-datepicker-keepOpen="false"
-                       data-bs-datepicker-allowInputToggle="true"
-                       data-bs-datepicker-locale="@CultureInfo.CurrentCulture.Name" />
-                <span asp-validation-for="PubDate" class="text-danger"></span>
-            </div>
+            @{ Html.RenderPartial("EditPubDate", Model); }
         </div>
         <div class="tab-pane" id="tabSettings" role="tabpanel" aria-labelledby="tab2">
             <div class="form-group mt-2">

diff --git a/src/cloudscribe.SimpleContent.Web.Views.Bootstrap4/Views/Page/EditPubDate.cshtml b/src/cloudscribe.SimpleContent.Web.Views.Bootstrap4/Views/Page/EditPubDate.cshtml
@@ -0,0 +1,12 @@
+@model cloudscribe.SimpleContent.Web.ViewModels.PageEditViewModel
+@inject IStringLocalizer<SimpleContent> sr
+<div class="form-group">
+    <label asp-for="PubDate">@sr["Publication Date"]</label>
+    <input asp-for="PubDate" class="form-control"
+           data-bs-datepicker="true"
+           data-bs-datepicker-debug="false"
+           data-bs-datepicker-keepOpen="false"
+           data-bs-datepicker-allowInputToggle="true"
+           data-bs-datepicker-locale="@CultureInfo.CurrentCulture.Name" />
+    <span asp-validation-for="PubDate" class="text-danger"></span>
+</div>
diff --git a/....SimpleContent.Web.Views.Bootstrap4/cloudscribe.SimpleContent.Web.Views.Bootstrap4.csproj b/....SimpleContent.Web.Views.Bootstrap4/cloudscribe.SimpleContent.Web.Views.Bootstrap4.csproj
@@ -2,8 +2,8 @@
 
   <PropertyGroup>
     <Description>Bootstrap 4 views for cloudscribe.SimpleContent.Web</Description>
-    <VersionPrefix>2.0.22</VersionPrefix>
-    <AssemblyVersion>2.0.22</AssemblyVersion>
+    <VersionPrefix>2.0.23</VersionPrefix>
+    <AssemblyVersion>2.0.23</AssemblyVersion>
     <Authors>Joe Audette</Authors>
     <TargetFrameworks>netstandard2.0</TargetFrameworks>
     <PackageTags>cloudscribe;SimpleContent;Bootstrap4</PackageTags>

diff --git a/src/cloudscribe.SimpleContent.Web/cloudscribe.SimpleContent.Web.csproj b/src/cloudscribe.SimpleContent.Web/cloudscribe.SimpleContent.Web.csproj
@@ -2,8 +2,8 @@
 
   <PropertyGroup>
     <Description>A simple, yet flexible content and blog engine for ASP.NET Core that can work with or without a database</Description>
-    <VersionPrefix>2.0.22</VersionPrefix>
-    <AssemblyVersion>2.0.22</AssemblyVersion>
+    <VersionPrefix>2.0.23</VersionPrefix>
+    <AssemblyVersion>2.0.23</AssemblyVersion>
     <Authors>Joe Audette</Authors>
     <TargetFrameworks>netstandard2.0</TargetFrameworks>
     <DebugType>portable</DebugType>

diff --git a/src/sourceDev.WebApp/sitefiles/s1/themes/bs3-cerulean/Shared/_Layout.cshtml b/src/sourceDev.WebApp/sitefiles/s1/themes/bs3-cerulean/Shared/_Layout.cshtml
@@ -50,13 +50,14 @@
         @await Html.PartialAsync("AlertsPartial")
         @RenderBody()
     </div>
+    @RenderSection("SideNav", required: false)
     <footer class="container text-center">
         <small>Copyright &copy; @DateTime.Now.Year - @(Tenant?.SiteName ?? "Sample")</small><br />
         <small>
             <a href="/sitemap">Site Map</a> |
             @* you are free to remove the powered by cloudscribe link but we appreciate it if you choose to keep it! *@
             <a target="_blank" href="https://www.cloudscribe.com/?utm_source=@Context.Request.Host.Value&amp;utm_medium=referral&amp;utm_campaign=poweredbycloudscribe">Powered by cloudscribe</a>
-            </small>   
+        </small>
     </footer>
     <environment names="Development">
         <script src="~/js/jquery.js" cs-resolve-theme-resource="true" cs-tenant="@Tenant"></script>