Skip to content

Commit 9ba76ce

Browse files
joeaudettejoeaudette
authored
Merge pull request #284 from cloudscribe/dev
merge changes from dev
2 parents c438acb + 6d7fbc6 commit 9ba76ce

13 files changed

Lines changed: 76 additions & 53 deletions

File tree

‎src/cloudscribe.SimpleContent.Web.Mvc/cloudscribe.SimpleContent.Web.Mvc.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22

33
<PropertyGroup>
44
<Description>MVC Controllers for cloudscribe.SimpleContent.Web</Description>
5-
<VersionPrefix>2.0.30</VersionPrefix>
6-
<AssemblyVersion>2.0.30</AssemblyVersion>
5+
<VersionPrefix>2.0.31</VersionPrefix>
6+
<AssemblyVersion>2.0.31</AssemblyVersion>
77
<Authors>Joe Audette</Authors>
88
<TargetFrameworks>netstandard2.0</TargetFrameworks>
99
<DebugType>portable</DebugType>

‎src/cloudscribe.SimpleContent.Web.Views.Bootstrap3/Views/Blog/Edit.cshtml‎

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -98,18 +98,8 @@
9898
</div>
9999
</div>
100100
</div>
101-
<div class="form-group">
102-
<label asp-for="PubDate" class="col-md-2 control-label">@sr["Publication Date"]</label>
103-
<div class="col-md-10">
104-
<input asp-for="PubDate" class="form-control"
105-
data-bs-datepicker="true"
106-
data-bs-datepicker-debug="false"
107-
data-bs-datepicker-keepOpen="false"
108-
data-bs-datepicker-allowInputToggle="true"
109-
data-bs-datepicker-locale="@CultureInfo.CurrentCulture.Name" />
110-
<span asp-validation-for="PubDate" class="text-danger"></span>
111-
</div>
112-
</div>
101+
@{ Html.RenderPartial("EditPubDate", Model); }
102+
113103
@if (Model.TeasersEnabled)
114104
{
115105
if (Model.ContentType == "markdown")

‎src/cloudscribe.SimpleContent.Web.Views.Bootstrap3/Views/Blog/EditPubDate.cshtml‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
@model cloudscribe.SimpleContent.Web.ViewModels.PostEditViewModel
2+
@using System.Globalization
3+
@using Microsoft.Extensions.Localization
4+
@using cloudscribe.SimpleContent.Web
5+
@inject IStringLocalizer<SimpleContent> sr
6+
7+
<div class="form-group">
8+
<label asp-for="PubDate" class="col-md-2 control-label">@sr["Publication Date"]</label>
9+
<div class="col-md-10">
10+
<input asp-for="PubDate" class="form-control"
11+
data-bs-datepicker="true"
12+
data-bs-datepicker-debug="false"
13+
data-bs-datepicker-keepOpen="false"
14+
data-bs-datepicker-allowInputToggle="true"
15+
data-bs-datepicker-locale="@CultureInfo.CurrentCulture.Name" />
16+
<span asp-validation-for="PubDate" class="text-danger"></span>
17+
</div>
18+
</div>

‎src/cloudscribe.SimpleContent.Web.Views.Bootstrap3/Views/Page/Edit.cshtml‎

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -83,18 +83,8 @@
8383
</div>
8484
</div>
8585
</div>
86-
<div class="form-group">
87-
<label asp-for="PubDate" class="col-md-2 control-label">@sr["Publication Date"]</label>
88-
<div class="col-md-10">
89-
<input asp-for="PubDate" class="form-control"
90-
data-bs-datepicker="true"
91-
data-bs-datepicker-debug="false"
92-
data-bs-datepicker-keepOpen="false"
93-
data-bs-datepicker-allowInputToggle="true"
94-
data-bs-datepicker-locale="@CultureInfo.CurrentCulture.Name" />
95-
<span asp-validation-for="PubDate" class="text-danger"></span>
96-
</div>
97-
</div>
86+
@{ await Html.RenderPartialAsync("EditPubDate", Model); }
87+
9888
</div>
9989
<div class="tab-pane" id="tabSettings" role="tabpanel" aria-labelledby="tab2">
10090
<div class="col-md-12">

‎src/cloudscribe.SimpleContent.Web.Views.Bootstrap3/Views/Page/EditPubDate.cshtml‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
@model cloudscribe.SimpleContent.Web.ViewModels.PageEditViewModel
2+
@using System.Globalization
3+
@using Microsoft.Extensions.Localization
4+
@using cloudscribe.SimpleContent.Web
5+
@inject IStringLocalizer<SimpleContent> sr
6+
<div class="form-group">
7+
<label asp-for="PubDate" class="col-md-2 control-label">@sr["Publication Date"]</label>
8+
<div class="col-md-10">
9+
<input asp-for="PubDate" class="form-control"
10+
data-bs-datepicker="true"
11+
data-bs-datepicker-debug="false"
12+
data-bs-datepicker-keepOpen="false"
13+
data-bs-datepicker-allowInputToggle="true"
14+
data-bs-datepicker-locale="@CultureInfo.CurrentCulture.Name" />
15+
<span asp-validation-for="PubDate" class="text-danger"></span>
16+
</div>
17+
</div>

‎src/cloudscribe.SimpleContent.Web.Views.Bootstrap3/cloudscribe.SimpleContent.Web.Views.Bootstrap3.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22

33
<PropertyGroup>
44
<Description>Bootstrap 3 views for cloudscribe.SimpleContent.Web</Description>
5-
<VersionPrefix>2.0.19</VersionPrefix>
6-
<AssemblyVersion>2.0.19</AssemblyVersion>
5+
<VersionPrefix>2.0.20</VersionPrefix>
6+
<AssemblyVersion>2.0.20</AssemblyVersion>
77
<Authors>Joe Audette</Authors>
88
<TargetFrameworks>netstandard2.0</TargetFrameworks>
99
<AssemblyName>cloudscribe.SimpleContent.Web.Views.Bootstrap3</AssemblyName>

‎src/cloudscribe.SimpleContent.Web.Views.Bootstrap4/Views/Blog/Edit.cshtml‎

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -63,16 +63,8 @@
6363
<label asp-for="IsFeatured" class="form-check-label">@sr["Is Featured"]</label>
6464
</div>
6565
</div>
66-
<div class="form-group">
67-
<label asp-for="PubDate">@sr["Publication Date"]</label>
68-
<input asp-for="PubDate" class="form-control"
69-
data-bs-datepicker="true"
70-
data-bs-datepicker-debug="false"
71-
data-bs-datepicker-keepOpen="false"
72-
data-bs-datepicker-allowInputToggle="true"
73-
data-bs-datepicker-locale="@CultureInfo.CurrentCulture.Name" />
74-
<span asp-validation-for="PubDate" class="text-danger"></span>
75-
</div>
66+
@{ Html.RenderPartial("EditPubDate", Model); }
67+
7668
@if (Model.TeasersEnabled)
7769
{
7870
if (Model.ContentType == "markdown")

‎src/cloudscribe.SimpleContent.Web.Views.Bootstrap4/Views/Blog/EditPubDate.cshtml‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
@model cloudscribe.SimpleContent.Web.ViewModels.PostEditViewModel
2+
@inject IStringLocalizer<SimpleContent> sr
3+
<div class="form-group">
4+
<label asp-for="PubDate">@sr["Publication Date"]</label>
5+
<input asp-for="PubDate" class="form-control"
6+
data-bs-datepicker="true"
7+
data-bs-datepicker-debug="false"
8+
data-bs-datepicker-keepOpen="false"
9+
data-bs-datepicker-allowInputToggle="true"
10+
data-bs-datepicker-locale="@CultureInfo.CurrentCulture.Name" />
11+
<span asp-validation-for="PubDate" class="invalid-feedback"></span>
12+
</div>

‎src/cloudscribe.SimpleContent.Web.Views.Bootstrap4/Views/Page/Edit.cshtml‎

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -52,16 +52,7 @@
5252
<label asp-for="IsPublished" class="form-check-label">@sr["Is Published"]</label>
5353
</div>
5454
</div>
55-
<div class="form-group">
56-
<label asp-for="PubDate">@sr["Publication Date"]</label>
57-
<input asp-for="PubDate" class="form-control"
58-
data-bs-datepicker="true"
59-
data-bs-datepicker-debug="false"
60-
data-bs-datepicker-keepOpen="false"
61-
data-bs-datepicker-allowInputToggle="true"
62-
data-bs-datepicker-locale="@CultureInfo.CurrentCulture.Name" />
63-
<span asp-validation-for="PubDate" class="text-danger"></span>
64-
</div>
55+
@{ Html.RenderPartial("EditPubDate", Model); }
6556
</div>
6657
<div class="tab-pane" id="tabSettings" role="tabpanel" aria-labelledby="tab2">
6758
<div class="form-group mt-2">

‎src/cloudscribe.SimpleContent.Web.Views.Bootstrap4/Views/Page/EditPubDate.cshtml‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
@model cloudscribe.SimpleContent.Web.ViewModels.PageEditViewModel
2+
@inject IStringLocalizer<SimpleContent> sr
3+
<div class="form-group">
4+
<label asp-for="PubDate">@sr["Publication Date"]</label>
5+
<input asp-for="PubDate" class="form-control"
6+
data-bs-datepicker="true"
7+
data-bs-datepicker-debug="false"
8+
data-bs-datepicker-keepOpen="false"
9+
data-bs-datepicker-allowInputToggle="true"
10+
data-bs-datepicker-locale="@CultureInfo.CurrentCulture.Name" />
11+
<span asp-validation-for="PubDate" class="text-danger"></span>
12+
</div>

0 commit comments

Comments
 (0)