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

Favicons, page improvements

Browse Source
This commit is contained in:
James Kolpack
2017-01-19 10:55:11 -05:00
parent d799363651
commit b80f02a25e
53 changed files with 174 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files
WebCms/Views/MacroPartials/Membership/Login.cshtml
+1 -1
View File
@@ -14,7 +14,7 @@
Html.RequiresJs("~/scripts/jquery.validate.unobtrusive.bootstrap.min.js");
}
<div class="container">
<div class="container top-buffer">
<div class="row">
<div class="col-md-7 well">
@using (Html.BeginUmbracoForm<UmbLoginController>("HandleLogin"))
WebCms/Views/Master.cshtml
+15 -2
View File
@@ -28,8 +28,21 @@
<!DOCTYPE html>
<html lang="en">
<head>
<!-- Meta tags -->
<!-- Meta tags -->
<link rel="apple-touch-icon" sizes="57x57" href="/Content/favicon/apple-icon-57x57.png">
<link rel="apple-touch-icon" sizes="60x60" href="/Content/favicon/apple-icon-60x60.png">
<link rel="apple-touch-icon" sizes="72x72" href="/Content/favicon/apple-icon-72x72.png">
<link rel="apple-touch-icon" sizes="76x76" href="/Content/favicon/apple-icon-76x76.png">
<link rel="apple-touch-icon" sizes="114x114" href="/Content/favicon/apple-icon-114x114.png">
<link rel="apple-touch-icon" sizes="120x120" href="/Content/favicon/apple-icon-120x120.png">
<link rel="apple-touch-icon" sizes="144x144" href="/Content/favicon/apple-icon-144x144.png">
<link rel="apple-touch-icon" sizes="152x152" href="/Content/favicon/apple-icon-152x152.png">
<link rel="apple-touch-icon" sizes="180x180" href="/Content/favicon/apple-icon-180x180.png">
<link rel="icon" type="image/png" sizes="192x192" href="/Content/favicon/android-icon-192x192.png">
<link rel="icon" type="image/png" sizes="32x32" href="/Content/favicon/favicon-32x32.png">
<link rel="icon" type="image/png" sizes="96x96" href="/Content/favicon/favicon-96x96.png">
<link rel="icon" type="image/png" sizes="16x16" href="/Content/favicon/favicon-16x16.png">
<link rel="manifest" href="/Content/favicon/manifest.json">
<meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=device-width, initial-scale=1">
WebCms/Views/Queue/Details.cshtml
+7 -7
View File
@@ -28,15 +28,15 @@
}
@using (Html.BeginUmbracoForm<QueueController>(
@*@using (Html.BeginUmbracoForm<QueueController>(
"SendUserChartLink", 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.HasLeafChart) { <text> disabled="disabled" </text> }}>
<span class="glyphicon glyphicon-send"></span> Email User Chart link
</button>
}
@DeleteLink(Model.LeafInputId, Model.IsDeletable)
}*@
@DeleteLink(Model.LeafInputId, Model.Identifier, Model.IsDeletable)
</div>
<div class="col-sm-9">
@Html.DisplayForModel()
@@ -44,11 +44,11 @@
</div>
@helper DeleteLink(int id, bool deletable)
@helper DeleteLink(int id, string identifier, bool deletable)
{
using (Html.BeginUmbracoForm<QueueController>(
"Delete", null, new { @class = "confirm", confirm_msg = "Deletion cannot be undone! Confirm deleting '" + identifier + "'." }))
{
using (Html.BeginUmbracoForm<QueueController>(
"Delete", null, new { @class = "confirm", confirm_msg = "Deletion cannot be undone!" }))
{
<input type="hidden" name="id" value="@id" />
<button type="submit" class="btn btn-default" @{if (!deletable) { <text> disabled="disabled" </text> }}>
<span class="glyphicon glyphicon-remove"></span> Delete
WebCms/Views/Queue/Index.cshtml
+10 -4
View File
@@ -1,16 +1,22 @@
@model IEnumerable<ResultStatusViewModel>
@model QueueViewModel
@{
var grid = new WebGrid(Model, rowsPerPage: 45);
var grid = new WebGrid(Model.Items, rowsPerPage: 45);
}
<dl>
<dt>Service description</dt>
<dd>@Model.ServerDescription</dd>
</dl>
@grid.Table(columns:
grid.Columns(
grid.Column("LeafInputIdentifier", "Identifier"),
grid.Column("LeafInputSiteId", "Site Id"),
grid.Column("LeafInputName", "Submitted By"),
grid.Column("CurrentStatus", "Status", item => Html.Partial("DisplayTemplates/_LeafInputStatus", (string)item.CurrentStatus)),
grid.Column("Total Results: " + Model.Count(), format: item => Btns(item))),
grid.Column("Total Results: " + Model.Items.Count(), format: item => Btns(item))),
htmlAttributes: new { @class = "table table-striped table-bordered table-hover table-condensed" }
)
@grid.BootstrapPager()
@@ -78,7 +84,7 @@
}
@helper DeleteLink(dynamic item)
{
@Html.Partial("DisplayTemplates/_DeleteForm", (Tuple<int, bool>)Tuple.Create(item.LeafInputId, item.IsDeletable))
@Html.Partial("DisplayTemplates/_DeleteForm", (Tuple<int, string, bool>)Tuple.Create(item.LeafInputId, item.LeafInputIdentifier, item.IsDeletable))
}
@helper DisableItem(bool disabled)
WebCms/Views/Results/Index.cshtml
+1 -1
View File
@@ -1,4 +1,4 @@
@model IEnumerable<LeafWeb.WebCms.Models.ResultStatusViewModel>
@model IEnumerable<ResultItemViewModel>
@{
var grid = new WebGrid(Model, rowsPerPage: 45);
WebCms/Views/Shared/DisplayTemplates/_DeleteForm.cshtml
+8 -6
View File
@@ -1,10 +1,12 @@
@using LeafWeb.WebCms.Controllers
@model Tuple<int, bool>
@{
var leafInputId = Model.Item1;
var isDeletable = Model.Item2;
}
@using (Html.BeginUmbracoForm<QueueController>("Delete", null, new { @class = "confirm", confirm_msg = "Deletion cannot be undone!" }))
@model Tuple<int, string, bool>
@{
var leafInputId = Model.Item1;
var identifier = Model.Item2;
var isDeletable = Model.Item3;
}
@using (Html.BeginUmbracoForm<QueueController>("Delete", null,
new { @class = "confirm", confirm_msg = "Deletion cannot be undone! Confirm deleting '" + identifier + "'." }))
{
<input type="hidden" name="id" value="@leafInputId"/>
<button type="submit" class="btn btn-link" @{if (!isDeletable) { <text> disabled="disabled" </text> }}>