Kolpack-Software-Consulting/LeafWeb
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Customize bootstrap with SASS

Browse Source 
Update jquery validate for IE
Simplify scripting
Update home page logo
This commit is contained in:
James Kolpack
2016-12-13 09:40:40 -05:00
parent 0f9a66074d
commit cf21f17bc1
112 changed files with 15161 additions and 8034 deletions
Download Patch File Download Diff File Expand all files Collapse all files
WebCms/Views/Chart/Index.cshtml
+4 -1
View File
@@ -1,6 +1,9 @@
@model LeafWeb.WebCms.Models.ChartViewModel
@using ClientDependency.Core.Mvc
@model LeafWeb.WebCms.Models.ChartViewModel
@{
var selectText = "Select CurveId";
Html.RequiresCss("~/Content/glyphicon_animate.css");
Html.RequiresJs("~/scripts/Chart.js");
}
<div class="row">
WebCms/Views/LeafInput/Create.cshtml
+3 -2
View File
@@ -2,11 +2,12 @@
@using LeafWeb.WebCms.Controllers
@model LeafWeb.WebCms.Models.LeafInputCreate
@{
Html.EnableClientValidation();
Html.EnableUnobtrusiveJavaScript();
Html.RequiresCss("~/backload/blueimp/bootstrap/BasicPlusUI/css");
Html.RequiresJs("~/scripts/jquery.autocomplete.min.js");
Html.RequiresJs("~/scripts/jquery.validate.min.js");
Html.RequiresJs("~/scripts/jquery.validate.unobtrusive.min.js");
Html.RequiresJs("~/scripts/jquery.validate.unobtrusive.bootstrap.min.js");
Html.RequiresJs("~/scripts/LeafInputCreate.js");
}
<div class="container">
WebCms/Views/MacroPartials/LeafInputQueueDetails.cshtml
+5
View File
@@ -0,0 +1,5 @@
@inherits Umbraco.Web.Macros.PartialViewMacroPage
@{
Html.RenderAction("Details", "Queue");
}
WebCms/Views/Master.cshtml
+10 -8
View File
@@ -13,6 +13,13 @@
TempData["StatusMessage"] = "Logout sucessful";
TempData["StatusMessage-Type"] = "alert-success";
}
Html.RequiresCss("~/Content/bootstrap_leafweb.css");
Html.RequiresCss("~/Content/site.css");
Html.RequiresCss("~/Content/style.css");
Html.RequiresCss("~/css/rte.css");
Html.RequiresJs("~/scripts/jquery-1.11.1.js", 0);
Html.RequiresJs("~/scripts/bootstrap.js", 0);
Html.RequiresJs("~/scripts/site.js");
}
<!DOCTYPE html>
@@ -30,11 +37,9 @@
<!-- Fonts -->
<link href="//fonts.googleapis.com/css?family=Merriweather:400,700,300,900" rel="stylesheet" type="text/css">
<link href="//fonts.googleapis.com/css?family=Lato:300,400,700,900" rel="stylesheet" type="text/css">
<!-- CSS -->
<link href="~/Content/bootstrap.min.css" type="text/css" rel="stylesheet" />
<link href="~/Content/site.css" type="text/css" rel="stylesheet" />
<link href="~/Content/style.css" type="text/css" rel="stylesheet"/>
@Html.RenderCssHere()
@RenderSection("Styles", false)
<!-- HTML5 shim and Respond.js for IE8 support of HTML5 elements and media queries -->
@@ -84,10 +89,7 @@
</footer>
<!-- Javascripts -->
<script src="~/scripts/jquery-1.11.1.js"></script>
<script src="~/scripts/bootstrap.min.js"></script>
<script src="/scripts/site.js"></script>
@Html.Raw(Html.RenderJsHere())
@Html.RenderJsHere()
@RenderSection("Scripts", false)
</body>
</html>
WebCms/Views/Partials/BottomNavigation.cshtml
+7
View File
@@ -1,6 +1,7 @@
@inherits UmbracoTemplatePage
@{
var home = CurrentPage.Site();
var loginStatus = Members.GetCurrentLoginStatus();
}
<div class="col-xs-6 col-sm-3">
@@ -9,6 +10,12 @@
<li>
@Html.Partial("LoginStatus")
</li>
@if (loginStatus.IsLoggedIn)
{
<li>
<a href="~/umbraco#"><span class="glyphicon glyphicon-cog"></span> Site Editor</a>
</li>
}
</ul>
</div>
WebCms/Views/Partials/LoginStatus.cshtml
+6 -8
View File
@@ -7,19 +7,17 @@
@{
var loginStatusModel = Members.GetCurrentLoginStatus();
Html.EnableClientValidation();
Html.EnableUnobtrusiveJavaScript();
Html.RequiresJs("/umbraco_client/ui/jquery.js");
Html.RequiresJs("/umbraco_client/Application/JQuery/jquery.validate.min.js");
Html.RequiresJs("/umbraco_client/Application/JQuery/jquery.validate.unobtrusive.min.js");
Html.RequiresJs("~/scripts/jquery.validate.min.js");
Html.RequiresJs("~/scripts/jquery.validate.unobtrusive.min.js");
Html.RequiresJs("~/scripts/jquery.validate.unobtrusive.bootstrap.min.js");
var logoutModel = new PostRedirectModel { RedirectUrl = "/" };
}
@if (loginStatusModel.IsLoggedIn)
{
<div class="row">
<div class="col-sm-4">@loginStatusModel.Name</div>
<div class="col-sm-6">
<div class="row row-no-padding">
<div class="col-xs-8"><span class="glyphicon glyphicon-user"></span> @loginStatusModel.Name</div>
<div class="col-xs-4">
@using (Html.BeginUmbracoForm<UmbLoginStatusController>("HandleLogout"))
{
WebCms/Views/Queue/Index.cshtml
+18 -18
View File
@@ -9,41 +9,41 @@
grid.Column("LeafInputIdentifier", "Identifier"),
grid.Column("LeafInputSiteId", "Site Id"),
grid.Column("LeafInputName", "Submitted By"),
grid.Column("CurrentStatus", "Status", item => statusFormat(item)),
grid.Column("Chart", "Chart", item => chartLink(item)),
grid.Column("Total Results: " + Model.Count(), format: item => btns(item))),
grid.Column("CurrentStatus", "Status", item => StatusFormat(item)),
grid.Column("Total Results: " + Model.Count(), format: item => Btns(item))),
htmlAttributes: new { @class = "table table-striped table-bordered table-hover table-condensed" }
)
@helper btns(dynamic item)
@helper Btns(dynamic item)
{
<div class="btn-group" role="group">
@Html.ActionLink("Details", "Details", new { id = item.LeafInputId }, new { @class = "btn btn-default btn-xs", role = "button" })
<div class="btn-group text-nowrap" role="group">
<div class="btn-group" role="group">
<button type="button" class="btn btn-default btn-xs dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
Download
Actions
<span class="caret"></span>
</button>
<ul class="dropdown-menu">
<li>@Html.ActionLink("ToUser", "DownloadOutputToUser", new { id = item.LeafInputId })</li>
<li>@Html.ActionLink("Input", "DownloadInput", new { id = item.LeafInputId })</li>
<li>@DetailsLink(item)</li>
<li @if(!item.HasLeafChart) { <text>class="disabled"</text> }>@ChartLink(item)</li>
<li><a href="@Url.Action("DownloadOutputToUser", "Queue", new {id = item.LeafInputId})"><span class="glyphicon glyphicon-download"></span> Download ToUser</a></li>
<li><a href="@Url.Action("DownloadInput", "Queue", new {id = item.LeafInputId})"><span class="glyphicon glyphicon-download"></span> Download Input</a></li>
<li><a href="@Url.Action("Delete", "Queue", new {id = item.LeafInputId})"><span class="glyphicon glyphicon-remove"></span> Delete</a></li>
</ul>
</div>
@Html.ActionLink("Delete", "Delete", new { id = item.LeafInputId }, new { @class = "btn btn-default btn-xs", role = "button" })
</div>
}
@helper chartLink(dynamic item)
@helper DetailsLink(dynamic item)
{
if (item.HasLeafChart)
{
<a href="@UmbracoContext.Current.UrlProvider.GetUrl(1100)?leafInputId=@item.LeafInputId">Chart</a>
}
<a href="@UmbracoContext.Current.UrlProvider.GetUrl(1111)?id=@item.LeafInputId"><span class="glyphicon glyphicon-edit"></span> Details</a>
}
@helper statusFormat(dynamic item)
@helper ChartLink(dynamic item)
{
<a href="@UmbracoContext.Current.UrlProvider.GetUrl(1100)?leafInputId=@item.LeafInputId"><span class="glyphicon glyphicon-stats"></span> Chart</a>
}
@helper StatusFormat(dynamic item)
{
<span class="status status-@item.CurrentStatus.ToLower()">@item.CurrentStatus</span>
}
WebCms/Views/Results/Index.cshtml
+4 -1
View File
@@ -19,7 +19,10 @@
{
if (item.HasLeafChart)
{
<a href="@UmbracoContext.Current.UrlProvider.GetUrl(1100)?leafInputId=@item.LeafInputId">Chart</a>
<a href="@UmbracoContext.Current.UrlProvider.GetUrl(1100)?leafInputId=@item.LeafInputId" class="btn btn-default btn-xs" role="button">
<span class="glyphicon glyphicon-stats"></span>
Chart
</a>
}
}
WebCms/Views/TextPage.cshtml
+1 -13
View File
@@ -3,12 +3,6 @@
Layout = "Master.cshtml";
var leafInputBackload = GetBoolProperty(Model.Content.Properties, "leafInputBackload");
var chart = GetBoolProperty(Model.Content.Properties, "chart");
}
@section Styles
{
@if (leafInputBackload) { @Styles.Render("~/backload/blueimp/bootstrap/BasicPlusUI/css") }
}
<div role="content">
@@ -17,15 +11,9 @@
@section Scripts
{
<!-- Scripts for the jQquery File Upload Plugin in Basic Plus UI style* -->
@if (leafInputBackload) { @Scripts.Render("~/backload/blueimp/bootstrap/BasicPlusUI") }
<!-- jQuery autocomplete* -->
@if (leafInputBackload) { <script src="~/scripts/jquery.autocomplete.min.js"></script> }
@if (chart) { <script src="~/scripts/Chart.js"></script> }
@if (leafInputBackload)
{
<script src="~/scripts/LeafInputCreate.js"></script>
@Scripts.Render("~/backload/blueimp/bootstrap/BasicPlusUI")
<script type="text/javascript">
$(function () {