jessikitty/Disco
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Hide Document Templates & UI Tweaks

Browse Source 
Flag Document Templates as hidden. UI changes aim to improve visibility
of used features in lists.
This commit is contained in:
Gary Sharp
2016-11-10 17:42:10 +11:00
parent b52cbcb94a
commit 4c91d03385
55 changed files with 1485 additions and 613 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Disco.Web/Areas/API/Controllers/DocumentTemplateController.cs
+26
View File
@@ -26,6 +26,7 @@ namespace Disco.Web.Areas.API.Controllers
const string pOnGenerateExpression = "ongenerateexpression";
const string pOnImportAttachmentExpression = "onimportattachmentexpression";
const string pFlattenForm = "flattenform";
const string pIsHidden = "ishidden";
[DiscoAuthorize(Claims.Config.DocumentTemplate.Configure)]
public virtual ActionResult Update(string id, string key, string value = null, bool redirect = false)
@@ -63,6 +64,9 @@ namespace Disco.Web.Areas.API.Controllers
case pFlattenForm:
UpdateFlattenForm(documentTemplate, value);
break;
case pIsHidden:
UpdateIsHidden(documentTemplate, value);
break;
default:
throw new Exception("Invalid Update Key");
}
@@ -190,6 +194,11 @@ namespace Disco.Web.Areas.API.Controllers
return Update(id, pFlattenForm, FlattenForm, redirect);
}
[DiscoAuthorize(Claims.Config.DocumentTemplate.Configure)]
public virtual ActionResult UpdateIsHidden(string id, string IsHidden = null, bool redirect = false)
{
return Update(id, pIsHidden, IsHidden, redirect);
}
[DiscoAuthorize(Claims.Config.DocumentTemplate.Configure)]
public virtual ActionResult UpdateScope(string id, string Scope = null, bool redirect = false)
{
return Update(id, pScope, Scope, redirect);
@@ -393,6 +402,23 @@ namespace Disco.Web.Areas.API.Controllers
Database.SaveChanges();
}
private void UpdateIsHidden(DocumentTemplate documentTemplate, string IsHidden)
{
if (string.IsNullOrWhiteSpace(IsHidden))
{
documentTemplate.IsHidden = false;
}
else
{
bool value = default(bool);
if (bool.TryParse(IsHidden, out value))
documentTemplate.IsHidden = value;
else
throw new Exception("Invalid Boolean Format");
}
Database.SaveChanges();
}
private void UpdateJobSubTypes(DocumentTemplate documentTemplate, List<string> JobSubTypes)
{
Database.Configuration.LazyLoadingEnabled = true;
Disco.Web/Areas/Config/Controllers/DocumentTemplateController.cs
+12 -1
View File
@@ -20,7 +20,18 @@ namespace Disco.Web.Areas.Config.Controllers
{
if (string.IsNullOrEmpty(id))
{
var m = new Models.DocumentTemplate.IndexModel() { DocumentTemplates = Database.DocumentTemplates.ToList() };
var m = new Models.DocumentTemplate.IndexModel() {
DocumentTemplates = Database.DocumentTemplates
.Select(dt => new
{
documentTemplate = dt,
storedInstances =
Database.DeviceAttachments.Count(a => a.DocumentTemplateId == dt.Id) +
Database.JobAttachments.Count(a => a.DocumentTemplateId == dt.Id) +
Database.UserAttachments.Count(a => a.DocumentTemplateId == dt.Id)
})
.ToDictionary(i => i.documentTemplate, i => i.storedInstances)
};
// UI Extensions
UIExtensions.ExecuteExtensions<ConfigDocumentTemplateIndexModel>(this.ControllerContext, m);
Disco.Web/Areas/Config/Controllers/UserFlagController.cs
+9 -1
View File
@@ -53,7 +53,15 @@ namespace Disco.Web.Areas.Config.Controllers
// List Index
var m = new Models.UserFlag.IndexModel()
{
UserFlags = Database.UserFlags.OrderBy(f => f.Name).ToList()
UserFlags = Database.UserFlags
.Select(uf => new
{
userFlag = uf,
assignmentCount = uf.UserFlagAssignments.Count(fa => !fa.RemovedDate.HasValue)
})
.ToDictionary(
pair => pair.userFlag,
pair => pair.assignmentCount)
};
// UI Extensions
Disco.Web/Areas/Config/Models/DeviceBatch/IndexModel.cs
+2 -1
View File
@@ -25,7 +25,8 @@ namespace Disco.Web.Areas.Config.Models.DeviceBatch
DefaultDeviceModel = db.DefaultDeviceModel.Description,
WarrantyExpires = db.WarrantyValidUntil,
InsuranceSupplier = db.InsuranceSupplier,
InsuredUntil = db.InsuredUntil
InsuredUntil = db.InsuredUntil,
IsLinked = db.AssignedUsersLinkedGroup != null || db.DevicesLinkedGroup != null
}).ToArray().Cast<ConfigDeviceBatchIndexModelItem>().ToList();
foreach (var item in m.DeviceBatches.Where(db => db.DefaultDeviceModel == null))
Disco.Web/Areas/Config/Models/DeviceBatch/_IndexModelItem.cs
+1
View File
@@ -20,5 +20,6 @@ namespace Disco.Web.Areas.Config.Models.DeviceBatch
public DateTime? WarrantyExpires { get; set; }
public DateTime? InsuredUntil { get; set; }
public string InsuranceSupplier { get; set; }
public bool IsLinked { get; set; }
}
}
Disco.Web/Areas/Config/Models/DeviceProfile/IndexModel.cs
+2 -1
View File
@@ -21,7 +21,8 @@ namespace Disco.Web.Areas.Config.Models.DeviceProfile
Description = dp.Description,
DistributionType = dp.DistributionType.Value,
DeviceCount = dp.Devices.Count,
DeviceDecommissionedCount = dp.Devices.Count(d => d.DecommissionedDate.HasValue)
DeviceDecommissionedCount = dp.Devices.Count(d => d.DecommissionedDate.HasValue),
IsLinked = dp.AssignedUsersLinkedGroup != null || dp.DevicesLinkedGroup != null
}).ToArray().Cast<ConfigDeviceProfileIndexModelItem>().ToList();
if (DiscoApplication.MultiSiteMode)
Disco.Web/Areas/Config/Models/DeviceProfile/_IndexModelItem.cs
+2 -7
View File
@@ -1,10 +1,4 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Web;
using System.ComponentModel.DataAnnotations;
using Disco.Web.Extensions;
using Disco.Models.UI.Config.DeviceProfile;
using Disco.Models.UI.Config.DeviceProfile;
namespace Disco.Web.Areas.Config.Models.DeviceProfile
{
@@ -20,5 +14,6 @@ namespace Disco.Web.Areas.Config.Models.DeviceProfile
public int DeviceCount { get; set; }
public int DeviceDecommissionedCount { get; set; }
public bool IsLinked { get; set; }
}
}
Disco.Web/Areas/Config/Models/DocumentTemplate/IndexModel.cs
+1 -4
View File
@@ -1,13 +1,10 @@
using Disco.Models.UI.Config.DocumentTemplate;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Web;
namespace Disco.Web.Areas.Config.Models.DocumentTemplate
{
public class IndexModel : ConfigDocumentTemplateIndexModel
{
public List<Disco.Models.Repository.DocumentTemplate> DocumentTemplates { get; set; }
public Dictionary<Disco.Models.Repository.DocumentTemplate, int> DocumentTemplates { get; set; }
}
}
Disco.Web/Areas/Config/Models/UserFlag/IndexModel.cs
+1 -1
View File
@@ -5,6 +5,6 @@ namespace Disco.Web.Areas.Config.Models.UserFlag
{
public class IndexModel : ConfigUserFlagIndexModel
{
public List<Disco.Models.Repository.UserFlag> UserFlags { get; set; }
public Dictionary<Disco.Models.Repository.UserFlag, int> UserFlags { get; set; }
}
}
Disco.Web/Areas/Config/Views/DeviceBatch/Index.cshtml
+34 -21
View File
@@ -2,17 +2,19 @@
@{
Authorization.Require(Claims.Config.DeviceBatch.Show);
ViewBag.Title = Html.ToBreadcrumb("Configuration", MVC.Config.Config.Index(), "Device Batches");
var hasDecommissionedBatches = Model.DeviceBatches.Any(db => db.DeviceCount > 0 && db.DeviceDecommissionedCount >= db.DeviceCount);
var showTags = hasDecommissionedBatches || Model.DeviceBatches.Any(i => i.IsLinked);
}
<div id="Config_DeviceBatches">
@if (Model.DeviceBatches.Count == 0)
{
<div class="form" style="width: 450px; padding: 100px 0;">
<h2>No device batches are configured</h2>
</div>
</div>
}
else
{
if (Model.DeviceBatches.Any(db => db.DeviceCount > 0 && db.DeviceDecommissionedCount >= db.DeviceCount))
if (hasDecommissionedBatches)
{
<a id="Config_DeviceBatches_ShowDecommissioned" href="#" class="button small">Show Decommissioned (@(Model.DeviceBatches.Count(db => db.DeviceCount > 0 && db.DeviceDecommissionedCount >= db.DeviceCount)))</a>
<script>
@@ -21,7 +23,7 @@
$('#Config_DeviceBatches_ShowDecommissioned').click(function () {
$(this).remove();
$('#Config_DeviceBatches_List').find('tr.decommissioned').show();
$('#Config_DeviceBatches_List').find('tr.hidden').show();
return false;
}).detach().appendTo('#layout_PageHeading');
})
@@ -29,25 +31,23 @@
}
<table id="Config_DeviceBatches_List" class="tableData">
<tr>
<th>Name
</th>
<th>Default Model
</th>
<th>Purchase Date
</th>
<th>Warranty Expires
</th>
<th>Insurance Expires
</th>
<th>Device Count
</th>
<th>Name</th>
<th>Default Model</th>
<th>Purchase Date</th>
<th>Warranty Expires</th>
<th>Insurance Expires</th>
<th>Device Count</th>
@if (showTags)
{
<th>&nbsp;</th>
}
</tr>
@foreach (var item in Model.DeviceBatches)
{
var isDecommissioned = item.DeviceCount > 0 && item.DeviceDecommissionedCount >= item.DeviceCount;
<tr class="@(isDecommissioned ? "decommissioned" : null)">
<tr class="@(isDecommissioned ? "hidden" : null)">
<td>
@Html.ActionLink(item.Name, MVC.Config.DeviceBatch.Index(item.Id)) @if (isDecommissioned) { <em>Decommissioned</em> }
@Html.ActionLink(item.Name, MVC.Config.DeviceBatch.Index(item.Id))
</td>
<td>
@item.DefaultDeviceModel
@@ -64,18 +64,31 @@
</td>
<td>
@if (item.PurchaseUnitQuantity.HasValue)
{
{
<span>@item.DeviceCount.ToString("n0")/@(item.PurchaseUnitQuantity.Value.ToString("n0"))</span>
}
else
{
{
@item.DeviceCount.ToString("n0")
}
@if (item.DeviceDecommissionedCount > 0)
{
{
<span class="smallMessage" title="@(item.DeviceDecommissionedCount.ToString("n0")) Decommissioned">(@(item.DeviceDecommissionedCount.ToString("n0")))</span>
}
</td>
@if (showTags)
{
<td>
@if (item.IsLinked)
{
<i class="fa fa-link fa-lg success" title="Is Linked"></i>
}
@if (isDecommissioned)
{
<i class="fa fa-minus-square fa-lg alert" title="Decommissioned"></i>
}
</td>
}
</tr>
}
</table>
@@ -85,7 +98,7 @@
{
<div class="actionBar">
@if (Authorization.Has(Claims.Config.DeviceBatch.ShowTimeline) && Model.DeviceBatches.Count > 0)
{
{
@Html.ActionLinkButton("Timeline", MVC.Config.DeviceBatch.Timeline())
}
@if (Authorization.HasAll(Claims.Config.DeviceBatch.Create, Claims.Config.DeviceBatch.Configure))
Disco.Web/Areas/Config/Views/DeviceBatch/Index.generated.cs
+147 -64
View File
@@ -2,7 +2,7 @@
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
// Runtime Version:4.0.30319.34014
// Runtime Version:4.0.30319.42000
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
@@ -27,7 +27,6 @@ namespace Disco.Web.Areas.Config.Views.DeviceBatch
using System.Web.UI;
using System.Web.WebPages;
using Disco;
using Disco.BI.Extensions;
using Disco.Models.Repository;
using Disco.Services;
using Disco.Services.Authorization;
@@ -49,6 +48,8 @@ namespace Disco.Web.Areas.Config.Views.DeviceBatch
Authorization.Require(Claims.Config.DeviceBatch.Show);
ViewBag.Title = Html.ToBreadcrumb("Configuration", MVC.Config.Config.Index(), "Device Batches");
var hasDecommissionedBatches = Model.DeviceBatches.Any(db => db.DeviceCount > 0 && db.DeviceDecommissionedCount >= db.DeviceCount);
var showTags = hasDecommissionedBatches || Model.DeviceBatches.Any(i => i.IsLinked);
#line default
@@ -60,13 +61,13 @@ WriteLiteral(" id=\"Config_DeviceBatches\"");
WriteLiteral(">\r\n");
#line 7 "..\..\Areas\Config\Views\DeviceBatch\Index.cshtml"
#line 9 "..\..\Areas\Config\Views\DeviceBatch\Index.cshtml"
#line default
#line hidden
#line 7 "..\..\Areas\Config\Views\DeviceBatch\Index.cshtml"
#line 9 "..\..\Areas\Config\Views\DeviceBatch\Index.cshtml"
if (Model.DeviceBatches.Count == 0)
{
@@ -79,14 +80,14 @@ WriteLiteral(" class=\"form\"");
WriteLiteral(" style=\"width: 450px; padding: 100px 0;\"");
WriteLiteral(">\r\n <h2>No device batches are configured</h2>\r\n </div> \r\n");
WriteLiteral(">\r\n <h2>No device batches are configured</h2>\r\n </div>\r\n");
#line 12 "..\..\Areas\Config\Views\DeviceBatch\Index.cshtml"
#line 14 "..\..\Areas\Config\Views\DeviceBatch\Index.cshtml"
}
else
{
if (Model.DeviceBatches.Any(db => db.DeviceCount > 0 && db.DeviceDecommissionedCount >= db.DeviceCount))
if (hasDecommissionedBatches)
{
@@ -103,7 +104,7 @@ WriteLiteral(" class=\"button small\"");
WriteLiteral(">Show Decommissioned (");
#line 17 "..\..\Areas\Config\Views\DeviceBatch\Index.cshtml"
#line 19 "..\..\Areas\Config\Views\DeviceBatch\Index.cshtml"
Write(Model.DeviceBatches.Count(db => db.DeviceCount > 0 && db.DeviceDecommissionedCount >= db.DeviceCount));
@@ -117,7 +118,7 @@ WriteLiteral(@" <script>
$('#Config_DeviceBatches_ShowDecommissioned').click(function () {
$(this).remove();
$('#Config_DeviceBatches_List').find('tr.decommissioned').show();
$('#Config_DeviceBatches_List').find('tr.hidden').show();
return false;
}).detach().appendTo('#layout_PageHeading');
})
@@ -125,7 +126,7 @@ WriteLiteral(@" <script>
");
#line 29 "..\..\Areas\Config\Views\DeviceBatch\Index.cshtml"
#line 31 "..\..\Areas\Config\Views\DeviceBatch\Index.cshtml"
}
@@ -139,22 +140,40 @@ WriteLiteral(" class=\"tableData\"");
WriteLiteral(@">
<tr>
<th>Name
</th>
<th>Default Model
</th>
<th>Purchase Date
</th>
<th>Warranty Expires
</th>
<th>Insurance Expires
</th>
<th>Device Count
</th>
</tr>
<th>Name</th>
<th>Default Model</th>
<th>Purchase Date</th>
<th>Warranty Expires</th>
<th>Insurance Expires</th>
<th>Device Count</th>
");
#line 40 "..\..\Areas\Config\Views\DeviceBatch\Index.cshtml"
#line default
#line hidden
#line 40 "..\..\Areas\Config\Views\DeviceBatch\Index.cshtml"
if (showTags)
{
#line default
#line hidden
WriteLiteral(" <th>&nbsp;</th>\r\n");
#line 43 "..\..\Areas\Config\Views\DeviceBatch\Index.cshtml"
}
#line default
#line hidden
WriteLiteral(" </tr>\r\n");
#line 45 "..\..\Areas\Config\Views\DeviceBatch\Index.cshtml"
@@ -171,14 +190,14 @@ WriteLiteral(@">
#line hidden
WriteLiteral(" <tr");
WriteAttribute("class", Tuple.Create(" class=\"", 2028), Tuple.Create("\"", 2081)
WriteAttribute("class", Tuple.Create(" class=\"", 2169), Tuple.Create("\"", 2214)
#line 48 "..\..\Areas\Config\Views\DeviceBatch\Index.cshtml"
, Tuple.Create(Tuple.Create("", 2036), Tuple.Create<System.Object, System.Int32>(isDecommissioned ? "decommissioned" : null
, Tuple.Create(Tuple.Create("", 2177), Tuple.Create<System.Object, System.Int32>(isDecommissioned ? "hidden" : null
#line default
#line hidden
, 2036), false)
, 2177), false)
);
WriteLiteral(">\r\n <td>\r\n");
@@ -192,24 +211,7 @@ WriteLiteral(" ");
#line default
#line hidden
WriteLiteral(" ");
#line 50 "..\..\Areas\Config\Views\DeviceBatch\Index.cshtml"
if (isDecommissioned) {
#line default
#line hidden
WriteLiteral(" <em>Decommissioned</em> ");
#line 50 "..\..\Areas\Config\Views\DeviceBatch\Index.cshtml"
}
#line default
#line hidden
WriteLiteral(" </td>\r\n <td>\r\n");
WriteLiteral("\r\n </td>\r\n <td>\r\n");
WriteLiteral(" ");
@@ -275,7 +277,7 @@ WriteLiteral("\r\n </td>\r\n <td>\r\n");
#line 66 "..\..\Areas\Config\Views\DeviceBatch\Index.cshtml"
if (item.PurchaseUnitQuantity.HasValue)
{
{
#line default
@@ -304,7 +306,7 @@ WriteLiteral("</span>\r\n");
#line 69 "..\..\Areas\Config\Views\DeviceBatch\Index.cshtml"
}
else
{
{
#line default
@@ -329,7 +331,7 @@ WriteLiteral(" ");
#line 74 "..\..\Areas\Config\Views\DeviceBatch\Index.cshtml"
if (item.DeviceDecommissionedCount > 0)
{
{
#line default
@@ -338,15 +340,15 @@ WriteLiteral(" <span");
WriteLiteral(" class=\"smallMessage\"");
WriteAttribute("title", Tuple.Create(" title=\"", 3515), Tuple.Create("\"", 3586)
WriteAttribute("title", Tuple.Create(" title=\"", 3594), Tuple.Create("\"", 3665)
#line 76 "..\..\Areas\Config\Views\DeviceBatch\Index.cshtml"
, Tuple.Create(Tuple.Create("", 3523), Tuple.Create<System.Object, System.Int32>(item.DeviceDecommissionedCount.ToString("n0")
, Tuple.Create(Tuple.Create("", 3602), Tuple.Create<System.Object, System.Int32>(item.DeviceDecommissionedCount.ToString("n0")
#line default
#line hidden
, 3523), false)
, Tuple.Create(Tuple.Create(" ", 3571), Tuple.Create("Decommissioned", 3572), true)
, 3602), false)
, Tuple.Create(Tuple.Create(" ", 3650), Tuple.Create("Decommissioned", 3651), true)
);
WriteLiteral(">(");
@@ -367,10 +369,91 @@ WriteLiteral(")</span>\r\n");
#line default
#line hidden
WriteLiteral(" </td>\r\n </tr>\r\n");
WriteLiteral(" </td>\r\n");
#line 80 "..\..\Areas\Config\Views\DeviceBatch\Index.cshtml"
#line 79 "..\..\Areas\Config\Views\DeviceBatch\Index.cshtml"
#line default
#line hidden
#line 79 "..\..\Areas\Config\Views\DeviceBatch\Index.cshtml"
if (showTags)
{
#line default
#line hidden
WriteLiteral(" <td>\r\n");
#line 82 "..\..\Areas\Config\Views\DeviceBatch\Index.cshtml"
#line default
#line hidden
#line 82 "..\..\Areas\Config\Views\DeviceBatch\Index.cshtml"
if (item.IsLinked)
{
#line default
#line hidden
WriteLiteral(" <i");
WriteLiteral(" class=\"fa fa-link fa-lg success\"");
WriteLiteral(" title=\"Is Linked\"");
WriteLiteral("></i>\r\n");
#line 85 "..\..\Areas\Config\Views\DeviceBatch\Index.cshtml"
}
#line default
#line hidden
WriteLiteral(" ");
#line 86 "..\..\Areas\Config\Views\DeviceBatch\Index.cshtml"
if (isDecommissioned)
{
#line default
#line hidden
WriteLiteral(" <i");
WriteLiteral(" class=\"fa fa-minus-square fa-lg alert\"");
WriteLiteral(" title=\"Decommissioned\"");
WriteLiteral("></i>\r\n");
#line 89 "..\..\Areas\Config\Views\DeviceBatch\Index.cshtml"
}
#line default
#line hidden
WriteLiteral(" </td>\r\n");
#line 91 "..\..\Areas\Config\Views\DeviceBatch\Index.cshtml"
}
#line default
#line hidden
WriteLiteral(" </tr>\r\n");
#line 93 "..\..\Areas\Config\Views\DeviceBatch\Index.cshtml"
}
@@ -379,7 +462,7 @@ WriteLiteral(" </td>\r\n </tr>\r\n");
WriteLiteral(" </table>\r\n");
#line 82 "..\..\Areas\Config\Views\DeviceBatch\Index.cshtml"
#line 95 "..\..\Areas\Config\Views\DeviceBatch\Index.cshtml"
}
@@ -388,7 +471,7 @@ WriteLiteral(" </table>\r\n");
WriteLiteral("</div>\r\n");
#line 84 "..\..\Areas\Config\Views\DeviceBatch\Index.cshtml"
#line 97 "..\..\Areas\Config\Views\DeviceBatch\Index.cshtml"
if (Authorization.HasAny(Claims.Config.DeviceBatch.Create, Claims.Config.DeviceBatch.ShowTimeline))
{
@@ -402,28 +485,28 @@ WriteLiteral(" class=\"actionBar\"");
WriteLiteral(">\r\n");
#line 87 "..\..\Areas\Config\Views\DeviceBatch\Index.cshtml"
#line 100 "..\..\Areas\Config\Views\DeviceBatch\Index.cshtml"
#line default
#line hidden
#line 87 "..\..\Areas\Config\Views\DeviceBatch\Index.cshtml"
#line 100 "..\..\Areas\Config\Views\DeviceBatch\Index.cshtml"
if (Authorization.Has(Claims.Config.DeviceBatch.ShowTimeline) && Model.DeviceBatches.Count > 0)
{
{
#line default
#line hidden
#line 89 "..\..\Areas\Config\Views\DeviceBatch\Index.cshtml"
#line 102 "..\..\Areas\Config\Views\DeviceBatch\Index.cshtml"
Write(Html.ActionLinkButton("Timeline", MVC.Config.DeviceBatch.Timeline()));
#line default
#line hidden
#line 89 "..\..\Areas\Config\Views\DeviceBatch\Index.cshtml"
#line 102 "..\..\Areas\Config\Views\DeviceBatch\Index.cshtml"
}
@@ -433,7 +516,7 @@ WriteLiteral(">\r\n");
WriteLiteral(" ");
#line 91 "..\..\Areas\Config\Views\DeviceBatch\Index.cshtml"
#line 104 "..\..\Areas\Config\Views\DeviceBatch\Index.cshtml"
if (Authorization.HasAll(Claims.Config.DeviceBatch.Create, Claims.Config.DeviceBatch.Configure))
{
@@ -441,14 +524,14 @@ WriteLiteral(" ");
#line default
#line hidden
#line 93 "..\..\Areas\Config\Views\DeviceBatch\Index.cshtml"
#line 106 "..\..\Areas\Config\Views\DeviceBatch\Index.cshtml"
Write(Html.ActionLinkButton("Create Device Batch", MVC.Config.DeviceBatch.Create()));
#line default
#line hidden
#line 93 "..\..\Areas\Config\Views\DeviceBatch\Index.cshtml"
#line 106 "..\..\Areas\Config\Views\DeviceBatch\Index.cshtml"
}
@@ -458,7 +541,7 @@ WriteLiteral(" ");
WriteLiteral(" </div>\r\n");
#line 96 "..\..\Areas\Config\Views\DeviceBatch\Index.cshtml"
#line 109 "..\..\Areas\Config\Views\DeviceBatch\Index.cshtml"
}
#line default
Disco.Web/Areas/Config/Views/DeviceProfile/_TableRender.cshtml
+21 -2
View File
@@ -1,6 +1,7 @@
@model IEnumerable<Disco.Web.Areas.Config.Models.DeviceProfile._IndexModelItem>
@{
Authorization.Require(Claims.Config.DeviceProfile.Show);
var showTags = Model.Any(i => i.IsLinked);
}
<table class="tableData deviceProfileTable">
<tr>
@@ -16,6 +17,10 @@
<th class="deviceCount">
Device Count
</th>
@if (showTags)
{
<th>&nbsp;</th>
}
</tr>
@foreach (var item in Model)
{
@@ -32,11 +37,25 @@
<td>
@item.DeviceCount.ToString("n0")
@if (item.DeviceDecommissionedCount > 0)
{
{
<span class="smallMessage" title="@(item.DeviceDecommissionedCount.ToString("n0")) Decommissioned">
(@(item.DeviceDecommissionedCount.ToString("n0")))</span>
(@(item.DeviceDecommissionedCount.ToString("n0")))
</span>
}
</td>
@if (showTags)
{
<td>
@if (item.IsLinked)
{
<i class="fa fa-link fa-lg success" title="Is Linked"></i>
}
else
{
<text>&nbsp;</text>
}
</td>
}
</tr>
}
</table>
Disco.Web/Areas/Config/Views/DeviceProfile/_TableRender.generated.cs
+119 -23
View File
@@ -2,7 +2,7 @@
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
// Runtime Version:4.0.30319.34014
// Runtime Version:4.0.30319.42000
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
@@ -27,7 +27,6 @@ namespace Disco.Web.Areas.Config.Views.DeviceProfile
using System.Web.UI;
using System.Web.WebPages;
using Disco;
using Disco.BI.Extensions;
using Disco.Models.Repository;
using Disco.Services;
using Disco.Services.Authorization;
@@ -37,9 +36,9 @@ namespace Disco.Web.Areas.Config.Views.DeviceProfile
[System.CodeDom.Compiler.GeneratedCodeAttribute("RazorGenerator", "2.0.0.0")]
[System.Web.WebPages.PageVirtualPathAttribute("~/Areas/Config/Views/DeviceProfile/_TableRender.cshtml")]
public partial class TableRender : Disco.Services.Web.WebViewPage<IEnumerable<Disco.Web.Areas.Config.Models.DeviceProfile._IndexModelItem>>
public partial class _TableRender : Disco.Services.Web.WebViewPage<IEnumerable<Disco.Web.Areas.Config.Models.DeviceProfile._IndexModelItem>>
{
public TableRender()
public _TableRender()
{
}
public override void Execute()
@@ -48,6 +47,7 @@ namespace Disco.Web.Areas.Config.Views.DeviceProfile
#line 2 "..\..\Areas\Config\Views\DeviceProfile\_TableRender.cshtml"
Authorization.Require(Claims.Config.DeviceProfile.Show);
var showTags = Model.Any(i => i.IsLinked);
#line default
@@ -72,16 +72,41 @@ WriteLiteral(">\r\n Type\r\n </th>\r\n <th");
WriteLiteral(" class=\"deviceCount\"");
WriteLiteral(">\r\n Device Count\r\n </th>\r\n </tr>\r\n");
WriteLiteral(">\r\n Device Count\r\n </th>\r\n");
#line 20 "..\..\Areas\Config\Views\DeviceProfile\_TableRender.cshtml"
#line default
#line hidden
#line 20 "..\..\Areas\Config\Views\DeviceProfile\_TableRender.cshtml"
if (showTags)
{
#line default
#line hidden
WriteLiteral(" <th>&nbsp;</th>\r\n");
#line 23 "..\..\Areas\Config\Views\DeviceProfile\_TableRender.cshtml"
}
#line default
#line hidden
WriteLiteral(" </tr>\r\n");
#line 25 "..\..\Areas\Config\Views\DeviceProfile\_TableRender.cshtml"
#line default
#line hidden
#line 25 "..\..\Areas\Config\Views\DeviceProfile\_TableRender.cshtml"
foreach (var item in Model)
{
@@ -93,7 +118,7 @@ WriteLiteral(" <tr>\r\n <td>\r\n");
WriteLiteral(" ");
#line 24 "..\..\Areas\Config\Views\DeviceProfile\_TableRender.cshtml"
#line 29 "..\..\Areas\Config\Views\DeviceProfile\_TableRender.cshtml"
Write(Html.ActionLink(item.Name, MVC.Config.DeviceProfile.Index(item.Id)));
@@ -104,7 +129,7 @@ WriteLiteral("\r\n </td>\r\n <td>\r\n");
WriteLiteral(" ");
#line 27 "..\..\Areas\Config\Views\DeviceProfile\_TableRender.cshtml"
#line 32 "..\..\Areas\Config\Views\DeviceProfile\_TableRender.cshtml"
Write(Html.DisplayFor(modelItem => item.Description));
@@ -115,7 +140,7 @@ WriteLiteral("\r\n </td>\r\n <td>\r\n");
WriteLiteral(" ");
#line 30 "..\..\Areas\Config\Views\DeviceProfile\_TableRender.cshtml"
#line 35 "..\..\Areas\Config\Views\DeviceProfile\_TableRender.cshtml"
Write(Html.DisplayFor(modelItem => item.DistributionType));
@@ -126,7 +151,7 @@ WriteLiteral("\r\n </td>\r\n <td>\r\n");
WriteLiteral(" ");
#line 33 "..\..\Areas\Config\Views\DeviceProfile\_TableRender.cshtml"
#line 38 "..\..\Areas\Config\Views\DeviceProfile\_TableRender.cshtml"
Write(item.DeviceCount.ToString("n0"));
@@ -135,15 +160,15 @@ WriteLiteral(" ");
WriteLiteral("\r\n");
#line 34 "..\..\Areas\Config\Views\DeviceProfile\_TableRender.cshtml"
#line 39 "..\..\Areas\Config\Views\DeviceProfile\_TableRender.cshtml"
#line default
#line hidden
#line 34 "..\..\Areas\Config\Views\DeviceProfile\_TableRender.cshtml"
#line 39 "..\..\Areas\Config\Views\DeviceProfile\_TableRender.cshtml"
if (item.DeviceDecommissionedCount > 0)
{
{
#line default
@@ -152,39 +177,110 @@ WriteLiteral(" <span");
WriteLiteral(" class=\"smallMessage\"");
WriteAttribute("title", Tuple.Create(" title=\"", 1065), Tuple.Create("\"", 1136)
WriteAttribute("title", Tuple.Create(" title=\"", 1187), Tuple.Create("\"", 1258)
#line 36 "..\..\Areas\Config\Views\DeviceProfile\_TableRender.cshtml"
, Tuple.Create(Tuple.Create("", 1073), Tuple.Create<System.Object, System.Int32>(item.DeviceDecommissionedCount.ToString("n0")
#line 41 "..\..\Areas\Config\Views\DeviceProfile\_TableRender.cshtml"
, Tuple.Create(Tuple.Create("", 1195), Tuple.Create<System.Object, System.Int32>(item.DeviceDecommissionedCount.ToString("n0")
#line default
#line hidden
, 1073), false)
, Tuple.Create(Tuple.Create(" ", 1121), Tuple.Create("Decommissioned", 1122), true)
, 1195), false)
, Tuple.Create(Tuple.Create(" ", 1243), Tuple.Create("Decommissioned", 1244), true)
);
WriteLiteral(">\r\n (");
#line 37 "..\..\Areas\Config\Views\DeviceProfile\_TableRender.cshtml"
#line 42 "..\..\Areas\Config\Views\DeviceProfile\_TableRender.cshtml"
Write(item.DeviceDecommissionedCount.ToString("n0"));
#line default
#line hidden
WriteLiteral(")</span>\r\n");
WriteLiteral(")\r\n </span>\r\n");
#line 38 "..\..\Areas\Config\Views\DeviceProfile\_TableRender.cshtml"
#line 44 "..\..\Areas\Config\Views\DeviceProfile\_TableRender.cshtml"
}
#line default
#line hidden
WriteLiteral(" </td>\r\n </tr>\r\n");
WriteLiteral(" </td>\r\n");
#line 41 "..\..\Areas\Config\Views\DeviceProfile\_TableRender.cshtml"
#line 46 "..\..\Areas\Config\Views\DeviceProfile\_TableRender.cshtml"
#line default
#line hidden
#line 46 "..\..\Areas\Config\Views\DeviceProfile\_TableRender.cshtml"
if (showTags)
{
#line default
#line hidden
WriteLiteral(" <td>\r\n");
#line 49 "..\..\Areas\Config\Views\DeviceProfile\_TableRender.cshtml"
#line default
#line hidden
#line 49 "..\..\Areas\Config\Views\DeviceProfile\_TableRender.cshtml"
if (item.IsLinked)
{
#line default
#line hidden
WriteLiteral(" <i");
WriteLiteral(" class=\"fa fa-link fa-lg success\"");
WriteLiteral(" title=\"Is Linked\"");
WriteLiteral("></i>\r\n");
#line 52 "..\..\Areas\Config\Views\DeviceProfile\_TableRender.cshtml"
}
else
{
#line default
#line hidden
WriteLiteral(" ");
WriteLiteral("&nbsp;");
WriteLiteral("\r\n");
#line 56 "..\..\Areas\Config\Views\DeviceProfile\_TableRender.cshtml"
}
#line default
#line hidden
WriteLiteral(" </td>\r\n");
#line 58 "..\..\Areas\Config\Views\DeviceProfile\_TableRender.cshtml"
}
#line default
#line hidden
WriteLiteral(" </tr>\r\n");
#line 60 "..\..\Areas\Config\Views\DeviceProfile\_TableRender.cshtml"
}
Disco.Web/Areas/Config/Views/DocumentTemplate/Index.cshtml
+50 -19
View File
@@ -3,36 +3,67 @@
Authorization.Require(Claims.Config.DocumentTemplate.Show);
ViewBag.Title = Html.ToBreadcrumb("Configuration", MVC.Config.Config.Index(), "Document Templates");
var showTags = Model.DocumentTemplates.Keys.Any(i => i.DevicesLinkedGroup != null || i.UsersLinkedGroup != null ||
i.FilterExpression != null || i.OnGenerateExpression != null || i.OnImportAttachmentExpression != null);
}
@if (Model.DocumentTemplates.Count == 0)
{
<div class="form" style="width: 450px; padding: 100px 0;">
<h2>No document templates are configured</h2>
</div>
</div>
}
else
{
<table class="tableData">
if (Model.DocumentTemplates.Keys.Any(dt => dt.IsHidden))
{
<a id="Config_DocumentTemplates_ShowHidden" href="#" class="button small">Show Hidden (@(Model.DocumentTemplates.Keys.Count(dt => dt.IsHidden)))</a>
<script>
$(function () {
$('#Config_DocumentTemplates_ShowHidden').click(function () {
$(this).remove();
$('#Config_DocumentTemplates_List').find('tr.hidden').show();
return false;
}).detach().appendTo('#layout_PageHeading');
})
</script>
}
<table id="Config_DocumentTemplates_List" class="tableData">
<tr>
<th>Id
</th>
<th>Description
</th>
<th>Scope
</th>
<th>Id</th>
<th>Description</th>
<th>Scope</th>
<th>Stored&nbsp;Instances</th>
@if (showTags)
{
<th>&nbsp;</th>
}
</tr>
@foreach (var item in Model.DocumentTemplates)
@foreach (var pair in Model.DocumentTemplates)
{
<tr>
<td>
@Html.ActionLink(item.Id.ToString(), MVC.Config.DocumentTemplate.Index(item.Id))
</td>
<td>
@Html.DisplayFor(modelItem => item.Description)
</td>
<td>
@Html.DisplayFor(modelItem => item.Scope)
</td>
var item = pair.Key;
var storedCount = pair.Value;
<tr class="@(item.IsHidden ? "hidden" : null)">
<td>@Html.ActionLink(item.Id.ToString(), MVC.Config.DocumentTemplate.Index(item.Id))</td>
<td>@Html.DisplayFor(modelItem => item.Description)</td>
<td>@Html.DisplayFor(modelItem => item.Scope)</td>
<td>@storedCount.ToString("N0")</td>
@if (showTags)
{
<td>
@if (item.DevicesLinkedGroup != null || item.UsersLinkedGroup != null)
{
<i class="fa fa-link fa-lg success" title="Is Linked"></i>
}
@if (item.FilterExpression != null || item.OnGenerateExpression != null || item.OnImportAttachmentExpression != null)
{
<i class="fa fa-bolt fa-lg alert" title="Has Expressions"></i>
}
@if (item.IsHidden)
{
<i class="fa fa-minus-square fa-lg error" title="Is Hidden"></i>
}
</td>
}
</tr>
}
</table>
Disco.Web/Areas/Config/Views/DocumentTemplate/Index.generated.cs
+227 -38
View File
@@ -2,7 +2,7 @@
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
// Runtime Version:4.0.30319.34014
// Runtime Version:4.0.30319.42000
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
@@ -27,7 +27,6 @@ namespace Disco.Web.Areas.Config.Views.DocumentTemplate
using System.Web.UI;
using System.Web.WebPages;
using Disco;
using Disco.BI.Extensions;
using Disco.Models.Repository;
using Disco.Services;
using Disco.Services.Authorization;
@@ -50,6 +49,8 @@ namespace Disco.Web.Areas.Config.Views.DocumentTemplate
Authorization.Require(Claims.Config.DocumentTemplate.Show);
ViewBag.Title = Html.ToBreadcrumb("Configuration", MVC.Config.Config.Index(), "Document Templates");
var showTags = Model.DocumentTemplates.Keys.Any(i => i.DevicesLinkedGroup != null || i.UsersLinkedGroup != null ||
i.FilterExpression != null || i.OnGenerateExpression != null || i.OnImportAttachmentExpression != null);
#line default
@@ -57,7 +58,7 @@ namespace Disco.Web.Areas.Config.Views.DocumentTemplate
WriteLiteral("\r\n");
#line 7 "..\..\Areas\Config\Views\DocumentTemplate\Index.cshtml"
#line 9 "..\..\Areas\Config\Views\DocumentTemplate\Index.cshtml"
if (Model.DocumentTemplates.Count == 0)
{
@@ -70,76 +71,264 @@ WriteLiteral(" class=\"form\"");
WriteLiteral(" style=\"width: 450px; padding: 100px 0;\"");
WriteLiteral(">\r\n <h2>No document templates are configured</h2>\r\n </div> \r\n");
WriteLiteral(">\r\n <h2>No document templates are configured</h2>\r\n </div>\r\n");
#line 12 "..\..\Areas\Config\Views\DocumentTemplate\Index.cshtml"
#line 14 "..\..\Areas\Config\Views\DocumentTemplate\Index.cshtml"
}
else
{
if (Model.DocumentTemplates.Keys.Any(dt => dt.IsHidden))
{
#line default
#line hidden
WriteLiteral(" <a");
WriteLiteral(" id=\"Config_DocumentTemplates_ShowHidden\"");
WriteLiteral(" href=\"#\"");
WriteLiteral(" class=\"button small\"");
WriteLiteral(">Show Hidden (");
#line 19 "..\..\Areas\Config\Views\DocumentTemplate\Index.cshtml"
Write(Model.DocumentTemplates.Keys.Count(dt => dt.IsHidden));
#line default
#line hidden
WriteLiteral(")</a>\r\n");
WriteLiteral(@" <script>
$(function () {
$('#Config_DocumentTemplates_ShowHidden').click(function () {
$(this).remove();
$('#Config_DocumentTemplates_List').find('tr.hidden').show();
return false;
}).detach().appendTo('#layout_PageHeading');
})
</script>
");
#line 29 "..\..\Areas\Config\Views\DocumentTemplate\Index.cshtml"
}
#line default
#line hidden
WriteLiteral(" <table");
WriteLiteral(" id=\"Config_DocumentTemplates_List\"");
WriteLiteral(" class=\"tableData\"");
WriteLiteral(">\r\n <tr>\r\n <th>Id\r\n </th>\r\n <th>Descripti" +
"on\r\n </th>\r\n <th>Scope\r\n </th>\r\n </tr>\r\n" +
"");
WriteLiteral(">\r\n <tr>\r\n <th>Id</th>\r\n <th>Description</th>\r\n " +
" <th>Scope</th>\r\n <th>Stored&nbsp;Instances</th>\r\n");
#line 24 "..\..\Areas\Config\Views\DocumentTemplate\Index.cshtml"
#line 36 "..\..\Areas\Config\Views\DocumentTemplate\Index.cshtml"
#line default
#line hidden
#line 36 "..\..\Areas\Config\Views\DocumentTemplate\Index.cshtml"
if (showTags)
{
#line default
#line hidden
WriteLiteral(" <th>&nbsp;</th>\r\n");
#line 39 "..\..\Areas\Config\Views\DocumentTemplate\Index.cshtml"
}
#line default
#line hidden
WriteLiteral(" </tr>\r\n");
#line 41 "..\..\Areas\Config\Views\DocumentTemplate\Index.cshtml"
#line default
#line hidden
#line 24 "..\..\Areas\Config\Views\DocumentTemplate\Index.cshtml"
foreach (var item in Model.DocumentTemplates)
#line 41 "..\..\Areas\Config\Views\DocumentTemplate\Index.cshtml"
foreach (var pair in Model.DocumentTemplates)
{
var item = pair.Key;
var storedCount = pair.Value;
#line default
#line hidden
WriteLiteral(" <tr>\r\n <td>\r\n");
WriteLiteral(" <tr");
WriteLiteral(" ");
WriteAttribute("class", Tuple.Create(" class=\"", 1798), Tuple.Create("\"", 1840)
#line 45 "..\..\Areas\Config\Views\DocumentTemplate\Index.cshtml"
, Tuple.Create(Tuple.Create("", 1806), Tuple.Create<System.Object, System.Int32>(item.IsHidden ? "hidden" : null
#line default
#line hidden
, 1806), false)
);
WriteLiteral(">\r\n <td>");
#line 28 "..\..\Areas\Config\Views\DocumentTemplate\Index.cshtml"
#line 46 "..\..\Areas\Config\Views\DocumentTemplate\Index.cshtml"
Write(Html.ActionLink(item.Id.ToString(), MVC.Config.DocumentTemplate.Index(item.Id)));
#line default
#line hidden
WriteLiteral("\r\n </td>\r\n <td>\r\n");
WriteLiteral(" ");
WriteLiteral("</td>\r\n <td>");
#line 31 "..\..\Areas\Config\Views\DocumentTemplate\Index.cshtml"
#line 47 "..\..\Areas\Config\Views\DocumentTemplate\Index.cshtml"
Write(Html.DisplayFor(modelItem => item.Description));
#line default
#line hidden
WriteLiteral("\r\n </td>\r\n <td>\r\n");
WriteLiteral(" ");
WriteLiteral("</td>\r\n <td>");
#line 34 "..\..\Areas\Config\Views\DocumentTemplate\Index.cshtml"
#line 48 "..\..\Areas\Config\Views\DocumentTemplate\Index.cshtml"
Write(Html.DisplayFor(modelItem => item.Scope));
#line default
#line hidden
WriteLiteral("\r\n </td>\r\n </tr>\r\n");
WriteLiteral("</td>\r\n <td>");
#line 37 "..\..\Areas\Config\Views\DocumentTemplate\Index.cshtml"
#line 49 "..\..\Areas\Config\Views\DocumentTemplate\Index.cshtml"
Write(storedCount.ToString("N0"));
#line default
#line hidden
WriteLiteral("</td>\r\n");
#line 50 "..\..\Areas\Config\Views\DocumentTemplate\Index.cshtml"
#line default
#line hidden
#line 50 "..\..\Areas\Config\Views\DocumentTemplate\Index.cshtml"
if (showTags)
{
#line default
#line hidden
WriteLiteral(" <td>\r\n");
#line 53 "..\..\Areas\Config\Views\DocumentTemplate\Index.cshtml"
#line default
#line hidden
#line 53 "..\..\Areas\Config\Views\DocumentTemplate\Index.cshtml"
if (item.DevicesLinkedGroup != null || item.UsersLinkedGroup != null)
{
#line default
#line hidden
WriteLiteral(" <i");
WriteLiteral(" class=\"fa fa-link fa-lg success\"");
WriteLiteral(" title=\"Is Linked\"");
WriteLiteral("></i>\r\n");
#line 56 "..\..\Areas\Config\Views\DocumentTemplate\Index.cshtml"
}
#line default
#line hidden
WriteLiteral(" ");
#line 57 "..\..\Areas\Config\Views\DocumentTemplate\Index.cshtml"
if (item.FilterExpression != null || item.OnGenerateExpression != null || item.OnImportAttachmentExpression != null)
{
#line default
#line hidden
WriteLiteral(" <i");
WriteLiteral(" class=\"fa fa-bolt fa-lg alert\"");
WriteLiteral(" title=\"Has Expressions\"");
WriteLiteral("></i>\r\n");
#line 60 "..\..\Areas\Config\Views\DocumentTemplate\Index.cshtml"
}
#line default
#line hidden
WriteLiteral(" ");
#line 61 "..\..\Areas\Config\Views\DocumentTemplate\Index.cshtml"
if (item.IsHidden)
{
#line default
#line hidden
WriteLiteral(" <i");
WriteLiteral(" class=\"fa fa-minus-square fa-lg error\"");
WriteLiteral(" title=\"Is Hidden\"");
WriteLiteral("></i>\r\n");
#line 64 "..\..\Areas\Config\Views\DocumentTemplate\Index.cshtml"
}
#line default
#line hidden
WriteLiteral(" </td>\r\n");
#line 66 "..\..\Areas\Config\Views\DocumentTemplate\Index.cshtml"
}
#line default
#line hidden
WriteLiteral(" </tr>\r\n");
#line 68 "..\..\Areas\Config\Views\DocumentTemplate\Index.cshtml"
}
@@ -148,7 +337,7 @@ WriteLiteral("\r\n </td>\r\n </tr>\r\n");
WriteLiteral(" </table>\r\n");
#line 39 "..\..\Areas\Config\Views\DocumentTemplate\Index.cshtml"
#line 70 "..\..\Areas\Config\Views\DocumentTemplate\Index.cshtml"
}
@@ -161,13 +350,13 @@ WriteLiteral(" class=\"actionBar\"");
WriteLiteral(">\r\n");
#line 41 "..\..\Areas\Config\Views\DocumentTemplate\Index.cshtml"
#line 72 "..\..\Areas\Config\Views\DocumentTemplate\Index.cshtml"
#line default
#line hidden
#line 41 "..\..\Areas\Config\Views\DocumentTemplate\Index.cshtml"
#line 72 "..\..\Areas\Config\Views\DocumentTemplate\Index.cshtml"
if (Authorization.Has(Claims.Config.DocumentTemplate.UndetectedPages))
{
@@ -175,14 +364,14 @@ WriteLiteral(">\r\n");
#line default
#line hidden
#line 43 "..\..\Areas\Config\Views\DocumentTemplate\Index.cshtml"
#line 74 "..\..\Areas\Config\Views\DocumentTemplate\Index.cshtml"
Write(Html.ActionLinkButton("Undetected Pages", MVC.Config.DocumentTemplate.UndetectedPages()));
#line default
#line hidden
#line 43 "..\..\Areas\Config\Views\DocumentTemplate\Index.cshtml"
#line 74 "..\..\Areas\Config\Views\DocumentTemplate\Index.cshtml"
}
@@ -192,7 +381,7 @@ WriteLiteral(">\r\n");
WriteLiteral(" ");
#line 45 "..\..\Areas\Config\Views\DocumentTemplate\Index.cshtml"
#line 76 "..\..\Areas\Config\Views\DocumentTemplate\Index.cshtml"
if (Authorization.Has(Claims.Config.DocumentTemplate.ShowStatus))
{
@@ -200,14 +389,14 @@ WriteLiteral(" ");
#line default
#line hidden
#line 47 "..\..\Areas\Config\Views\DocumentTemplate\Index.cshtml"
#line 78 "..\..\Areas\Config\Views\DocumentTemplate\Index.cshtml"
Write(Html.ActionLinkButton("Import Status", MVC.Config.DocumentTemplate.ImportStatus()));
#line default
#line hidden
#line 47 "..\..\Areas\Config\Views\DocumentTemplate\Index.cshtml"
#line 78 "..\..\Areas\Config\Views\DocumentTemplate\Index.cshtml"
}
@@ -217,7 +406,7 @@ WriteLiteral(" ");
WriteLiteral(" ");
#line 49 "..\..\Areas\Config\Views\DocumentTemplate\Index.cshtml"
#line 80 "..\..\Areas\Config\Views\DocumentTemplate\Index.cshtml"
if (Authorization.Has(Claims.Config.Show))
{
@@ -225,14 +414,14 @@ WriteLiteral(" ");
#line default
#line hidden
#line 51 "..\..\Areas\Config\Views\DocumentTemplate\Index.cshtml"
#line 82 "..\..\Areas\Config\Views\DocumentTemplate\Index.cshtml"
Write(Html.ActionLinkButton("Expression Browser", MVC.Config.DocumentTemplate.ExpressionBrowser()));
#line default
#line hidden
#line 51 "..\..\Areas\Config\Views\DocumentTemplate\Index.cshtml"
#line 82 "..\..\Areas\Config\Views\DocumentTemplate\Index.cshtml"
}
@@ -242,7 +431,7 @@ WriteLiteral(" ");
WriteLiteral(" ");
#line 53 "..\..\Areas\Config\Views\DocumentTemplate\Index.cshtml"
#line 84 "..\..\Areas\Config\Views\DocumentTemplate\Index.cshtml"
if (Authorization.HasAll(Claims.Config.DocumentTemplate.Create, Claims.Config.DocumentTemplate.Configure))
{
@@ -250,14 +439,14 @@ WriteLiteral(" ");
#line default
#line hidden
#line 55 "..\..\Areas\Config\Views\DocumentTemplate\Index.cshtml"
#line 86 "..\..\Areas\Config\Views\DocumentTemplate\Index.cshtml"
Write(Html.ActionLinkButton("Create Document Template", MVC.Config.DocumentTemplate.Create()));
#line default
#line hidden
#line 55 "..\..\Areas\Config\Views\DocumentTemplate\Index.cshtml"
#line 86 "..\..\Areas\Config\Views\DocumentTemplate\Index.cshtml"
}
Disco.Web/Areas/Config/Views/DocumentTemplate/Show.cshtml
+44 -9
View File
@@ -105,29 +105,29 @@
<div>
@if (canConfig)
{
<input id="DocumentTemplate_FlattenForm" type="checkbox" @(Model.DocumentTemplate.FlattenForm ? new MvcHtmlString("checked=\"checked\" ") : new MvcHtmlString(string.Empty)) />
<label for="DocumentTemplate_FlattenForm">Flatten Form</label>
<input id="DocumentTemplate_IsHidden" type="checkbox" @(Model.DocumentTemplate.IsHidden ? new MvcHtmlString("checked=\"checked\" ") : null) />
<label for="DocumentTemplate_IsHidden">Hidden</label>
@AjaxHelpers.AjaxLoader()
<script type="text/javascript">
$(function () {
document.DiscoFunctions.PropertyChangeHelper(
$('#DocumentTemplate_FlattenForm'),
$('#DocumentTemplate_IsHidden'),
null,
'@Url.Action(MVC.API.DocumentTemplate.UpdateFlattenForm(Model.DocumentTemplate.Id))',
'FlattenForm'
'@Url.Action(MVC.API.DocumentTemplate.UpdateIsHidden(Model.DocumentTemplate.Id))',
'IsHidden'
);
});
</script>
}
else
{
<input id="DocumentTemplate_FlattenForm" type="checkbox" @(Model.DocumentTemplate.FlattenForm ? new MvcHtmlString("checked=\"checked\" ") : new MvcHtmlString(string.Empty)) disabled="disabled" />
<label for="DocumentTemplate_FlattenForm">Flatten Form</label>
<input id="DocumentTemplate_IsHidden" type="checkbox" @(Model.DocumentTemplate.IsHidden ? new MvcHtmlString("checked=\"checked\" ") : null) disabled="disabled" />
<label for="DocumentTemplate_IsHidden">Hidden</label>
}
</div>
<div class="info-box">
<p class="fa-p">
<i class="fa fa-info-circle"></i>If selected when a document is generated all form elements will be removed and their content written in place.
<i class="fa fa-info-circle"></i>If selected the template will not appear in the list of documents to generate.
</p>
</div>
</td>
@@ -331,6 +331,41 @@
}
</td>
</tr>
<tr>
<th>
&nbsp;
</th>
<td>
<div>
@if (canConfig)
{
<input id="DocumentTemplate_FlattenForm" type="checkbox" @(Model.DocumentTemplate.FlattenForm ? new MvcHtmlString("checked=\"checked\" ") : new MvcHtmlString(string.Empty)) />
<label for="DocumentTemplate_FlattenForm">Flatten Form</label>
@AjaxHelpers.AjaxLoader()
<script type="text/javascript">
$(function () {
document.DiscoFunctions.PropertyChangeHelper(
$('#DocumentTemplate_FlattenForm'),
null,
'@Url.Action(MVC.API.DocumentTemplate.UpdateFlattenForm(Model.DocumentTemplate.Id))',
'FlattenForm'
);
});
</script>
}
else
{
<input id="DocumentTemplate_FlattenForm" type="checkbox" @(Model.DocumentTemplate.FlattenForm ? new MvcHtmlString("checked=\"checked\" ") : new MvcHtmlString(string.Empty)) disabled="disabled" />
<label for="DocumentTemplate_FlattenForm">Flatten Form</label>
}
</div>
<div class="info-box">
<p class="fa-p">
<i class="fa fa-info-circle"></i>When a document is generated all form elements will be removed and their content written in place if this option is selected.
</p>
</div>
</td>
</tr>
</tbody>
</table>
</div>
@@ -478,7 +513,7 @@
}
<div class="info-box">
<p class="fa-p">
<i class="fa fa-fw fa-info-circle"></i>This expression will be evaluated to determine if this template is shown in the <em>Generate Document</em> drop-down list.
<i class="fa fa-fw fa-info-circle"></i>This expression will be evaluated to determine if this template is shown in the <em>Generate Document</em> drop-down list. If the template is hidden (see above) this expression is ignored.
</p>
</div>
</td>
Disco.Web/Areas/Config/Views/DocumentTemplate/Show.generated.cs
+282 -140
View File
File diff suppressed because it is too large Load Diff
Disco.Web/Areas/Config/Views/UserFlag/Index.cshtml
+31 -15
View File
@@ -2,13 +2,15 @@
@{
Authorization.Require(Claims.Config.UserFlag.Show);
ViewBag.Title = Html.ToBreadcrumb("Configuration", MVC.Config.Config.Index(), "User Flags");
var showTags = Model.UserFlags.Keys.Any(i => i.UserDevicesLinkedGroup != null || i.UsersLinkedGroup != null ||
i.OnAssignmentExpression != null || i.OnUnassignmentExpression != null);
}
<div id="Config_UserFlags_Index">
@if (Model.UserFlags.Count == 0)
{
<div class="form" style="width: 450px; padding: 100px 0;">
<h2>No user flags are configured</h2>
</div>
</div>
}
else
{
@@ -16,10 +18,16 @@
<tr>
<th>Name</th>
<th>Description</th>
<th>Linked</th>
<th>Current&nbsp;Assignments</th>
@if (showTags)
{
<th>&nbsp;</th>
}
</tr>
@foreach (var item in Model.UserFlags)
@foreach (var pair in Model.UserFlags.OrderBy(i => i.Key.Name))
{
var item = pair.Key;
var assignmentCount = pair.Value;
<tr>
<td>
<a href="@Url.Action(MVC.Config.UserFlag.Index(item.Id))">
@@ -27,24 +35,32 @@
@item.Name
</a>
</td>
<td>@if (string.IsNullOrWhiteSpace(item.Description))
{
<span class="smallMessage">&lt;none&gt;</span>
<td>
@if (string.IsNullOrWhiteSpace(item.Description))
{
<span class="smallMessage">&lt;none&gt;</span>
}
else
{
@item.Description.ToHtmlComment()
@item.Description.ToHtmlComment()
}
</td>
<td>@if (item.UserDevicesLinkedGroup != null || item.UsersLinkedGroup != null)
{
<i class="fa fa-link fa-lg success"></i>
}
else
{
<i class="fa fa-unlink fa-lg information"></i>
}
<td>
@assignmentCount.ToString("N0")
</td>
@if (showTags)
{
<td>
@if (item.UserDevicesLinkedGroup != null || item.UsersLinkedGroup != null)
{
<i class="fa fa-link fa-lg success" title="Is Linked"></i>
}
@if (item.OnAssignmentExpression != null || item.OnUnassignmentExpression != null)
{
<i class="fa fa-bolt fa-lg alert" title="Has Expressions"></i>
}
</td>
}
</tr>
}
</table>
Disco.Web/Areas/Config/Views/UserFlag/Index.generated.cs
+170 -82
View File
@@ -2,7 +2,7 @@
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
// Runtime Version:4.0.30319.34014
// Runtime Version:4.0.30319.42000
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
@@ -27,7 +27,6 @@ namespace Disco.Web.Areas.Config.Views.UserFlag
using System.Web.UI;
using System.Web.WebPages;
using Disco;
using Disco.BI.Extensions;
using Disco.Models.Repository;
using Disco.Services;
using Disco.Services.Authorization;
@@ -49,6 +48,8 @@ namespace Disco.Web.Areas.Config.Views.UserFlag
Authorization.Require(Claims.Config.UserFlag.Show);
ViewBag.Title = Html.ToBreadcrumb("Configuration", MVC.Config.Config.Index(), "User Flags");
var showTags = Model.UserFlags.Keys.Any(i => i.UserDevicesLinkedGroup != null || i.UsersLinkedGroup != null ||
i.OnAssignmentExpression != null || i.OnUnassignmentExpression != null);
#line default
@@ -60,13 +61,13 @@ WriteLiteral(" id=\"Config_UserFlags_Index\"");
WriteLiteral(">\r\n");
#line 7 "..\..\Areas\Config\Views\UserFlag\Index.cshtml"
#line 9 "..\..\Areas\Config\Views\UserFlag\Index.cshtml"
#line default
#line hidden
#line 7 "..\..\Areas\Config\Views\UserFlag\Index.cshtml"
#line 9 "..\..\Areas\Config\Views\UserFlag\Index.cshtml"
if (Model.UserFlags.Count == 0)
{
@@ -79,10 +80,10 @@ WriteLiteral(" class=\"form\"");
WriteLiteral(" style=\"width: 450px; padding: 100px 0;\"");
WriteLiteral(">\r\n <h2>No user flags are configured</h2>\r\n </div> \r\n");
WriteLiteral(">\r\n <h2>No user flags are configured</h2>\r\n </div>\r\n");
#line 12 "..\..\Areas\Config\Views\UserFlag\Index.cshtml"
#line 14 "..\..\Areas\Config\Views\UserFlag\Index.cshtml"
}
else
{
@@ -95,55 +96,82 @@ WriteLiteral(" <table");
WriteLiteral(" class=\"tableData\"");
WriteLiteral(">\r\n <tr>\r\n <th>Name</th>\r\n <th>Descripti" +
"on</th>\r\n <th>Linked</th>\r\n </tr>\r\n");
"on</th>\r\n <th>Current&nbsp;Assignments</th>\r\n");
#line 21 "..\..\Areas\Config\Views\UserFlag\Index.cshtml"
#line 22 "..\..\Areas\Config\Views\UserFlag\Index.cshtml"
#line default
#line hidden
#line 22 "..\..\Areas\Config\Views\UserFlag\Index.cshtml"
if (showTags)
{
#line default
#line hidden
WriteLiteral(" <th>&nbsp;</th>\r\n");
#line 25 "..\..\Areas\Config\Views\UserFlag\Index.cshtml"
}
#line default
#line hidden
WriteLiteral(" </tr>\r\n");
#line 27 "..\..\Areas\Config\Views\UserFlag\Index.cshtml"
#line default
#line hidden
#line 21 "..\..\Areas\Config\Views\UserFlag\Index.cshtml"
foreach (var item in Model.UserFlags)
#line 27 "..\..\Areas\Config\Views\UserFlag\Index.cshtml"
foreach (var pair in Model.UserFlags.OrderBy(i => i.Key.Name))
{
var item = pair.Key;
var assignmentCount = pair.Value;
#line default
#line hidden
WriteLiteral(" <tr>\r\n <td>\r\n <a");
WriteAttribute("href", Tuple.Create(" href=\"", 776), Tuple.Create("\"", 830)
WriteAttribute("href", Tuple.Create(" href=\"", 1211), Tuple.Create("\"", 1265)
#line 25 "..\..\Areas\Config\Views\UserFlag\Index.cshtml"
, Tuple.Create(Tuple.Create("", 783), Tuple.Create<System.Object, System.Int32>(Url.Action(MVC.Config.UserFlag.Index(item.Id))
#line 33 "..\..\Areas\Config\Views\UserFlag\Index.cshtml"
, Tuple.Create(Tuple.Create("", 1218), Tuple.Create<System.Object, System.Int32>(Url.Action(MVC.Config.UserFlag.Index(item.Id))
#line default
#line hidden
, 783), false)
, 1218), false)
);
WriteLiteral(">\r\n <i");
WriteAttribute("class", Tuple.Create(" class=\"", 864), Tuple.Create("\"", 917)
, Tuple.Create(Tuple.Create("", 872), Tuple.Create("fa", 872), true)
, Tuple.Create(Tuple.Create(" ", 874), Tuple.Create("fa-", 875), true)
WriteAttribute("class", Tuple.Create(" class=\"", 1299), Tuple.Create("\"", 1352)
, Tuple.Create(Tuple.Create("", 1307), Tuple.Create("fa", 1307), true)
, Tuple.Create(Tuple.Create(" ", 1309), Tuple.Create("fa-", 1310), true)
#line 26 "..\..\Areas\Config\Views\UserFlag\Index.cshtml"
, Tuple.Create(Tuple.Create("", 878), Tuple.Create<System.Object, System.Int32>(item.Icon
#line 34 "..\..\Areas\Config\Views\UserFlag\Index.cshtml"
, Tuple.Create(Tuple.Create("", 1313), Tuple.Create<System.Object, System.Int32>(item.Icon
#line default
#line hidden
, 878), false)
, Tuple.Create(Tuple.Create(" ", 890), Tuple.Create("fa-lg", 891), true)
, Tuple.Create(Tuple.Create(" ", 896), Tuple.Create("d-", 897), true)
, 1313), false)
, Tuple.Create(Tuple.Create(" ", 1325), Tuple.Create("fa-lg", 1326), true)
, Tuple.Create(Tuple.Create(" ", 1331), Tuple.Create("d-", 1332), true)
#line 26 "..\..\Areas\Config\Views\UserFlag\Index.cshtml"
, Tuple.Create(Tuple.Create("", 899), Tuple.Create<System.Object, System.Int32>(item.IconColour
#line 34 "..\..\Areas\Config\Views\UserFlag\Index.cshtml"
, Tuple.Create(Tuple.Create("", 1334), Tuple.Create<System.Object, System.Int32>(item.IconColour
#line default
#line hidden
, 899), false)
, 1334), false)
);
WriteLiteral("></i>\r\n");
@@ -151,95 +179,155 @@ WriteLiteral("></i>\r\n");
WriteLiteral(" ");
#line 27 "..\..\Areas\Config\Views\UserFlag\Index.cshtml"
#line 35 "..\..\Areas\Config\Views\UserFlag\Index.cshtml"
Write(item.Name);
#line default
#line hidden
WriteLiteral("\r\n </a>\r\n </td>\r\n <t" +
"d>");
"d>\r\n");
#line 30 "..\..\Areas\Config\Views\UserFlag\Index.cshtml"
#line 39 "..\..\Areas\Config\Views\UserFlag\Index.cshtml"
#line default
#line hidden
#line 39 "..\..\Areas\Config\Views\UserFlag\Index.cshtml"
if (string.IsNullOrWhiteSpace(item.Description))
{
{
#line default
#line hidden
WriteLiteral(" <span");
WriteLiteral(" <span");
WriteLiteral(" class=\"smallMessage\"");
WriteLiteral(">&lt;none&gt;</span>\r\n");
#line 33 "..\..\Areas\Config\Views\UserFlag\Index.cshtml"
}
else
{
#line default
#line hidden
#line 36 "..\..\Areas\Config\Views\UserFlag\Index.cshtml"
Write(item.Description.ToHtmlComment());
#line default
#line hidden
#line 36 "..\..\Areas\Config\Views\UserFlag\Index.cshtml"
}
#line default
#line hidden
WriteLiteral(" </td>\r\n <td>");
#line 39 "..\..\Areas\Config\Views\UserFlag\Index.cshtml"
if (item.UserDevicesLinkedGroup != null || item.UsersLinkedGroup != null)
{
#line default
#line hidden
WriteLiteral(" <i");
WriteLiteral(" class=\"fa fa-link fa-lg success\"");
WriteLiteral("></i>\r\n");
#line 42 "..\..\Areas\Config\Views\UserFlag\Index.cshtml"
}
else
{
#line default
#line hidden
#line 45 "..\..\Areas\Config\Views\UserFlag\Index.cshtml"
Write(item.Description.ToHtmlComment());
#line default
#line hidden
WriteLiteral(" <i");
WriteLiteral(" class=\"fa fa-unlink fa-lg information\"");
WriteLiteral("></i>\r\n");
#line 46 "..\..\Areas\Config\Views\UserFlag\Index.cshtml"
#line 45 "..\..\Areas\Config\Views\UserFlag\Index.cshtml"
}
#line default
#line hidden
WriteLiteral(" </td>\r\n </tr>\r\n");
WriteLiteral(" </td>\r\n <td>\r\n");
WriteLiteral(" ");
#line 49 "..\..\Areas\Config\Views\UserFlag\Index.cshtml"
Write(assignmentCount.ToString("N0"));
#line default
#line hidden
WriteLiteral("\r\n </td>\r\n");
#line 51 "..\..\Areas\Config\Views\UserFlag\Index.cshtml"
#line default
#line hidden
#line 51 "..\..\Areas\Config\Views\UserFlag\Index.cshtml"
if (showTags)
{
#line default
#line hidden
WriteLiteral(" <td>\r\n");
#line 54 "..\..\Areas\Config\Views\UserFlag\Index.cshtml"
#line default
#line hidden
#line 54 "..\..\Areas\Config\Views\UserFlag\Index.cshtml"
if (item.UserDevicesLinkedGroup != null || item.UsersLinkedGroup != null)
{
#line default
#line hidden
WriteLiteral(" <i");
WriteLiteral(" class=\"fa fa-link fa-lg success\"");
WriteLiteral(" title=\"Is Linked\"");
WriteLiteral("></i>\r\n");
#line 57 "..\..\Areas\Config\Views\UserFlag\Index.cshtml"
}
#line default
#line hidden
WriteLiteral(" ");
#line 58 "..\..\Areas\Config\Views\UserFlag\Index.cshtml"
if (item.OnAssignmentExpression != null || item.OnUnassignmentExpression != null)
{
#line default
#line hidden
WriteLiteral(" <i");
WriteLiteral(" class=\"fa fa-bolt fa-lg alert\"");
WriteLiteral(" title=\"Has Expressions\"");
WriteLiteral("></i>\r\n");
#line 61 "..\..\Areas\Config\Views\UserFlag\Index.cshtml"
}
#line default
#line hidden
WriteLiteral(" </td>\r\n");
#line 63 "..\..\Areas\Config\Views\UserFlag\Index.cshtml"
}
#line default
#line hidden
WriteLiteral(" </tr>\r\n");
#line 65 "..\..\Areas\Config\Views\UserFlag\Index.cshtml"
}
@@ -248,7 +336,7 @@ WriteLiteral(" </td>\r\n </tr>\r\n");
WriteLiteral(" </table>\r\n");
#line 51 "..\..\Areas\Config\Views\UserFlag\Index.cshtml"
#line 67 "..\..\Areas\Config\Views\UserFlag\Index.cshtml"
}
@@ -257,7 +345,7 @@ WriteLiteral(" </table>\r\n");
WriteLiteral(" ");
#line 52 "..\..\Areas\Config\Views\UserFlag\Index.cshtml"
#line 68 "..\..\Areas\Config\Views\UserFlag\Index.cshtml"
if (Authorization.Has(Claims.Config.UserFlag.Create))
{
@@ -273,7 +361,7 @@ WriteLiteral(">\r\n");
WriteLiteral(" ");
#line 55 "..\..\Areas\Config\Views\UserFlag\Index.cshtml"
#line 71 "..\..\Areas\Config\Views\UserFlag\Index.cshtml"
Write(Html.ActionLinkButton("Create User Flag", MVC.Config.UserFlag.Create()));
@@ -282,7 +370,7 @@ WriteLiteral(" ");
WriteLiteral("\r\n </div>\r\n");
#line 57 "..\..\Areas\Config\Views\UserFlag\Index.cshtml"
#line 73 "..\..\Areas\Config\Views\UserFlag\Index.cshtml"
}
Disco.Web/ClientSource/Style/BundleSite.css
+20 -24
View File
@@ -1862,7 +1862,7 @@ body .ui-tooltip {
background-color: #fff;
}
.tableData > tbody > tr:nth-child(odd) > td {
background-color: #fcfcfc;
background-color: #fbfbfb;
}
.tableData > thead > tr > th,
.tableData > tbody > tr > th {
@@ -1870,10 +1870,7 @@ body .ui-tooltip {
border: solid 1px #f4f4f4;
}
.tableData > tbody > tr:hover > td {
background-color: #fefefe;
}
.tableData > tbody > tr:hover:nth-child(odd) > td {
background-color: #fafafa;
background-color: #f9f9f9;
}
.tableData > tfoot > tr > th,
.tableData > tfoot > tr > td {
@@ -4092,6 +4089,14 @@ header .watermark,
#layout_PageHeading a {
text-decoration: none;
}
#layout_PageHeading > a.button {
position: absolute;
right: 30px;
bottom: 8px;
font-size: 0.5em;
line-height: 1em;
text-align: right;
}
#layout_Page {
background-color: #fff;
overflow: auto;
@@ -4351,7 +4356,7 @@ table.genericData > tbody > tr > td {
background-color: #fff;
}
table.genericData > tbody > tr:nth-child(odd) > td {
background-color: #fcfcfc;
background-color: #fbfbfb;
}
table.genericData > thead > tr > th,
table.genericData > tbody > tr > th {
@@ -4359,10 +4364,7 @@ table.genericData > tbody > tr > th {
border: solid 1px #f4f4f4;
}
table.genericData > tbody > tr:hover > td {
background-color: #fefefe;
}
table.genericData > tbody > tr:hover:nth-child(odd) > td {
background-color: #fafafa;
background-color: #f9f9f9;
}
table.genericData > tfoot > tr > th,
table.genericData > tfoot > tr > td {
@@ -4570,7 +4572,7 @@ table.jobTable > tbody > tr > td {
background-color: #fff;
}
table.jobTable > tbody > tr:nth-child(odd) > td {
background-color: #fcfcfc;
background-color: #fbfbfb;
}
table.jobTable > thead > tr > th,
table.jobTable > tbody > tr > th {
@@ -4578,10 +4580,7 @@ table.jobTable > tbody > tr > th {
border: solid 1px #f4f4f4;
}
table.jobTable > tbody > tr:hover > td {
background-color: #fefefe;
}
table.jobTable > tbody > tr:hover:nth-child(odd) > td {
background-color: #fafafa;
background-color: #f9f9f9;
}
table.jobTable > tfoot > tr > th,
table.jobTable > tfoot > tr > td {
@@ -4619,16 +4618,16 @@ table.jobTable tr.statusSlaExpired td:not(:last-child) {
border-right: 1px solid #fad2ce;
}
table.jobTable tr:nth-child(odd).statusSlaWarning td {
background-color: #fcedcf !important;
background-color: #fbeccf !important;
}
table.jobTable tr:nth-child(odd).statusSlaExpired td {
background-color: #fed6d2 !important;
background-color: #fdd5d1 !important;
}
table.jobTable tr:hover.statusSlaWarning td {
background-color: #fbebca !important;
background-color: #fbeaca !important;
}
table.jobTable tr:hover.statusSlaExpired td {
background-color: #fed1cd !important;
background-color: #fdd1cd !important;
}
table.jobTable div.queues {
display: inline-block;
@@ -4953,7 +4952,7 @@ div.Disco-AttachmentUpload-CommentDialog table > tbody > tr > td {
background-color: #fff;
}
div.Disco-AttachmentUpload-CommentDialog table > tbody > tr:nth-child(odd) > td {
background-color: #fcfcfc;
background-color: #fbfbfb;
}
div.Disco-AttachmentUpload-CommentDialog table > thead > tr > th,
div.Disco-AttachmentUpload-CommentDialog table > tbody > tr > th {
@@ -4961,10 +4960,7 @@ div.Disco-AttachmentUpload-CommentDialog table > tbody > tr > th {
border: solid 1px #f4f4f4;
}
div.Disco-AttachmentUpload-CommentDialog table > tbody > tr:hover > td {
background-color: #fefefe;
}
div.Disco-AttachmentUpload-CommentDialog table > tbody > tr:hover:nth-child(odd) > td {
background-color: #fafafa;
background-color: #f9f9f9;
}
div.Disco-AttachmentUpload-CommentDialog table > tfoot > tr > th,
div.Disco-AttachmentUpload-CommentDialog table > tfoot > tr > td {
Disco.Web/ClientSource/Style/BundleSite.min.css
Vendored
+2 -2
View File
File diff suppressed because one or more lines are too long
Disco.Web/ClientSource/Style/Config.css
+7 -34
View File
@@ -7,7 +7,7 @@
background-color: #fff;
}
.tableData > tbody > tr:nth-child(odd) > td {
background-color: #fcfcfc;
background-color: #fbfbfb;
}
.tableData > thead > tr > th,
.tableData > tbody > tr > th {
@@ -15,10 +15,7 @@
border: solid 1px #f4f4f4;
}
.tableData > tbody > tr:hover > td {
background-color: #fefefe;
}
.tableData > tbody > tr:hover:nth-child(odd) > td {
background-color: #fafafa;
background-color: #f9f9f9;
}
.tableData > tfoot > tr > th,
.tableData > tfoot > tr > td {
@@ -160,7 +157,7 @@ table.expressionsTable > tbody > tr > td {
background-color: #fff;
}
table.expressionsTable > tbody > tr:nth-child(odd) > td {
background-color: #fcfcfc;
background-color: #fbfbfb;
}
table.expressionsTable > thead > tr > th,
table.expressionsTable > tbody > tr > th {
@@ -168,10 +165,7 @@ table.expressionsTable > tbody > tr > th {
border: solid 1px #f4f4f4;
}
table.expressionsTable > tbody > tr:hover > td {
background-color: #fefefe;
}
table.expressionsTable > tbody > tr:hover:nth-child(odd) > td {
background-color: #fafafa;
background-color: #f9f9f9;
}
table.expressionsTable > tfoot > tr > th,
table.expressionsTable > tfoot > tr > td {
@@ -192,7 +186,7 @@ table.expressionsTable td.parseError {
background-color: #fff;
}
#deviceComponents > tbody > tr:nth-child(odd) > td {
background-color: #fcfcfc;
background-color: #fbfbfb;
}
#deviceComponents > thead > tr > th,
#deviceComponents > tbody > tr > th {
@@ -200,10 +194,7 @@ table.expressionsTable td.parseError {
border: solid 1px #f4f4f4;
}
#deviceComponents > tbody > tr:hover > td {
background-color: #fefefe;
}
#deviceComponents > tbody > tr:hover:nth-child(odd) > td {
background-color: #fafafa;
background-color: #f9f9f9;
}
#deviceComponents > tfoot > tr > th,
#deviceComponents > tfoot > tr > td {
@@ -841,7 +832,7 @@ div.logEventsViewport table.logEventsViewport > tbody > tr > td.eventType {
float: left;
margin: 4px;
border: 1px solid #f4f4f4;
background-color: #fcfcfc;
background-color: #fbfbfb;
height: 256px;
width: 256px;
background-position: top center;
@@ -870,24 +861,6 @@ div.logEventsViewport table.logEventsViewport > tbody > tr > td.eventType {
margin-top: 8px;
text-align: right;
}
#Config_DeviceBatches #Config_DeviceBatches_List tr.decommissioned {
display: none;
}
#Config_DeviceBatches #Config_DeviceBatches_List tr.decommissioned > td {
background-color: #f7f7f7;
color: #888;
}
#Config_DeviceBatches #Config_DeviceBatches_List tr.decommissioned:nth-child(odd) > td {
background-color: #f2f2f2;
}
#Config_DeviceBatches_ShowDecommissioned {
position: absolute;
right: 30px;
bottom: 8px;
font-size: 0.5em;
line-height: 1em;
text-align: right;
}
.deviceBatches #DeviceBatch_PurchaseDetails_Container {
padding: 5px 0 5px 5px;
}
Disco.Web/ClientSource/Style/Config.less
-26
View File
@@ -981,32 +981,6 @@ div.logEventsViewport {
}
}
// Device Batches
#Config_DeviceBatches {
#Config_DeviceBatches_List {
tr.decommissioned {
display: none;
& > td {
background-color: darken(@white, 3%);
color: #888;
}
&:nth-child(odd) > td {
background-color: darken(@TableDataRowBackgroundColor, 4%);
}
}
}
}
#Config_DeviceBatches_ShowDecommissioned {
position: absolute;
right: 30px;
bottom: 8px;
font-size: 0.5em;
line-height: 1em;
text-align: right;
}
.deviceBatches {
#DeviceBatch_PurchaseDetails_Container {
padding: 5px 0 5px 5px;
Disco.Web/ClientSource/Style/Config.min.css
Vendored
+1 -1
View File
File diff suppressed because one or more lines are too long
Disco.Web/ClientSource/Style/Declarations.less
+1 -1
View File
@@ -27,7 +27,7 @@
@TableDataBorderColour: #f4f4f4;
@TableDataDarkBorderColour: #d8d8d8;
@TableDataDarkBackgroundColour: #eee;
@TableDataRowBackgroundColor: hsl(hue(@TableDataBorderColour), saturation(@TableDataBorderColour), 99%);
@TableDataRowBackgroundColor: hsl(hue(@TableDataBorderColour), saturation(@TableDataBorderColour), 98.5%);
@SubtleColour: #ededed;
@SubtleBorderColour: #ccc;
Disco.Web/ClientSource/Style/Device.css
+7 -13
View File
@@ -7,7 +7,7 @@
background-color: #fff;
}
.tableData > tbody > tr:nth-child(odd) > td {
background-color: #fcfcfc;
background-color: #fbfbfb;
}
.tableData > thead > tr > th,
.tableData > tbody > tr > th {
@@ -15,10 +15,7 @@
border: solid 1px #f4f4f4;
}
.tableData > tbody > tr:hover > td {
background-color: #fefefe;
}
.tableData > tbody > tr:hover:nth-child(odd) > td {
background-color: #fafafa;
background-color: #f9f9f9;
}
.tableData > tfoot > tr > th,
.tableData > tfoot > tr > td {
@@ -204,7 +201,7 @@
}
#Device_Show_Policies_Profile_Actions_Update_Dialog ul li:nth-child(odd),
#Device_Show_Policies_Batch_Actions_Update_Dialog ul li:nth-child(odd) {
background-color: #fcfcfc;
background-color: #fbfbfb;
}
#Device_Show_Policies_Profile_Actions_Update_Dialog ul li.selected,
#Device_Show_Policies_Batch_Actions_Update_Dialog ul li.selected {
@@ -238,7 +235,7 @@
background-color: #fff;
}
#DeviceDetailTab-DetailsContainer > table > tbody > tr:nth-child(odd) > td {
background-color: #fcfcfc;
background-color: #fbfbfb;
}
#DeviceDetailTab-DetailsContainer > table > thead > tr > th,
#DeviceDetailTab-DetailsContainer > table > tbody > tr > th {
@@ -246,10 +243,7 @@
border: solid 1px #f4f4f4;
}
#DeviceDetailTab-DetailsContainer > table > tbody > tr:hover > td {
background-color: #fefefe;
}
#DeviceDetailTab-DetailsContainer > table > tbody > tr:hover:nth-child(odd) > td {
background-color: #fafafa;
background-color: #f9f9f9;
}
#DeviceDetailTab-DetailsContainer > table > tfoot > tr > th,
#DeviceDetailTab-DetailsContainer > table > tfoot > tr > td {
@@ -495,7 +489,7 @@
background-color: #e7f9d5;
}
#Devices_Import_Review #Devices_Import_Review_Navigation ul li.actionUnchanged {
background-color: #fcfcfc;
background-color: #fbfbfb;
}
#Devices_Import_Review #Devices_Import_Review_TableContainer {
margin: 18px 0;
@@ -524,7 +518,7 @@
content: "\f068";
}
#Devices_Import_Review #Devices_Import_Review_TableContainer table > tbody tr.actionUnchanged td {
background-color: #fcfcfc;
background-color: #fbfbfb;
}
#Devices_Import_Review #Devices_Import_Review_TableContainer table > tbody tr.actionUnchanged td:nth-child(n+3) {
color: #ccc;
Disco.Web/ClientSource/Style/Device.min.css
Vendored
+1 -1
View File
File diff suppressed because one or more lines are too long
Disco.Web/ClientSource/Style/Dialog.css
+2 -5
View File
@@ -7,7 +7,7 @@
background-color: #fff;
}
.tableData > tbody > tr:nth-child(odd) > td {
background-color: #fcfcfc;
background-color: #fbfbfb;
}
.tableData > thead > tr > th,
.tableData > tbody > tr > th {
@@ -15,10 +15,7 @@
border: solid 1px #f4f4f4;
}
.tableData > tbody > tr:hover > td {
background-color: #fefefe;
}
.tableData > tbody > tr:hover:nth-child(odd) > td {
background-color: #fafafa;
background-color: #f9f9f9;
}
.tableData > tfoot > tr > th,
.tableData > tfoot > tr > td {
Disco.Web/ClientSource/Style/Dialog.min.css
Vendored
+1 -1
View File
@@ -1 +1 @@
.tableData{border:solid 1px #f4f4f4;border-collapse:collapse;}.tableData>tbody>tr>td{border:solid 1px #f4f4f4;background-color:#fff;}.tableData>tbody>tr:nth-child(odd)>td{background-color:#fcfcfc;}.tableData>thead>tr>th,.tableData>tbody>tr>th{background-color:#f4f4f4;border:solid 1px #f4f4f4;}.tableData>tbody>tr:hover>td{background-color:#fefefe;}.tableData>tbody>tr:hover:nth-child(odd)>td{background-color:#fafafa;}.tableData>tfoot>tr>th,.tableData>tfoot>tr>td{background-color:#f4f4f4;}.tableDataDark{border:solid 1px #d8d8d8;border-collapse:collapse;}.tableDataDark td{border:solid 1px #d8d8d8;background-color:#fff;}.tableDataDark th{background-color:#eee;border:solid 1px #d8d8d8;}.tableDataContainer{background-color:#fff;}.tableDataVertical{border:solid 1px #f4f4f4;border-collapse:collapse;}.tableDataVertical>tbody>tr:nth-child(odd){background-color:#f4f4f4;margin:0;padding:0;}.tableDataVertical>tbody>tr>th.name{width:170px;text-align:right;}.tableDataVertical table.sub>tbody>tr:not(:first-child)>th,.tableDataVertical table.sub>tbody>tr:not(:first-child)>td{border-top:1px dashed #aaa;}.tableDataVertical table.sub>tbody>tr>th{font-weight:normal;text-align:right;}.tableDataVertical table.sub>tbody>tr>th.name{text-align:right;}.icon16{display:inline-block;height:16px;width:16px;margin-left:2px;cursor:pointer;}.subtleUntilHover{-moz-opacity:.3;opacity:.3;}.subtleUntilHover:hover{-moz-opacity:1;opacity:1;}body{padding:0;}#main{background-color:#fff;overflow:auto;padding:0;-moz-border-radius:0 0 6px 6px;-webkit-border-radius:0 0 6px 6px;border-radius:0 0 6px 6px;}
.tableData{border:solid 1px #f4f4f4;border-collapse:collapse;}.tableData>tbody>tr>td{border:solid 1px #f4f4f4;background-color:#fff;}.tableData>tbody>tr:nth-child(odd)>td{background-color:#fbfbfb;}.tableData>thead>tr>th,.tableData>tbody>tr>th{background-color:#f4f4f4;border:solid 1px #f4f4f4;}.tableData>tbody>tr:hover>td{background-color:#f9f9f9;}.tableData>tfoot>tr>th,.tableData>tfoot>tr>td{background-color:#f4f4f4;}.tableDataDark{border:solid 1px #d8d8d8;border-collapse:collapse;}.tableDataDark td{border:solid 1px #d8d8d8;background-color:#fff;}.tableDataDark th{background-color:#eee;border:solid 1px #d8d8d8;}.tableDataContainer{background-color:#fff;}.tableDataVertical{border:solid 1px #f4f4f4;border-collapse:collapse;}.tableDataVertical>tbody>tr:nth-child(odd){background-color:#f4f4f4;margin:0;padding:0;}.tableDataVertical>tbody>tr>th.name{width:170px;text-align:right;}.tableDataVertical table.sub>tbody>tr:not(:first-child)>th,.tableDataVertical table.sub>tbody>tr:not(:first-child)>td{border-top:1px dashed #aaa;}.tableDataVertical table.sub>tbody>tr>th{font-weight:normal;text-align:right;}.tableDataVertical table.sub>tbody>tr>th.name{text-align:right;}.icon16{display:inline-block;height:16px;width:16px;margin-left:2px;cursor:pointer;}.subtleUntilHover{-moz-opacity:.3;opacity:.3;}.subtleUntilHover:hover{-moz-opacity:1;opacity:1;}body{padding:0;}#main{background-color:#fff;overflow:auto;padding:0;-moz-border-radius:0 0 6px 6px;-webkit-border-radius:0 0 6px 6px;border-radius:0 0 6px 6px;}
Disco.Web/ClientSource/Style/Job.css
+2 -5
View File
@@ -7,7 +7,7 @@
background-color: #fff;
}
.tableData > tbody > tr:nth-child(odd) > td {
background-color: #fcfcfc;
background-color: #fbfbfb;
}
.tableData > thead > tr > th,
.tableData > tbody > tr > th {
@@ -15,10 +15,7 @@
border: solid 1px #f4f4f4;
}
.tableData > tbody > tr:hover > td {
background-color: #fefefe;
}
.tableData > tbody > tr:hover:nth-child(odd) > td {
background-color: #fafafa;
background-color: #f9f9f9;
}
.tableData > tfoot > tr > th,
.tableData > tfoot > tr > td {
Disco.Web/ClientSource/Style/Job.min.css
Vendored
+1 -1
View File
File diff suppressed because one or more lines are too long
Disco.Web/ClientSource/Style/Shared.css
+2 -5
View File
@@ -7,7 +7,7 @@
background-color: #fff;
}
.tableData > tbody > tr:nth-child(odd) > td {
background-color: #fcfcfc;
background-color: #fbfbfb;
}
.tableData > thead > tr > th,
.tableData > tbody > tr > th {
@@ -15,10 +15,7 @@
border: solid 1px #f4f4f4;
}
.tableData > tbody > tr:hover > td {
background-color: #fefefe;
}
.tableData > tbody > tr:hover:nth-child(odd) > td {
background-color: #fafafa;
background-color: #f9f9f9;
}
.tableData > tfoot > tr > th,
.tableData > tfoot > tr > td {
Disco.Web/ClientSource/Style/Shared.less
+2 -7
View File
@@ -19,13 +19,8 @@
border: solid 1px @TableDataBorderColour;
}
& > tbody > tr:hover {
& > td {
background-color: darken(@white, 0.5%);
}
&:nth-child(odd) > td {
background-color: darken(@TableDataRowBackgroundColor, 1%);
}
& > tbody > tr:hover > td {
background-color: darken(@TableDataRowBackgroundColor, 1%);
}
& > tfoot > tr > th, & > tfoot > tr > td {
Disco.Web/ClientSource/Style/Shared.min.css
Vendored
+1 -1
View File
@@ -1 +1 @@
.tableData{border:solid 1px #f4f4f4;border-collapse:collapse;}.tableData>tbody>tr>td{border:solid 1px #f4f4f4;background-color:#fff;}.tableData>tbody>tr:nth-child(odd)>td{background-color:#fcfcfc;}.tableData>thead>tr>th,.tableData>tbody>tr>th{background-color:#f4f4f4;border:solid 1px #f4f4f4;}.tableData>tbody>tr:hover>td{background-color:#fefefe;}.tableData>tbody>tr:hover:nth-child(odd)>td{background-color:#fafafa;}.tableData>tfoot>tr>th,.tableData>tfoot>tr>td{background-color:#f4f4f4;}.tableDataDark{border:solid 1px #d8d8d8;border-collapse:collapse;}.tableDataDark td{border:solid 1px #d8d8d8;background-color:#fff;}.tableDataDark th{background-color:#eee;border:solid 1px #d8d8d8;}.tableDataContainer{background-color:#fff;}.tableDataVertical{border:solid 1px #f4f4f4;border-collapse:collapse;}.tableDataVertical>tbody>tr:nth-child(odd){background-color:#f4f4f4;margin:0;padding:0;}.tableDataVertical>tbody>tr>th.name{width:170px;text-align:right;}.tableDataVertical table.sub>tbody>tr:not(:first-child)>th,.tableDataVertical table.sub>tbody>tr:not(:first-child)>td{border-top:1px dashed #aaa;}.tableDataVertical table.sub>tbody>tr>th{font-weight:normal;text-align:right;}.tableDataVertical table.sub>tbody>tr>th.name{text-align:right;}.icon16{display:inline-block;height:16px;width:16px;margin-left:2px;cursor:pointer;}.subtleUntilHover{-moz-opacity:.3;opacity:.3;}.subtleUntilHover:hover{-moz-opacity:1;opacity:1;}
.tableData{border:solid 1px #f4f4f4;border-collapse:collapse;}.tableData>tbody>tr>td{border:solid 1px #f4f4f4;background-color:#fff;}.tableData>tbody>tr:nth-child(odd)>td{background-color:#fbfbfb;}.tableData>thead>tr>th,.tableData>tbody>tr>th{background-color:#f4f4f4;border:solid 1px #f4f4f4;}.tableData>tbody>tr:hover>td{background-color:#f9f9f9;}.tableData>tfoot>tr>th,.tableData>tfoot>tr>td{background-color:#f4f4f4;}.tableDataDark{border:solid 1px #d8d8d8;border-collapse:collapse;}.tableDataDark td{border:solid 1px #d8d8d8;background-color:#fff;}.tableDataDark th{background-color:#eee;border:solid 1px #d8d8d8;}.tableDataContainer{background-color:#fff;}.tableDataVertical{border:solid 1px #f4f4f4;border-collapse:collapse;}.tableDataVertical>tbody>tr:nth-child(odd){background-color:#f4f4f4;margin:0;padding:0;}.tableDataVertical>tbody>tr>th.name{width:170px;text-align:right;}.tableDataVertical table.sub>tbody>tr:not(:first-child)>th,.tableDataVertical table.sub>tbody>tr:not(:first-child)>td{border-top:1px dashed #aaa;}.tableDataVertical table.sub>tbody>tr>th{font-weight:normal;text-align:right;}.tableDataVertical table.sub>tbody>tr>th.name{text-align:right;}.icon16{display:inline-block;height:16px;width:16px;margin-left:2px;cursor:pointer;}.subtleUntilHover{-moz-opacity:.3;opacity:.3;}.subtleUntilHover:hover{-moz-opacity:1;opacity:1;}
Disco.Web/ClientSource/Style/Site.css
+20 -24
View File
@@ -7,7 +7,7 @@
background-color: #fff;
}
.tableData > tbody > tr:nth-child(odd) > td {
background-color: #fcfcfc;
background-color: #fbfbfb;
}
.tableData > thead > tr > th,
.tableData > tbody > tr > th {
@@ -15,10 +15,7 @@
border: solid 1px #f4f4f4;
}
.tableData > tbody > tr:hover > td {
background-color: #fefefe;
}
.tableData > tbody > tr:hover:nth-child(odd) > td {
background-color: #fafafa;
background-color: #f9f9f9;
}
.tableData > tfoot > tr > th,
.tableData > tfoot > tr > td {
@@ -325,6 +322,14 @@ header .watermark,
#layout_PageHeading a {
text-decoration: none;
}
#layout_PageHeading > a.button {
position: absolute;
right: 30px;
bottom: 8px;
font-size: 0.5em;
line-height: 1em;
text-align: right;
}
#layout_Page {
background-color: #fff;
overflow: auto;
@@ -584,7 +589,7 @@ table.genericData > tbody > tr > td {
background-color: #fff;
}
table.genericData > tbody > tr:nth-child(odd) > td {
background-color: #fcfcfc;
background-color: #fbfbfb;
}
table.genericData > thead > tr > th,
table.genericData > tbody > tr > th {
@@ -592,10 +597,7 @@ table.genericData > tbody > tr > th {
border: solid 1px #f4f4f4;
}
table.genericData > tbody > tr:hover > td {
background-color: #fefefe;
}
table.genericData > tbody > tr:hover:nth-child(odd) > td {
background-color: #fafafa;
background-color: #f9f9f9;
}
table.genericData > tfoot > tr > th,
table.genericData > tfoot > tr > td {
@@ -803,7 +805,7 @@ table.jobTable > tbody > tr > td {
background-color: #fff;
}
table.jobTable > tbody > tr:nth-child(odd) > td {
background-color: #fcfcfc;
background-color: #fbfbfb;
}
table.jobTable > thead > tr > th,
table.jobTable > tbody > tr > th {
@@ -811,10 +813,7 @@ table.jobTable > tbody > tr > th {
border: solid 1px #f4f4f4;
}
table.jobTable > tbody > tr:hover > td {
background-color: #fefefe;
}
table.jobTable > tbody > tr:hover:nth-child(odd) > td {
background-color: #fafafa;
background-color: #f9f9f9;
}
table.jobTable > tfoot > tr > th,
table.jobTable > tfoot > tr > td {
@@ -852,16 +851,16 @@ table.jobTable tr.statusSlaExpired td:not(:last-child) {
border-right: 1px solid #fad2ce;
}
table.jobTable tr:nth-child(odd).statusSlaWarning td {
background-color: #fcedcf !important;
background-color: #fbeccf !important;
}
table.jobTable tr:nth-child(odd).statusSlaExpired td {
background-color: #fed6d2 !important;
background-color: #fdd5d1 !important;
}
table.jobTable tr:hover.statusSlaWarning td {
background-color: #fbebca !important;
background-color: #fbeaca !important;
}
table.jobTable tr:hover.statusSlaExpired td {
background-color: #fed1cd !important;
background-color: #fdd1cd !important;
}
table.jobTable div.queues {
display: inline-block;
@@ -1186,7 +1185,7 @@ div.Disco-AttachmentUpload-CommentDialog table > tbody > tr > td {
background-color: #fff;
}
div.Disco-AttachmentUpload-CommentDialog table > tbody > tr:nth-child(odd) > td {
background-color: #fcfcfc;
background-color: #fbfbfb;
}
div.Disco-AttachmentUpload-CommentDialog table > thead > tr > th,
div.Disco-AttachmentUpload-CommentDialog table > tbody > tr > th {
@@ -1194,10 +1193,7 @@ div.Disco-AttachmentUpload-CommentDialog table > tbody > tr > th {
border: solid 1px #f4f4f4;
}
div.Disco-AttachmentUpload-CommentDialog table > tbody > tr:hover > td {
background-color: #fefefe;
}
div.Disco-AttachmentUpload-CommentDialog table > tbody > tr:hover:nth-child(odd) > td {
background-color: #fafafa;
background-color: #f9f9f9;
}
div.Disco-AttachmentUpload-CommentDialog table > tfoot > tr > th,
div.Disco-AttachmentUpload-CommentDialog table > tfoot > tr > td {
Disco.Web/ClientSource/Style/Site.less
+9
View File
@@ -257,6 +257,15 @@ header, #header {
a {
text-decoration: none;
}
& > a.button {
position: absolute;
right: 30px;
bottom: 8px;
font-size: 0.5em;
line-height: 1em;
text-align: right;
}
}
#layout_Page {
Disco.Web/ClientSource/Style/Site.min.css
Vendored
+1 -1
View File
File diff suppressed because one or more lines are too long
Disco.Web/ClientSource/Style/User.css
+2 -5
View File
@@ -7,7 +7,7 @@
background-color: #fff;
}
.tableData > tbody > tr:nth-child(odd) > td {
background-color: #fcfcfc;
background-color: #fbfbfb;
}
.tableData > thead > tr > th,
.tableData > tbody > tr > th {
@@ -15,10 +15,7 @@
border: solid 1px #f4f4f4;
}
.tableData > tbody > tr:hover > td {
background-color: #fefefe;
}
.tableData > tbody > tr:hover:nth-child(odd) > td {
background-color: #fafafa;
background-color: #f9f9f9;
}
.tableData > tfoot > tr > th,
.tableData > tfoot > tr > td {
Disco.Web/ClientSource/Style/User.min.css
Vendored
+1 -1
View File
File diff suppressed because one or more lines are too long
Disco.Web/ClientSource/Style/jQueryUIExtensions.css
+2 -5
View File
@@ -7,7 +7,7 @@
background-color: #fff;
}
.tableData > tbody > tr:nth-child(odd) > td {
background-color: #fcfcfc;
background-color: #fbfbfb;
}
.tableData > thead > tr > th,
.tableData > tbody > tr > th {
@@ -15,10 +15,7 @@
border: solid 1px #f4f4f4;
}
.tableData > tbody > tr:hover > td {
background-color: #fefefe;
}
.tableData > tbody > tr:hover:nth-child(odd) > td {
background-color: #fafafa;
background-color: #f9f9f9;
}
.tableData > tfoot > tr > th,
.tableData > tfoot > tr > td {
Disco.Web/ClientSource/Style/jQueryUIExtensions.min.css
Vendored
+1 -1
View File
File diff suppressed because one or more lines are too long
Disco.Web/Extensions/T4MVC/API.DocumentTemplateController.generated.cs
+32
View File
@@ -107,6 +107,12 @@ namespace Disco.Web.Areas.API.Controllers
}
[NonAction]
[GeneratedCode("T4MVC", "2.0"), DebuggerNonUserCode]
public virtual System.Web.Mvc.ActionResult UpdateIsHidden()
{
return new T4MVC_System_Web_Mvc_ActionResult(Area, Name, ActionNames.UpdateIsHidden);
}
[NonAction]
[GeneratedCode("T4MVC", "2.0"), DebuggerNonUserCode]
public virtual System.Web.Mvc.ActionResult UpdateScope()
{
return new T4MVC_System_Web_Mvc_ActionResult(Area, Name, ActionNames.UpdateScope);
@@ -195,6 +201,7 @@ namespace Disco.Web.Areas.API.Controllers
public readonly string UpdateOnGenerateExpression = "UpdateOnGenerateExpression";
public readonly string UpdateOnImportAttachmentExpression = "UpdateOnImportAttachmentExpression";
public readonly string UpdateFlattenForm = "UpdateFlattenForm";
public readonly string UpdateIsHidden = "UpdateIsHidden";
public readonly string UpdateScope = "UpdateScope";
public readonly string UpdateJobSubTypes = "UpdateJobSubTypes";
public readonly string UpdateDevicesLinkedGroup = "UpdateDevicesLinkedGroup";
@@ -220,6 +227,7 @@ namespace Disco.Web.Areas.API.Controllers
public const string UpdateOnGenerateExpression = "UpdateOnGenerateExpression";
public const string UpdateOnImportAttachmentExpression = "UpdateOnImportAttachmentExpression";
public const string UpdateFlattenForm = "UpdateFlattenForm";
public const string UpdateIsHidden = "UpdateIsHidden";
public const string UpdateScope = "UpdateScope";
public const string UpdateJobSubTypes = "UpdateJobSubTypes";
public const string UpdateDevicesLinkedGroup = "UpdateDevicesLinkedGroup";
@@ -314,6 +322,16 @@ namespace Disco.Web.Areas.API.Controllers
public readonly string FlattenForm = "FlattenForm";
public readonly string redirect = "redirect";
}
static readonly ActionParamsClass_UpdateIsHidden s_params_UpdateIsHidden = new ActionParamsClass_UpdateIsHidden();
[GeneratedCode("T4MVC", "2.0"), DebuggerNonUserCode]
public ActionParamsClass_UpdateIsHidden UpdateIsHiddenParams { get { return s_params_UpdateIsHidden; } }
[GeneratedCode("T4MVC", "2.0"), DebuggerNonUserCode]
public class ActionParamsClass_UpdateIsHidden
{
public readonly string id = "id";
public readonly string IsHidden = "IsHidden";
public readonly string redirect = "redirect";
}
static readonly ActionParamsClass_UpdateScope s_params_UpdateScope = new ActionParamsClass_UpdateScope();
[GeneratedCode("T4MVC", "2.0"), DebuggerNonUserCode]
public ActionParamsClass_UpdateScope UpdateScopeParams { get { return s_params_UpdateScope; } }
@@ -563,6 +581,20 @@ namespace Disco.Web.Areas.API.Controllers
return callInfo;
}
[NonAction]
partial void UpdateIsHiddenOverride(T4MVC_System_Web_Mvc_ActionResult callInfo, string id, string IsHidden, bool redirect);
[NonAction]
public override System.Web.Mvc.ActionResult UpdateIsHidden(string id, string IsHidden, bool redirect)
{
var callInfo = new T4MVC_System_Web_Mvc_ActionResult(Area, Name, ActionNames.UpdateIsHidden);
ModelUnbinderHelpers.AddRouteValues(callInfo.RouteValueDictionary, "id", id);
ModelUnbinderHelpers.AddRouteValues(callInfo.RouteValueDictionary, "IsHidden", IsHidden);
ModelUnbinderHelpers.AddRouteValues(callInfo.RouteValueDictionary, "redirect", redirect);
UpdateIsHiddenOverride(callInfo, id, IsHidden, redirect);
return callInfo;
}
[NonAction]
partial void UpdateScopeOverride(T4MVC_System_Web_Mvc_ActionResult callInfo, string id, string Scope, bool redirect);