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

Migrate to bootstrap 4 in LeafWeb

Browse Source
This commit is contained in:
James Kolpack
2019-12-06 22:29:15 -05:00
parent f9a452045f
commit 88469b19be
248 changed files with 20293 additions and 21639 deletions
Download Patch File Download Diff File Expand all files Collapse all files
WebCms/Views/Chart/Index.cshtml
+8 -19
View File
@@ -1,27 +1,26 @@
@using ClientDependency.Core.Mvc
@model LeafWeb.WebCms.Models.ChartViewModel
@{
Html.RequiresCss("~/Content/glyphicon_animate.css");
Html.RequiresJs("~/scripts/Chart.js");
Html.RequiresCss("~/Content/jquery.fancybox.min.css");
Html.RequiresJs("~/scripts/jquery.fancybox.min.js");
}
<div class="row">
<div class="col-md-6 col-md-offset-3">
<div class="panel panel-success">
<div class="panel-heading">
Identifier: <strong>@Model.LeafInputIdentifier</strong>
</div>
<div class="panel text-center">
<div class="col-md-6 offset-3">
<div class="card">
<div class="card-body">
<h4 class="card-title">
Identifier: <strong>@Model.LeafInputIdentifier</strong>
</h4>
@foreach (var cId in Model.AvailableCurveId)
{
<p>
<a href="@Url.Action("ChartCurve", new {leafInputId = Model.LeafInputId, curveId = cId})"
data-fancybox
data-options='{"buttons" : ["zoom", "download", "close"]}'
class="btn btn-default">
<i class="glyphicon glyphicon-picture"></i>
class="btn btn-outline-secondary">
<i class="fa fa-picture-o"></i>
@cId Chart
</a>
</p>
@@ -30,13 +29,3 @@
</div>
</div>
</div>
@section Scripts {
<script type="text/javascript">
</script>
}
@*<img id="chart" />
<span class="help-block">
<span id="chart-error"></span>
</span>*@
WebCms/Views/LeafInput/Create.cshtml
+28 -25
View File
@@ -11,19 +11,21 @@
Html.RequiresJs("~/scripts/LeafInputCreate.js", 3);
}
<div class="container">
<div class="container-lg">
<div class="row">
<div class="col-md-7 well">
<div class="col-md-12 card card-body bg-light">
@Html.Partial("_ValidationSummary")
<form id="fileupload" action="/Backload/FileHandler" method="POST" enctype="multipart/form-data">
<label class="control-label">Files</label>
<h4 class="card-title">Files</h4>
<!-- The fileupload-buttonbar contains buttons to add/delete files and start/cancel the upload -->
<div class="row fileupload-buttonbar">
<div class="col-lg-5">
<div class="form-row fileupload-buttonbar">
<div class="form-group col">
<!-- The fileinput-button span is used to style the file input field as button -->
<span class="btn btn-default fileinput-button">
<i class="glyphicon glyphicon-plus"></i>
<span class="btn btn-sm btn-outline-secondary fileinput-button">
<i class="fa fa-plus"></i>
<span>Add files...</span>
<input type="file" name="files[]" multiple>
</span>
@@ -31,19 +33,19 @@
<!-- The global file processing state -->
<span class="fileupload-process"></span>
</div>
<div class="col-lg-6 pull-right">
<span class="pull-right" style="margin-left: 10px;"> Select all <input type="checkbox" class="toggle"></span>
<button type="button" class="btn btn-default delete pull-right">
<i class="glyphicon glyphicon-trash"></i>
<div class="form-group col-sm-4 pull-right">
<span class="pull-right" style="margin-left: 10px"> Select all <input type="checkbox" class="toggle"></span>
<button type="button" class="btn btn-sm btn-outline-secondary delete pull-right">
<i class="fa fa-trash"></i>
<span>Delete</span>
</button>
</div>
<!-- The global progress state -->
<div class="col-lg-12 fileupload-progress fade">
<div class="col-md-12 fileupload-progress fade">
<!-- The global progress bar -->
<div class="progress progress-striped active" role="progressbar" aria-valuemin="0" aria-valuemax="100">
<div class="progress-bar progress-bar-success" style="width: 0%;"></div>
<div class="progress progress-bar-striped active" role="progressbar" aria-valuemin="0" aria-valuemax="100">
<div class="progress-bar bg-success" style="width: 0%;"></div>
</div>
<!-- The extended global progress state -->
@*<div class="progress-extended">&nbsp;</div>*@
@@ -51,7 +53,9 @@
</div>
@Html.Partial("_ValidationField", "Files")
<!-- The table listing the files available for upload/download -->
<table role="presentation" class="table table-striped panel panel-default"><tbody class="files"></tbody></table>
<div class="table-responsive">
<table role="presentation" class="table table-sm table-striped"><tbody class="files"></tbody></table>
</div>
</form>
@using (Html.BeginUmbracoForm<LeafInputController>("Submit", null, new {id = "create"}))
@@ -63,7 +67,7 @@
@Html.EditorFor(m => m.Email)
@Html.EditorFor(m => m.EmailConfirm)
@Html.EditorFor(m => m.TermsOfService)
<input type="submit" id="submit-form" class="hidden"/>
<input type="submit" id="submit-form" class="d-none"/>
}
<label for="submit-form" class="btn btn-primary pull-right">Submit...</label>
</div>
@@ -86,14 +90,14 @@
</td>
<td>
{% if (!i && !o.options.autoUpload) { %}
<button class="btn btn-xs btn-primary start" disabled>
<i class="glyphicon glyphicon-upload"></i>
<button class="btn btn-sm btn-primary start" disabled>
<i class="fa fa-upload"></i>
<span>Start</span>
</button>
{% } %}
{% if (!i) { %}
<button class="btn btn-xs btn-warning cancel">
<i class="glyphicon glyphicon-ban-circle"></i>
<button class="btn btn-sm btn-warning cancel">
<i class="fa fa-ban"></i>
<span>Cancel</span>
</button>
{% } %}
@@ -124,14 +128,14 @@
</td>
<td>
{% if (file.deleteUrl) { %}
<button class="btn btn-xs btn-default delete" data-type="{%=file.deleteType%}" data-url="{%=file.deleteUrl%}" {% if (file.deletewithcredentials) { %} data-xhr-fields='{"withCredentials":true}' {% } %}>
<i class="glyphicon glyphicon-trash"></i>
<button class="btn btn-sm btn-outline-secondary delete" data-type="{%=file.deleteType%}" data-url="{%=file.deleteUrl%}" {% if (file.deletewithcredentials) { %} data-xhr-fields='{"withCredentials":true}' {% } %}>
<i class="fa fa-trash"></i>
<span>Delete</span>
</button>
<input type="checkbox" name="delete" value="1" class="toggle">
{% } else { %}
<button class="btn btn-xs btn-warning cancel">
<i class="glyphicon glyphicon-ban-circle"></i>
<button class="btn btn-sm btn-warning cancel">
<i class="fa fa-ban"></i>
<span>Cancel</span>
</button>
{% } %}
@@ -139,5 +143,4 @@
</tr>
{% } %}
</script>
WebCms/Views/MacroPartials/BannerLink.cshtml
+2 -2
View File
@@ -3,9 +3,9 @@
var link = Model.MacroParameters["Link"];
var title = Model.MacroParameters["Title"];
var description = Model.MacroParameters["Description"];
var glyphicon = Model.MacroParameters["Glyphicon"];
var faicon = Model.MacroParameters["FaIcon"];
}
<a class="banner-link" href="@link">
<h2>@title <span class="glyphicon @glyphicon"></span></h2>
<h2>@title <span class="fa @faicon"></span></h2>
<p>@description</p>
</a>
WebCms/Views/MacroPartials/Membership/Login.cshtml
+3 -3
View File
@@ -16,18 +16,18 @@
<div class="container top-buffer">
<div class="row">
<div class="col-md-7 well">
<div class="col-md-7 card card-body bg-light">
@using (Html.BeginUmbracoForm<UmbLoginController>("HandleLogin"))
{
<fieldset>
@Html.ValidationSummary("loginModel", true)
<div class="form-group">
@Html.LabelFor(m => loginModel.Username, new { @class = "control-label" })
@Html.LabelFor(m => loginModel.Username)
@Html.TextBoxFor(m => loginModel.Username)
@Html.ValidationMessageFor(m => loginModel.Username)
</div>
<div class="form-group">
@Html.LabelFor(m => loginModel.Password, new { @class = "control-label" })
@Html.LabelFor(m => loginModel.Password)
@Html.PasswordFor(m => loginModel.Password)
@Html.ValidationMessageFor(m => loginModel.Password)
</div>
WebCms/Views/Master.cshtml
+21 -23
View File
@@ -61,31 +61,29 @@
</head>
<body @{if (CompileFlag.IsDebug()) {<text>class="debug"</text>}}>
<header>
<div class="container">
<div class="row">
<div class="col-xs-8 col-sm-12 col-md-4">
<a href="@home.Url">
<div class="brand" style="background-image:url('@(home.SiteLogo)?height=65&width=205&bgcolor=000')"></div>
</a>
</div>
<div class="col-sm-12 col-md-8">
<nav>
@{ // ReSharper disable once Mvc.PartialViewNotResolved
Html.RenderPartial("MainNavigation"); }
<header>
<div class="container-lg">
<nav class="navbar navbar-expand-lg navbar-dark bg-dark">
<a class="navbar-brand" href="@home.Url">
<img src="@(home.SiteLogo)" height="65" width="205" alt="LeafWeb"/>
</a>
<button class="navbar-toggler" type="button"
data-toggle="collapse" data-target="#navbarSupportedContent"
aria-controls="navbarSupportedContent" aria-expanded="false"
aria-label="Toggle navigation">
<span class="navbar-toggler-icon"></span>
</button>
@{
// ReSharper disable once Mvc.PartialViewNotResolved
Html.RenderPartial("MainNavigation");
}
</nav>
</nav>
</div>
</div>
</div>
<div id="toggle" class="toggle">
<a href="#" class="cross"><span></span></a>
</div>
</header>
@Html.Partial("_StatusMessage")
</header>
@Html.Partial("_StatusMessage")
@RenderBody()
WebCms/Views/Partials/BottomNavigation.cshtml
+1 -19
View File
@@ -1,24 +1,6 @@
@inherits UmbracoTemplatePage
@{
var home = CurrentPage.Site();
var loginStatus = Members.GetCurrentLoginStatus();
}
<div class="col-xs-6 col-sm-3">
<strong>User</strong>
<ul>
<li>
@Html.Partial("LoginStatus")
</li>
@if (loginStatus.IsLoggedIn)
{
<li>
<a href="~/umbraco#"><span class="glyphicon glyphicon-cog"></span> Site Editor</a>
</li>
}
</ul>
</div>
<div class="col-xs-6 col-sm-6 text-center">
<div class="col text-center">
<span class="copyright">
<i class="fa fa-copyright copyright"></i> ORNL @DateTime.Now.Year
</span>
WebCms/Views/Partials/LoginStatus.cshtml
+22 -17
View File
@@ -13,21 +13,26 @@
var logoutModel = new PostRedirectModel { RedirectUrl = "/" };
}
@if (loginStatusModel.IsLoggedIn)
{
<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"))
{
<button href="#" class="btn btn-primary btn-transparent btn-xs">Logout</button>
@Html.HiddenFor(m => logoutModel.RedirectUrl)
}
</div>
<div class="container">
<div class="row align-items-center">
@if (loginStatusModel.IsLoggedIn)
{
<div class="col-md-auto">
<span class="fa fa-user"></span> @loginStatusModel.Name
</div>
<div class="col-sm">
@using (Html.BeginUmbracoForm<UmbLoginStatusController>("HandleLogout"))
{
<button href="#" class="btn btn-outline-secondary btn-sm">Logout</button>
@Html.HiddenFor(m => logoutModel.RedirectUrl)
}
</div>
}
else
{
<div class="col-md-auto">
<a href="/membership/login" class="nav-link"><span class="fa fa-user"></span> Login</a>
</div>
}
</div>
}
else
{
<a href="/membership/login" class="btn btn-default btn-transparent btn-xs" >Login</a>
}
</div>
WebCms/Views/Partials/MainNavigation.cshtml
+58 -54
View File
@@ -1,36 +1,54 @@
@inherits UmbracoTemplatePage
@{ var home = CurrentPage.Site(); }
@{
var home = CurrentPage.Site();
var loginStatus = Members.GetCurrentLoginStatus();
}
@if (home.Children.Any())
{
@* Get the first page in the children *@
var naviLevel = home.Children.First().Level;
@* Add in level for a CSS hook *@
<ul class="level-@naviLevel">
@* For each child page under the home node *@
@foreach (var childPage in home.Children.Where("Visible"))
{
if (childPage.Children.Where("Visible").Any())
<div class="collapse navbar-collapse" id="navbarSupportedContent">
<ul class="navbar-nav mr-auto">
@* For each child page under the home node *@
@foreach (var childPage in home.Children.Where("Visible"))
{
<li class="has-child @(childPage.IsAncestorOrSelf(CurrentPage) ? "selected" : null)">
@if(childPage.DocumentTypeAlias == "LandingPage")
{
<span>@childPage.Name</span>
@childPages(childPage.Children)
} else {
<a href="@childPage.Url">@childPage.Name</a>
}
</li>
}
else
if (childPage.Children.Where("Visible").Any())
{
<li class="nav-item dropdown @(childPage.IsAncestorOrSelf(CurrentPage) ? "active" : null)">
@if (childPage.DocumentTypeAlias == "LandingPage")
{
<a class="nav-link dropdown-toggle" href="#" id="navbarDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
@childPage.Name
</a>
@childPages(childPage.Children)
}
else
{
<a class="nav-link" href="@childPage.Url">@childPage.Name</a>
}
</li>
}
else
{
<li class="nav-item @(childPage.IsAncestorOrSelf(CurrentPage) ? "active" : null)">
<a class="nav-link" href="@childPage.Url">@childPage.Name</a>
</li>
}
}
</ul>
<div class="navbar-text text-light text-left">
@Html.Partial("LoginStatus")
@if (loginStatus.IsLoggedIn)
{
<li class="@(childPage.IsAncestorOrSelf(CurrentPage) ? "selected" : null)">
<a href="@childPage.Url">@childPage.Name</a>
</li>
}
}
</ul>
<div class="align-items-center">
<a href="~/umbraco#"><span class="fa fa-cog"></span> Site Editor</a>
<i class="fa fa-lock fa-fw text-danger" aria-hidden="true"></i>
</div>
}
</div>
</div>
}
@helper childPages(dynamic pages)
@@ -38,35 +56,21 @@
@* Ensure that we have a collection of pages *@
if (pages.Where("Visible").Any())
{
@* Get the first page in pages and get the level *@
var naviLevel = pages.First().Level;
@* Add in level for a CSS hook *@
<ul class="sublevel level-@(naviLevel)">
@foreach (var page in pages.Where("Visible"))
<div class="dropdown-menu bg-dark" aria-labelledby="navbarDropdown">
@foreach (var page in pages.Where("Visible"))
{
if (library.IsProtected(page.id, page.path)
&& !library.HasAccess(page.id, page.path))
{
if (library.IsProtected(page.id, page.path)
&& !library.HasAccess(page.id, page.path))
{
continue;
}
<li>
<a href="@page.Url">
@page.Name
@if (library.IsProtected(page.id, page.path)) {
<i class="fa fa-lock fa-fw text-danger" aria-hidden="true"></i>
}
</a>
@* if the current page has any children *@
@if (page.Children.Where("Visible").Any())
{
@* Call our helper to display the children *@
@childPages(page.Children)
}
</li>
continue;
}
</ul>
<a class="dropdown-item text-light" href="@page.Url">
@page.Name
@if (library.IsProtected(page.id, page.path)) {
<i class="fa fa-lock fa-fw text-danger" aria-hidden="true"></i>
}
</a>
}
</div>
}
}
WebCms/Views/Queue/Details.cshtml
+45 -30
View File
@@ -2,44 +2,59 @@
@model LeafInputDetails
<div class="row">
<div class="col-sm-3 divider-right detail-actions">
<div class="col divider-right">
<h3>Actions</h3>
<div>
<div class="btn-group-vertical" role="group" aria-label="">
@Html.Partial("DisplayTemplates/_ChartButton", Model.LeafInputId, new ViewDataDictionary { { "Disabled", !Model.HasLeafChart } })
</div>
<h6>Download</h6>
<div class="btn-group-vertical" role="group" aria-label="Download">
@Html.Partial("DisplayTemplates/_ChartButton", Model.LeafInputId, new ViewDataDictionary { { "Disabled", !Model.HasLeafChart } })
<a href="@Url.Action("DownloadInput", "Queue", new {id = Model.LeafInputId})"
class="btn btn-outline-secondary text-left" role="button">
<span class="fa fa-download"></span> Input
</a>
<a href="@Url.Action("DownloadInput", "Queue", new {id = Model.LeafInputId})"
class="btn btn-default" role="button">
<span class="glyphicon glyphicon-download"></span> Download Input
</a>
<a href="@Url.Action("DownloadOutputToUser", "Queue", new {id = Model.LeafInputId})"
class="btn btn-outline-secondary text-left @{if (!Model.HasOutputFiles) {<text> disabled</text>}}" role="button">
<span class="fa fa-download text-left"></span> ToUser
</a>
<a href="@Url.Action("DownloadOutputToUser", "Queue", new {id = Model.LeafInputId})"
class="btn btn-default@{if (!Model.HasOutputFiles)
{<text> disabled</text>}}" role="button">
<span class="glyphicon glyphicon-download"></span> Download ToUser
</a>
<a href="@Url.Action("DownloadOutputNotToUser", "Queue", new {id = Model.LeafInputId})"
class="btn btn-outline-secondary text-left @{if (!Model.HasOutputFiles) {<text> disabled</text>}}" role="button">
<span class="fa fa-download"></span> NotToUser
</a>
</div>
<h6>Utility</h6>
<a href="@Url.Action("DownloadOutputNotToUser", "Queue", new {id = Model.LeafInputId})"
class="btn btn-default@{if (!Model.HasOutputFiles)
{<text> disabled</text>}}" role="button">
<span class="glyphicon glyphicon-download"></span> Download NotToUser
</a>
<div class="btn-group-vertical" role="group" aria-label="Send User Download">
@using (Html.BeginUmbracoForm<QueueController>(
"SendUserDownloadLink", null, new { @class = "confirm", confirm_msg = "Confirm sending email to user" }))
{
<input type="hidden" name="id" value="@Model.LeafInputId" />
<button type="submit" class="btn btn-default" @{if (!Model.HasOutputFiles) { <text> disabled="disabled" </text> }}>
<span class="glyphicon glyphicon-send"></span> Email User Download link
</button>
}
@if (Model.IsCancellable)
{
@CancelLink(Model)
}
@using (Html.BeginUmbracoForm<QueueController>(
"SendUserDownloadLink", null, new { @class = "confirm", confirm_msg = "Confirm sending email to user" }))
{
<input type="hidden" name="id" value="@Model.LeafInputId" />
<button type="submit" class="btn btn-outline-secondary text-left"
@{if (!Model.HasOutputFiles) { <text> disabled="disabled" </text> }}>
<span class="fa fa-send"></span> Email User Download link
</button>
}
</div>
<div class="btn-group-vertical" role="group" aria-label="Control">
@DeleteLink(Model)
@if (Model.IsCancellable)
{
@CancelLink(Model)
}
@DeleteLink(Model)
</div>
</div>
</div>
<div class="col-sm-9">
@Html.DisplayForModel()
</div>
WebCms/Views/Queue/Index.cshtml
+6 -6
View File
@@ -20,7 +20,7 @@
<div class="input-group">
<input name="query" type="text" class="form-control" placeholder="Search for..." value="@Model.Query">
<span class="input-group-btn">
<button class="btn btn-default" type="button">Search</button>
<button class="btn btn-outline-secondary" type="button">Search</button>
</span>
</div><!-- /input-group -->
}
@@ -38,7 +38,7 @@
grid.Column("TimeInProgress", "Statistics", item => Statistics(item.Value)),
grid.Column("CurrentStatus", "Status", item => Status(item.Value)),
grid.Column("Total Results: " + Model.Items.Count(), format: item => Btns(item.Value))),
htmlAttributes: new {@class = "table table-striped table-bordered table-hover table-condensed"}
htmlAttributes: new {@class = "table table-sm table-striped table-bordered table-hover"}
)
@grid.BootstrapPager()
</div>
@@ -57,9 +57,9 @@ else
{
<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">
<button type="button" class="btn btn-outline-secondary btn-sm dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
Actions
<span class="caret"></span>
<span class="fa fa-caret-down"></span>
</button>
<ul class="dropdown-menu">
<li>@DetailsLink(item)</li>
@@ -101,13 +101,13 @@ else
@helper DownloadInput(dynamic item)
{
<a href="@Url.Action("DownloadInput", "Queue", new {id = item.Id})">
<span class="glyphicon glyphicon-download"></span> Input
<span class="fa fa-download"></span> Input
</a>
}
@helper DownloadOutputToUser(dynamic item)
{
<a href="@Url.Action("DownloadOutputToUser", "Queue", new {id = item.Id})">
<span class="glyphicon glyphicon-download"></span> ToUser
<span class="fa fa-download"></span> ToUser
</a>
}
@helper Statistics(LeafInput leafInput)
WebCms/Views/Results/Index.cshtml
+1 -1
View File
@@ -14,7 +14,7 @@
grid.Column("CurrentStatus", "Status", item => Status(item.Value)),
grid.Column("", "", item => ChartLink(item.Value))
),
htmlAttributes: new { @class = "table table-striped table-bordered table-hover table-condensed" }
htmlAttributes: new { @class = "table table-sm table-striped table-bordered table-hover" }
)
</div>
@grid.BootstrapPager()
WebCms/Views/Shared/DisplayTemplates/LeafInputStatusViewModels.cshtml
+1 -1
View File
@@ -15,5 +15,5 @@
grid.Column("Description"),
grid.Column("Details")
),
htmlAttributes: new { @class = "table table-striped table-bordered table-hover table-condensed" }
htmlAttributes: new { @class = "table table-sm table-striped table-bordered table-hover" }
)
WebCms/Views/Shared/DisplayTemplates/PriorityIcon.cshtml
+3 -3
View File
@@ -3,9 +3,9 @@
@{
switch (Model)
{
case Priority.Normal:<span class="glyphicon glyphicon-unchecked"></span>break;
case Priority.Low:<span class="glyphicon glyphicon-collapse-down"></span>break;
case Priority.High:<span class="glyphicon glyphicon-collapse-up"></span>break;
case Priority.Normal:<span class="fa fa-square-o"></span>break;
case Priority.Low:<span class="fa fa-caret-square-o-down"></span>break;
case Priority.High:<span class="fa fa-caret-square-o-up"></span>break;
default:
throw new ArgumentOutOfRangeException();
}
WebCms/Views/Shared/DisplayTemplates/_CancelForm.cshtml
+2 -2
View File
@@ -4,13 +4,13 @@
var leafInputId = Model.Item1;
var identifier = Model.Item2;
// true for a link, false for a button
var buttonType = Model.Item3 ? "btn-link" : "btn-default";
var buttonType = Model.Item3 ? "btn-link" : "btn-outline-secondary";
}
@using (Html.BeginUmbracoForm<QueueController>("Cancel", null,
new { @class = "confirm clearfix", confirm_msg = "Cancelling cannot be undone! Confirm cancelling '" + identifier + "'." }))
{
<input type="hidden" name="id" value="@leafInputId"/>
<button type="submit" class="btn @buttonType">
<span class="glyphicon glyphicon-ban-circle"></span> Cancel
<span class="fa fa-ban"></span> Cancel
</button>
}
WebCms/Views/Shared/DisplayTemplates/_ChartButton.cshtml
+2 -2
View File
@@ -6,9 +6,9 @@
var xs = ViewData.ContainsKey("xs") && (bool) ViewData["xs"];
}
<a href="@url?leafInputId=@Model"
class="btn btn-default @{if (xs) {<text>btn-xs</text>}} @{if (disabled) {<text>disabled</text>}}"
class="btn btn-outline-secondary @{if (xs) {<text>btn-sm</text>}} @{if (disabled) {<text>disabled</text>}}"
role="button"
@{if (disabled) {<text>title="No chart has been generated"</text>}} >
<span class="glyphicon glyphicon-stats"></span>
<span class="fa fa-line-chart"></span>
Chart
</a>
WebCms/Views/Shared/DisplayTemplates/_ChartLink.cshtml
+1 -1
View File
@@ -4,6 +4,6 @@
var url = UmbracoContext.Current.UrlProvider.GetUrl(LeafWebPageIds.Chart);
}
<a href="@url?leafInputId=@Model">
<span class="glyphicon glyphicon-stats"></span>
<span class="fa fa-line-chart"></span>
Chart
</a>
WebCms/Views/Shared/DisplayTemplates/_DeleteForm.cshtml
+2 -2
View File
@@ -5,13 +5,13 @@
var identifier = Model.Item2;
var isDeletable = Model.Item3;
// true for a link, false for a button
var buttonType = Model.Item4 ? "btn-link" : "btn-default";
var buttonType = Model.Item4 ? "btn-link" : "btn-outline-secondary";
}
@using (Html.BeginUmbracoForm<QueueController>("Delete", null,
new { @class = "confirm clearfix", confirm_msg = "Deletion cannot be undone! Confirm deleting '" + identifier + "'." }))
{
<input type="hidden" name="id" value="@leafInputId"/>
<button type="submit" class="btn @buttonType" @{if (!isDeletable) { <text> disabled="disabled" </text> }}>
<span class="glyphicon glyphicon-remove"></span> Delete
<span class="fa fa-remove"></span> Delete
</button>
}
WebCms/Views/Shared/DisplayTemplates/_DetailsLink.cshtml
+1 -1
View File
@@ -3,5 +3,5 @@
var url = UmbracoContext.Current.UrlProvider.GetUrl(1111);
}
<a href="@url?id=@Model">
<span class="glyphicon glyphicon-edit"></span> Details
<span class="fa fa-edit"></span> Details
</a>
WebCms/Views/Shared/DisplayTemplates/_FieldLayout.cshtml
+3 -3
View File
@@ -9,11 +9,11 @@
// string units = (string)ViewData.ModelMetadata.AdditionalValues.ContainsKey("Units") ? ["Units"];
}
<dl class="dl-horizontal @lowerPropertyName">
<dt>
<dl class="row @lowerPropertyName">
<dt class="col-sm-3">
@displayName
</dt>
<dd>
<dd class="col-sm-9">
@RenderBody()
</dd>
</dl>
WebCms/Views/Shared/DisplayTemplates/_TimeRemaining.cshtml
+3 -3
View File
@@ -2,10 +2,10 @@
@model Tuple<LeafInput,TimeInProgressEstimater>
@{
var leafInput = Model.Item1;
var estimater = Model.Item2;
var estimator = Model.Item2;
var totalTimeEstimate = estimater.EstimateTimeInProgress(leafInput);
TimeSpan remaining = totalTimeEstimate - leafInput.TimeInProgress;
var totalTimeEstimate = estimator.EstimateTimeInProgress(leafInput);
var remaining = totalTimeEstimate - leafInput.TimeInProgress;
if (remaining > TimeSpan.Zero)
{
<text>@remaining.ToRoundedReadableString()</text>
WebCms/Views/Shared/EditorTemplates/Boolean.cshtml
+1 -1
View File
@@ -16,6 +16,6 @@
"",
Model.HasValue && Model.Value,
htmlAttributes)
@Html.ValidationMessageFor(m => m, null, new { @class = "help-block" })
@Html.ValidationMessageFor(m => m, null, new { @class = "form-text" })
</div>
</div>
WebCms/Views/Shared/EditorTemplates/DateTime.cshtml
+2 -2
View File
@@ -14,7 +14,7 @@
}
<div class="form-group@(Html.ValidationErrorFor(m => m, " error has-error"))">
@Html.LabelFor(m => m, new { @class = "control-label" })
@Html.LabelFor(m => m)
@Html.TextBoxFor(m => m, new { @class="form-control datepicker", data_provide="datepicker", data_date_language="globalize", data_date=dt, data_date_format=System.Threading.Thread.CurrentThread.CurrentUICulture.DateTimeFormat.ShortDatePattern.Replace("M", "m"), data_date_today_highlight="true", data_date_today_btn="false" })
@Html.ValidationMessageFor(m => m, null, new { @class="help-block" })
@Html.ValidationMessageFor(m => m, null, new { @class="form-text" })
</div>
WebCms/Views/Shared/EditorTemplates/Decimal.cshtml
+2 -2
View File
@@ -2,12 +2,12 @@
@model decimal?
<div class="form-group@(Html.ValidationErrorFor(m => m, " has-error"))">
@Html.LabelFor(m => m, new { @class = "control-label" })
@Html.LabelFor(m => m)
<div class="input-group">
<span class="input-group-addon">&euro;@Html.TextBox(
"",
Model == null ? "" : String.Format(System.Globalization.CultureInfo.CurrentCulture, "{0:F2}", ViewData.ModelMetadata.Model),
ViewBag.ClearTextField == true ? new { @class = "form-control clear-text-field input-block-level" } : new { @class = "form-control input-block-level" })</span>
</div>
@Html.ValidationMessageFor(m => m, null, new { @class = "help-block" })
@Html.ValidationMessageFor(m => m, null, new { @class = "form-text" })
</div>
WebCms/Views/Shared/EditorTemplates/Enum.cshtml
+2 -2
View File
@@ -3,7 +3,7 @@
<div class="form-group@(Html.ValidationErrorFor(m => m, " has-error"))">
@Html.LabelFor(m => m, new { @class = "control-label" })
@Html.LabelFor(m => m)
@Html.EnumDropDownListFor(m => m, new { @class = "form-control" })
@Html.ValidationMessageFor(m => m, null, new { @class = "help-block" })
@Html.ValidationMessageFor(m => m, null, new { @class = "form-text" })
</div>
WebCms/Views/Shared/EditorTemplates/HttpPostedFileBase.cshtml
+2 -2
View File
@@ -3,6 +3,6 @@
Layout = "~/Views/Shared/EditorTemplates/_FieldLayout.cshtml";
}
<span class="btn btn-default btn-file">
Browse <input type="file" name="@ViewData.ModelMetadata.PropertyName" class="btn-default btn-file" />
<span class="btn btn-outline-secondary btn-file">
Browse <input type="file" name="@ViewData.ModelMetadata.PropertyName" class="btn-outline-secondary btn-file" />
</span>
WebCms/Views/Shared/EditorTemplates/Int32.cshtml
+2 -2
View File
@@ -19,12 +19,12 @@
}
<div class="form-group@(Html.ValidationErrorFor(m => m, " has-error"))">
@Html.LabelFor(m => m, new { @class = "control-label" })
@Html.LabelFor(m => m)
<div class="controls">
@Html.TextBox(
"",
ViewData.TemplateInfo.FormattedModelValue,
htmlAttributes)
@Html.ValidationMessageFor(m => m, null, new { @class = "help-block" })
@Html.ValidationMessageFor(m => m, null, new { @class = "form-text" })
</div>
</div>
WebCms/Views/Shared/EditorTemplates/Markdown.cshtml
+2 -2
View File
@@ -7,13 +7,13 @@
<link rel="stylesheet" type="text/css" href="/Scripts/mdd_styles.css" />
<div class="form-group@(Html.ValidationErrorFor(m => m, " has-error"))">
@Html.LabelFor(m => m, new { @class = "control-label" })
@Html.LabelFor(m => m)
<div class="mdd_toolbar"></div>
@Html.TextAreaFor(
m => m,
8, 15,
ViewBag.ClearTextField == true ? new { @class = "form-control mdd_editor clear-text-field", data_mdd_preview = "#" + guidID } : new { @class = "form-control mdd_editor", data_mdd_preview = "#" + guidID })
@Html.ValidationMessageFor(m => m, null, new { @class = "help-block" })
@Html.ValidationMessageFor(m => m, null, new { @class = "form-text" })
<br />
<label>Preview</label>
<hr />
WebCms/Views/Shared/EditorTemplates/Multiline.cshtml
+2 -2
View File
@@ -2,12 +2,12 @@
@model object
<div class="form-group@(Html.ValidationErrorFor(m => m, " has-error"))">
@Html.LabelFor(m => m, new { @class = "control-label" })
@Html.LabelFor(m => m)
<div class="controls">
@Html.TextAreaFor(
m => m,
8, 8,
ViewBag.ClearTextField == true ? new { @class = "form-control input-block-level clear-text-field" } : new { @class = "form-control input-block-level" } )
@Html.ValidationMessageFor(m => m, null, new { @class = "help-block" })
@Html.ValidationMessageFor(m => m, null, new { @class = "form-text" })
</div>
</div>
WebCms/Views/Shared/EditorTemplates/Password.cshtml
+2 -2
View File
@@ -15,12 +15,12 @@
<div class="form-group@(Html.ValidationErrorFor(m => m, " has-error"))">
@Html.LabelFor(m => m, new { @class = "control-label" })
@Html.LabelFor(m => m)
<div class="controls">
@Html.Password(
"",
ViewData.TemplateInfo.FormattedModelValue,
htmlAttributes)
@Html.ValidationMessageFor(m => m, null, new { @class = "help-block" })
@Html.ValidationMessageFor(m => m, null, new { @class = "form-text" })
</div>
</div>
WebCms/Views/Shared/EditorTemplates/Single.cshtml
+2 -2
View File
@@ -7,11 +7,11 @@
}
<div class="form-group@(Html.ValidationErrorFor(m => m, " has-error"))">
@Html.LabelFor(m => m, new { @class = "control-label" })
@Html.LabelFor(m => m)
<div class="input-group">
@Html.TextBox(
"", f,
ViewBag.ClearTextField == true ? new { @class = "form-control clear-text-field input-block-level" } : new { @class = "form-control input-block-level" })<span class="input-group-addon">0,00</span>
</div>
@Html.ValidationMessageFor(m => m, null, new { @class = "help-block" })
@Html.ValidationMessageFor(m => m, null, new { @class = "form-text" })
</div>
WebCms/Views/Shared/EditorTemplates/TermsOfService.cshtml
+2 -2
View File
@@ -13,9 +13,9 @@
I agree to the
<a href="@UmbracoContext.Current.UrlProvider.GetUrl(1115)" target="_blank">
Terms of Service
<span class="glyphicon glyphicon-new-window" aria-hidden="true"></span>
<span class="fa fa-new-window" aria-hidden="true"></span>
</a>
</label>
</div>
@Html.ValidationMessageFor(m => m, null, new { @class = "help-block" })
@Html.ValidationMessageFor(m => m, null, new { @class = "form-text" })
</div>
WebCms/Views/Shared/EditorTemplates/Text.cshtml
+2 -2
View File
@@ -2,12 +2,12 @@
@model object
<div class="form-group@(Html.ValidationErrorFor(m => m, " has-error"))">
@Html.LabelFor(m => m, new { @class = "control-label" })
@Html.LabelFor(m => m)
<div class="controls">
@Html.TextBox(
"",
ViewData.TemplateInfo.FormattedModelValue,
ViewBag.ClearTextField == true ? new { @class = "form-control clear-text-field input-block-level" } : new { @class = "form-control input-block-level" } )
@Html.ValidationMessageFor(m => m, null, new { @class = "help-block" })
@Html.ValidationMessageFor(m => m, null, new { @class = "form-text" })
</div>
</div>
WebCms/Views/Shared/EditorTemplates/TimeSpan.cshtml
+2 -2
View File
@@ -15,9 +15,9 @@
}
<div class="form-group@(Html.ValidationErrorFor(m => m, " has-error"))">
@Html.LabelFor(m => m, new { @class = "control-label" })
@Html.LabelFor(m => m)
<div class="controls">
@Html.TextBoxFor(m => m, "hh\\:mm", new { @Value = ts.ToString("hh\\:mm"), @class="form-control timepicker", data_provide="timepicker", data_minute_step="5", data_show_meridian="false", data_disable_focus="true", data_template = "dropdown", data_default_time="value" })
@Html.ValidationMessageFor(m => m, null, new { @class="help-block" })
@Html.ValidationMessageFor(m => m, null, new { @class="form-text" })
</div>
</div>
WebCms/Views/Shared/EditorTemplates/_FieldLayout.cshtml
+2 -35
View File
@@ -12,40 +12,7 @@
var hasErrorClass = hasError ? "has-error" : string.Empty;
}
<div class="form-group @lowerPropertyName @hasErrorClass">
@Html.LabelForModel(new { @class = "control-label" })
@Html.LabelForModel()
@RenderBody()
@Html.ValidationMessage("", new { @class = "help-block"})
@Html.ValidationMessage("", new { @class = "form-text"})
</div>
@*<div class="form-group @lowerPropertyName">
@if (editLabel)
{
@Html.LabelForModel()
}
<div class="input-group">
@if (!string.IsNullOrEmpty(units))
{
<div class="input-append">
@RenderBody()
<span class="add-on">@units</span>
</div>
}
else if (!string.IsNullOrEmpty(currency))
{
<div class="input-prepend">
<span class="add-on">@currency</span>
@RenderBody()
</div>
}
else
{
@RenderBody()
}
@if (!string.IsNullOrEmpty(formatHint))
{
<div><small><em>@formatHint</em></small></div>
}
<span class="help-block">@Html.ValidationMessage("")</span>
</div>
</div>*@
WebCms/Views/Shared/_ValidationField.cshtml
+1 -1
View File
@@ -4,7 +4,7 @@
}
@if (ViewData.ModelState[fieldName] != null && ViewData.ModelState[fieldName].Errors.Any())
{
<span class="help-block field-validation-error">
<span class="form-text field-validation-error">
@foreach (var error in ViewData.ModelState[fieldName].Errors)
{
<span id="@fieldName-error" class="text-danger">@error.ErrorMessage</span>