Skip to content

merge changes from dev #284

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
joeaudette merged 2 commits into from
May 26, 2018
Merged

merge changes from dev #284

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
36625e4
Merge branch 'master' into dev
joeaudette May 25, 2018
6d7fbc6
mode datepicker into partial views
joeaudette May 26, 2018
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
4 changes: 2 additions & 2 deletions src/cloudscribe.Core.SimpleContent.Views.Bootstrap4/Views/ContentSettings/Index.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -328,7 +328,7 @@
}

<div class="form-group">
<button name="submit" type="submit" class="btn btn-default" data-disabled-text='@sr["Working..."]' data-enabled-text='@sr["Save"]'>@sr["Save"]</button>
<button name="submit" type="submit" class="btn btn-primary" data-disabled-text='@sr["Working..."]' data-enabled-text='@sr["Save"]'>@sr["Save"]</button>
</div>
</form>
@if (Model.Editors.Count > 0)
Expand All @@ -340,7 +340,7 @@
{
<li>
@user.DisplayName - @user.Email
<a class="btn btn-xs btn-default" asp-action="UserEdit"
<a class="btn btn-xs btn-primary" asp-action="UserEdit"
asp-controller="UserAdmin"
asp-route-siteId="@user.SiteId"
asp-route-userId="@user.Id">@sr["Manage"]</a>
Expand Down
6 changes: 3 additions & 3 deletions ...ore.SimpleContent.Views.Bootstrap4/cloudscribe.Core.SimpleContent.Views.Bootstrap4.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
<Project Sdk="Microsoft.NET.Sdk">
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<Description>Bootstrap 4 views for cloudscribe Core and SimpleContent integration</Description>
<VersionPrefix>2.0.0</VersionPrefix>
<AssemblyVersion>2.0.0</AssemblyVersion>
<VersionPrefix>2.0.1</VersionPrefix>
<AssemblyVersion>2.0.1</AssemblyVersion>
<Authors>Joe Audette</Authors>
<TargetFrameworks>netstandard2.0</TargetFrameworks>
<PackageTags>cloudscribe;SimpleContent;Bootstrap4</PackageTags>
Expand Down
4 changes: 2 additions & 2 deletions src/cloudscribe.SimpleContent.Web.Mvc/cloudscribe.SimpleContent.Web.Mvc.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
14 changes: 2 additions & 12 deletions src/cloudscribe.SimpleContent.Web.Views.Bootstrap3/Views/Blog/Edit.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
18 changes: 18 additions & 0 deletions src/cloudscribe.SimpleContent.Web.Views.Bootstrap3/Views/Blog/EditPubDate.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>
14 changes: 2 additions & 12 deletions src/cloudscribe.SimpleContent.Web.Views.Bootstrap3/Views/Page/Edit.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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">
Expand Down
17 changes: 17 additions & 0 deletions src/cloudscribe.SimpleContent.Web.Views.Bootstrap3/Views/Page/EditPubDate.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>
4 changes: 2 additions & 2 deletions ....SimpleContent.Web.Views.Bootstrap3/cloudscribe.SimpleContent.Web.Views.Bootstrap3.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
16 changes: 4 additions & 12 deletions src/cloudscribe.SimpleContent.Web.Views.Bootstrap4/Views/Blog/Edit.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand All @@ -90,7 +82,7 @@
}

<div class="form-group">
<button id="btnSave" name="submit" type="submit" class="btn btn-default" data-disabled-text='@sr["Working..."]' data-enabled-text='@sr["Save"]'>@sr["Save"]</button>
<button id="btnSave" name="submit" type="submit" class="btn btn-primary" data-disabled-text='@sr["Working..."]' data-enabled-text='@sr["Save"]'>@sr["Save"]</button>
@if (!string.IsNullOrEmpty(Model.Id))
{
<button type="button" class="btn btn-danger" data-toggle="modal" data-target="#confirmDeleteModal">
Expand All @@ -114,7 +106,7 @@
@string.Format(sr["Are you sure you want to delete the post {0}? You cannot undo this action."], Model.Title)
</div>
<div class="modal-footer">
<button type="button" class="btn btn-default" data-dismiss="modal">@sr["Cancel"]</button>
<button type="button" class="btn btn-primary" data-dismiss="modal">@sr["Cancel"]</button>
<input type="submit" value='@sr["Delete"]' class="btn btn-danger btn-ok" />
</div>
</div>
Expand Down
12 changes: 12 additions & 0 deletions src/cloudscribe.SimpleContent.Web.Views.Bootstrap4/Views/Blog/EditPubDate.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>
2 changes: 1 addition & 1 deletion src/cloudscribe.SimpleContent.Web.Views.Bootstrap4/Views/Page/AddCssPartial.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,5 +22,5 @@
<input asp-for="Url" name="Url" class="form-control ml-1 mr-1" style="min-width:350px;" />
<span asp-validation-for="Url" class="text-danger"></span>
</div>
<button type="submit" class="btn btn-default ml-1">@sr["Add CSS Url"]</button>
<button type="submit" class="btn btn-primary ml-1">@sr["Add CSS Url"]</button>
</form>
2 changes: 1 addition & 1 deletion src/cloudscribe.SimpleContent.Web.Views.Bootstrap4/Views/Page/AddJsPartial.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,5 +22,5 @@
<input asp-for="Url" name="Url" class="form-control ml-1 mr-1" style="min-width:350px;" />
<span asp-validation-for="Url" class="text-danger"></span>
</div>
<button type="submit" class="btn btn-default">@sr["Add Javascript Url"]</button>
<button type="submit" class="btn btn-primary">@sr["Add Javascript Url"]</button>
</form>
19 changes: 5 additions & 14 deletions src/cloudscribe.SimpleContent.Web.Views.Bootstrap4/Views/Page/Edit.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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">
Expand Down Expand Up @@ -137,7 +128,7 @@
<div class="form-group">
<label asp-for="ViewRoles">@sr["View Roles"]</label>
<input asp-for="ViewRoles" class="form-control" style="width:80%;" data-toggle="tooltip" title='@sr["Leave View Roles blank for public pages. You can put comma separated role names here to make a page visible only to users who are role members."]' />
<a class="btn btn-default"
<a class="btn btn-primary"
csc-role-selector="@roleSelector"
csc-projectId="@Model.ProjectId"
csc-target-id="ViewRoles">@sr["Select Roles"]</a>
Expand All @@ -146,7 +137,7 @@
</div>
</div>
<div class="form-group">
<button id="btnSave" name="submit" type="submit" class="btn btn-default" data-disabled-text='@sr["Working..."]' data-enabled-text='@sr["Save"]'>@sr["Save"]</button>
<button id="btnSave" name="submit" type="submit" class="btn btn-primary" data-disabled-text='@sr["Working..."]' data-enabled-text='@sr["Save"]'>@sr["Save"]</button>
@if (!string.IsNullOrEmpty(Model.Id))
{
<button type="button" class="btn btn-danger" data-toggle="modal" data-target="#confirmDeleteModal">
Expand All @@ -155,7 +146,7 @@
}
@if (showDev)
{
<a class="btn btn-default" asp-route="@pageRoutes.PageDevelopRouteName" asp-route-slug="@Model.Slug">@sr["Developer Tools"]</a>
<a class="btn btn-primary" asp-route="@pageRoutes.PageDevelopRouteName" asp-route-slug="@Model.Slug">@sr["Developer Tools"]</a>
}
</div>
</form>
Expand All @@ -174,7 +165,7 @@
@string.Format(sr["Are you sure you want to delete the page {0}? You cannot undo this action."], Model.Title)
</div>
<div class="modal-footer">
<button type="button" class="btn btn-default" data-dismiss="modal">@sr["Cancel"]</button>
<button type="button" class="btn btn-primary" data-dismiss="modal">@sr["Cancel"]</button>
<input type="submit" value='@sr["Delete"]' class="btn btn-danger btn-ok" />
</div>
</div>
Expand Down
12 changes: 12 additions & 0 deletions src/cloudscribe.SimpleContent.Web.Views.Bootstrap4/Views/Page/EditPubDate.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>
16 changes: 8 additions & 8 deletions src/cloudscribe.SimpleContent.Web.Views.Bootstrap4/Views/Page/TreeMainPartial.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,25 +10,25 @@
</h1>
</header>
<p>@sr["You can drag and drop page nodes in the treeview below to move them around in the site hierarchy or to change their sort position. Click on a page to show a menu of commands related to that page. Note that changes will not be reflected in the main menu until you refresh the page."]</p>
<a href="@Model.EditUrl" class="btn btn-default pagecommand"><span class="@themeSettings.Icons.NewItem" aria-hidden="true"></span> @sr["New Root Level Page"]</a>
<a href="@Model.EditUrl" class="btn btn-primary pagecommand"><span class="@themeSettings.Icons.NewItem" aria-hidden="true"></span> @sr["New Root Level Page"]</a>
<div id="tree1" class="treecontainer"></div>
<div id="cmdBar" class="panel panel-default commandPanel" style="display:none;">
<div id="cmdHeading" class="btn btn-primary btn-block">Panel heading</div>
<ul id="ulCommands" class="pagecommands">
<li id="liEdit" class="editcontent">
<a id="lnkEdit" class="btn btn-default pagecommand" href="#"><span class="@themeSettings.Icons.Edit" aria-hidden="true"></span> @sr["Edit Page"] (<small class="pubstatus" id="spnPubStatus"></small>)</a>
<a id="lnkEdit" class="btn btn-primary pagecommand" href="#"><span class="@themeSettings.Icons.Edit" aria-hidden="true"></span> @sr["Edit Page"] (<small class="pubstatus" id="spnPubStatus"></small>)</a>
</li>
<li id="liView" class="viewpage">
<a id="lnkView" class="btn btn-default pagecommand" href="#"><span class="@themeSettings.Icons.View" aria-hidden="true"></span> @sr["View"]</a>
<a id="lnkView" class="btn btn-primary pagecommand" href="#"><span class="@themeSettings.Icons.View" aria-hidden="true"></span> @sr["View"]</a>
</li>
<li id="liSort" class="sortpages">
<a id="lnkSort" class="btn btn-default pagecommand" href="#"><span class="@themeSettings.Icons.SortAlpha" aria-hidden="true"></span> @sr["Sort Child Pages Alpha"]</a>
<a id="lnkSort" class="btn btn-primary pagecommand" href="#"><span class="@themeSettings.Icons.SortAlpha" aria-hidden="true"></span> @sr["Sort Child Pages Alpha"]</a>
</li>
<li id="liNewChild" class="newchild">
<a id="lnkNewChild" class="btn btn-default pagecommand" href="#"><span class="@themeSettings.Icons.NewItem" aria-hidden="true"></span> @sr["New Child Page"]</a>
<a id="lnkNewChild" class="btn btn-primary pagecommand" href="#"><span class="@themeSettings.Icons.NewItem" aria-hidden="true"></span> @sr["New Child Page"]</a>
</li>
<li id="liDelete" class="deletepage">
<a id="lnkDeletePage" class="btn btn-default pagecommand" href="#"><span class="@themeSettings.Icons.Delete" aria-hidden="true"></span> @sr["Delete"]</a>
<a id="lnkDeletePage" class="btn btn-primary pagecommand" href="#"><span class="@themeSettings.Icons.Delete" aria-hidden="true"></span> @sr["Delete"]</a>
</li>
</ul>
</div>
Expand All @@ -44,7 +44,7 @@

</div>
<div class="modal-footer">
<button type="button" class="btn btn-default" data-dismiss="modal">@sr["Cancel"]</button>
<button type="button" class="btn btn-primary" data-dismiss="modal">@sr["Cancel"]</button>
<button id="btnConfirm" type="button" class="btn btn-success btn-ok">@sr["Confirm"]</button>
</div>
</div>
Expand All @@ -61,7 +61,7 @@

</div>
<div class="modal-footer">
<button type="button" class="btn btn-default" data-dismiss="modal">@sr["Cancel"]</button>
<button type="button" class="btn btn-primary" data-dismiss="modal">@sr["Cancel"]</button>
<button id="btnConfirmDelete" type="button" class="btn btn-danger btn-ok">@sr["Delete"]</button>
</div>
</div>
Expand Down
6 changes: 3 additions & 3 deletions ....SimpleContent.Web.Views.Bootstrap4/cloudscribe.SimpleContent.Web.Views.Bootstrap4.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
<Project Sdk="Microsoft.NET.Sdk">
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<Description>Bootstrap 4 views for cloudscribe.SimpleContent.Web</Description>
<VersionPrefix>2.0.21</VersionPrefix>
<AssemblyVersion>2.0.21</AssemblyVersion>
<VersionPrefix>2.0.23</VersionPrefix>
<AssemblyVersion>2.0.23</AssemblyVersion>
<Authors>Joe Audette</Authors>
<TargetFrameworks>netstandard2.0</TargetFrameworks>
<PackageTags>cloudscribe;SimpleContent;Bootstrap4</PackageTags>
Expand Down
4 changes: 2 additions & 2 deletions src/cloudscribe.SimpleContent.Web/cloudscribe.SimpleContent.Web.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
3 changes: 2 additions & 1 deletion src/sourceDev.WebApp/sitefiles/s1/themes/bs3-cerulean/Shared/_Layout.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down