diff --git a/Disco.Web/Areas/Config/Views/DeviceBatch/Show.cshtml b/Disco.Web/Areas/Config/Views/DeviceBatch/Show.cshtml index 47e5e6e2..0f715a1b 100644 --- a/Disco.Web/Areas/Config/Views/DeviceBatch/Show.cshtml +++ b/Disco.Web/Areas/Config/Views/DeviceBatch/Show.cshtml @@ -139,9 +139,11 @@ @if (Model.DeviceBatch.UnitQuantity.HasValue && Model.DeviceBatch.UnitQuantity.Value > Model.DeviceCount) { var missingCount = Model.DeviceBatch.UnitQuantity.Value - Model.DeviceCount; -
+ + @Model.DeviceCount.ToString("n0") of @(Model.DeviceBatch.UnitQuantity.Value.ToString("n0")) purchased devices are managed by Disco. @missingCount.ToString("n0") @(missingCount == 1 ? "is" : "are") not managed. +
\r\n \r\n \r\n"); -WriteLiteral(" "); +WriteLiteral(" "); - #line 144 "..\..\Areas\Config\Views\DeviceBatch\Show.cshtml" - Write(Model.DeviceCount.ToString("n0")); + #line 145 "..\..\Areas\Config\Views\DeviceBatch\Show.cshtml" + Write(Model.DeviceCount.ToString("n0")); #line default @@ -549,8 +551,8 @@ WriteLiteral(" "); WriteLiteral(" of "); - #line 144 "..\..\Areas\Config\Views\DeviceBatch\Show.cshtml" - Write(Model.DeviceBatch.UnitQuantity.Value.ToString("n0")); + #line 145 "..\..\Areas\Config\Views\DeviceBatch\Show.cshtml" + Write(Model.DeviceBatch.UnitQuantity.Value.ToString("n0")); #line default @@ -558,8 +560,8 @@ WriteLiteral(" of "); WriteLiteral(" purchased devices are managed by Disco. "); - #line 144 "..\..\Areas\Config\Views\DeviceBatch\Show.cshtml" - Write(missingCount.ToString("n0")); + #line 145 "..\..\Areas\Config\Views\DeviceBatch\Show.cshtml" + Write(missingCount.ToString("n0")); #line default @@ -567,16 +569,17 @@ WriteLiteral(" purchased devices are managed by Disco. "); WriteLiteral(" "); - #line 144 "..\..\Areas\Config\Views\DeviceBatch\Show.cshtml" - Write(missingCount == 1 ? "is" : "are"); + #line 145 "..\..\Areas\Config\Views\DeviceBatch\Show.cshtml" + Write(missingCount == 1 ? "is" : "are"); #line default #line hidden -WriteLiteral(" not managed.\r\n
This template is generated from @(Model.DocumentTemplate.Scope)s. Any expressions within the Template PDF will be evaluated within the @(Model.DocumentTemplate.Scope) Scope.
@@ -173,14 +173,14 @@Expressions within the Template PDF may need to be updated to reflect any changes to the Document Template Scope.
Warning: This Document Template contains Linked Groups, these will be automatically updated to reflect the new Document Template Scope which may result in undesired behaviour.
diff --git a/Disco.Web/Areas/Config/Views/DocumentTemplate/Show.generated.cs b/Disco.Web/Areas/Config/Views/DocumentTemplate/Show.generated.cs index 720fd934..d2252a6f 100644 --- a/Disco.Web/Areas/Config/Views/DocumentTemplate/Show.generated.cs +++ b/Disco.Web/Areas/Config/Views/DocumentTemplate/Show.generated.cs @@ -137,7 +137,7 @@ WriteLiteral("\r\nThis template is generated from ");
#line hidden
WriteLiteral("s. Any expressions within the Template PDF will be evaluated within the (Url.Action(MVC.Config.DocumentTemplate.ExpressionBrowser())
+ , Tuple.Create(Tuple.Create("", 8597), Tuple.Create
\r\n \r\n Are you sure you want to uninstall this plugin?\r\n Are you sure you want to uninstall this plugin?\r\n
\r\n " + +" \r\nNOTE: Data will be permanently deleted\r\n
");
- #line 300 "..\..\Areas\Config\Views\SystemConfig\Index.cshtml"
+ #line 303 "..\..\Areas\Config\Views\SystemConfig\Index.cshtml"
Write(serverDescription);
@@ -1151,7 +1155,7 @@ WriteLiteral(" ");
WriteLiteral("");
- #line 300 "..\..\Areas\Config\Views\SystemConfig\Index.cshtml"
+ #line 303 "..\..\Areas\Config\Views\SystemConfig\Index.cshtml"
if (isSiteServer)
{
@@ -1166,7 +1170,7 @@ WriteLiteral(" title=\"Site Server\"");
WriteLiteral("> ");
- #line 301 "..\..\Areas\Config\Views\SystemConfig\Index.cshtml"
+ #line 304 "..\..\Areas\Config\Views\SystemConfig\Index.cshtml"
}
#line default
@@ -1174,7 +1178,7 @@ WriteLiteral("> ");
WriteLiteral(" \r\n");
- #line 302 "..\..\Areas\Config\Views\SystemConfig\Index.cshtml"
+ #line 305 "..\..\Areas\Config\Views\SystemConfig\Index.cshtml"
}
@@ -1208,7 +1212,7 @@ WriteLiteral(@"
");
- #line 328 "..\..\Areas\Config\Views\SystemConfig\Index.cshtml"
+ #line 331 "..\..\Areas\Config\Views\SystemConfig\Index.cshtml"
}
@@ -1221,13 +1225,13 @@ WriteLiteral(" style=\"width: 135px\"");
WriteLiteral(">Search Scope:\r\n \r\n \r\n");
- #line 335 "..\..\Areas\Config\Views\SystemConfig\Index.cshtml"
+ #line 338 "..\..\Areas\Config\Views\SystemConfig\Index.cshtml"
#line default
#line hidden
- #line 335 "..\..\Areas\Config\Views\SystemConfig\Index.cshtml"
+ #line 338 "..\..\Areas\Config\Views\SystemConfig\Index.cshtml"
if (Model.ADSearchContainers != null && Model.ADSearchContainers.Count > 0)
{
@@ -1244,13 +1248,13 @@ WriteLiteral(" id=\"Config_System_AD_SearchScope_DistinguishedNames\"");
WriteLiteral(">\r\n");
- #line 339 "..\..\Areas\Config\Views\SystemConfig\Index.cshtml"
+ #line 342 "..\..\Areas\Config\Views\SystemConfig\Index.cshtml"
#line default
#line hidden
- #line 339 "..\..\Areas\Config\Views\SystemConfig\Index.cshtml"
+ #line 342 "..\..\Areas\Config\Views\SystemConfig\Index.cshtml"
foreach (var adContainer in Model.ADSearchContainers)
{
@@ -1262,7 +1266,7 @@ WriteLiteral(" ");
- #line 341 "..\..\Areas\Config\Views\SystemConfig\Index.cshtml"
+ #line 344 "..\..\Areas\Config\Views\SystemConfig\Index.cshtml"
Write(adContainer.Item3);
@@ -1282,7 +1286,7 @@ WriteLiteral(">");
WriteLiteral(" \r\n");
- #line 342 "..\..\Areas\Config\Views\SystemConfig\Index.cshtml"
+ #line 345 "..\..\Areas\Config\Views\SystemConfig\Index.cshtml"
}
@@ -1291,7 +1295,7 @@ WriteLiteral("\r\n");
WriteLiteral(" \r\n");
- #line 344 "..\..\Areas\Config\Views\SystemConfig\Index.cshtml"
+ #line 347 "..\..\Areas\Config\Views\SystemConfig\Index.cshtml"
}
else
{
@@ -1309,7 +1313,7 @@ WriteLiteral(">When searching, the entire domain will be queried. This is suitab
"gle-domain deployments.\r\n");
- #line 349 "..\..\Areas\Config\Views\SystemConfig\Index.cshtml"
+ #line 352 "..\..\Areas\Config\Views\SystemConfig\Index.cshtml"
}
@@ -1318,7 +1322,7 @@ WriteLiteral(">When searching, the entire domain will be queried. This is suitab
WriteLiteral(" ");
- #line 350 "..\..\Areas\Config\Views\SystemConfig\Index.cshtml"
+ #line 353 "..\..\Areas\Config\Views\SystemConfig\Index.cshtml"
if (canConfigAD)
{
@@ -1353,7 +1357,7 @@ WriteLiteral(">\r\n");
WriteLiteral(" ");
- #line 358 "..\..\Areas\Config\Views\SystemConfig\Index.cshtml"
+ #line 361 "..\..\Areas\Config\Views\SystemConfig\Index.cshtml"
Write(AjaxHelpers.AjaxLoader());
@@ -1369,13 +1373,13 @@ WriteLiteral(" class=\"organisationalUnitTree\"");
WriteLiteral(">\r\n \r\n");
- #line 362 "..\..\Areas\Config\Views\SystemConfig\Index.cshtml"
+ #line 365 "..\..\Areas\Config\Views\SystemConfig\Index.cshtml"
#line default
#line hidden
- #line 362 "..\..\Areas\Config\Views\SystemConfig\Index.cshtml"
+ #line 365 "..\..\Areas\Config\Views\SystemConfig\Index.cshtml"
using (Html.BeginForm(MVC.API.System.UpdateActiveDirectorySearchScope(null, redirect: true)))
{
}
@@ -1422,7 +1426,7 @@ WriteLiteral(" \r\n");
- #line 473 "..\..\Areas\Config\Views\SystemConfig\Index.cshtml"
+ #line 476 "..\..\Areas\Config\Views\SystemConfig\Index.cshtml"
}
@@ -1477,7 +1481,7 @@ WriteLiteral("\', null, function (data) {\r\n
WriteLiteral(" \r\n \r\n \r\n\r\n");
- #line 478 "..\..\Areas\Config\Views\SystemConfig\Index.cshtml"
+ #line 481 "..\..\Areas\Config\Views\SystemConfig\Index.cshtml"
if (canConfigProxy)
{
using (Html.BeginForm(MVC.API.System.UpdateProxySettings()))
@@ -1502,7 +1506,7 @@ WriteLiteral(">Address:\r\n \r\n \r\n");
WriteLiteral(" ");
- #line 489 "..\..\Areas\Config\Views\SystemConfig\Index.cshtml"
+ #line 492 "..\..\Areas\Config\Views\SystemConfig\Index.cshtml"
Write(Html.EditorFor(m => m.ProxyAddress));
@@ -1513,7 +1517,7 @@ WriteLiteral("
\r\n");
WriteLiteral(" ");
- #line 490 "..\..\Areas\Config\Views\SystemConfig\Index.cshtml"
+ #line 493 "..\..\Areas\Config\Views\SystemConfig\Index.cshtml"
Write(Html.ValidationMessageFor(m => m.ProxyAddress));
@@ -1529,7 +1533,7 @@ WriteLiteral(">Port:\r\n \r\n \r\n");
WriteLiteral(" ");
- #line 497 "..\..\Areas\Config\Views\SystemConfig\Index.cshtml"
+ #line 500 "..\..\Areas\Config\Views\SystemConfig\Index.cshtml"
Write(Html.EditorFor(m => m.ProxyPort));
@@ -1540,7 +1544,7 @@ WriteLiteral("
\r\n");
WriteLiteral(" ");
- #line 498 "..\..\Areas\Config\Views\SystemConfig\Index.cshtml"
+ #line 501 "..\..\Areas\Config\Views\SystemConfig\Index.cshtml"
Write(Html.ValidationMessageFor(m => m.ProxyPort));
@@ -1556,7 +1560,7 @@ WriteLiteral(">Username:\r\n \r\n \r\n");
WriteLiteral(" ");
- #line 505 "..\..\Areas\Config\Views\SystemConfig\Index.cshtml"
+ #line 508 "..\..\Areas\Config\Views\SystemConfig\Index.cshtml"
Write(Html.EditorFor(m => m.ProxyUsername));
@@ -1567,7 +1571,7 @@ WriteLiteral("
\r\n");
WriteLiteral(" ");
- #line 506 "..\..\Areas\Config\Views\SystemConfig\Index.cshtml"
+ #line 509 "..\..\Areas\Config\Views\SystemConfig\Index.cshtml"
Write(Html.ValidationMessageFor(m => m.ProxyUsername));
@@ -1583,7 +1587,7 @@ WriteLiteral(">Password:\r\n \r\n \r\n");
WriteLiteral(" ");
- #line 513 "..\..\Areas\Config\Views\SystemConfig\Index.cshtml"
+ #line 516 "..\..\Areas\Config\Views\SystemConfig\Index.cshtml"
Write(Html.EditorFor(m => m.ProxyPassword));
@@ -1594,7 +1598,7 @@ WriteLiteral("
\r\n");
WriteLiteral(" ");
- #line 514 "..\..\Areas\Config\Views\SystemConfig\Index.cshtml"
+ #line 517 "..\..\Areas\Config\Views\SystemConfig\Index.cshtml"
Write(Html.ValidationMessageFor(m => m.ProxyPassword));
@@ -1616,7 +1620,7 @@ WriteLiteral(" value=\"Save Proxy Settings\"");
WriteLiteral(" />\r\n \r\n \r\n \r\n \r\n");
- #line 526 "..\..\Areas\Config\Views\SystemConfig\Index.cshtml"
+ #line 529 "..\..\Areas\Config\Views\SystemConfig\Index.cshtml"
}
}
else
@@ -1641,7 +1645,7 @@ WriteLiteral(">Address:\r\n \r\n \r\n");
WriteLiteral(" ");
- #line 537 "..\..\Areas\Config\Views\SystemConfig\Index.cshtml"
+ #line 540 "..\..\Areas\Config\Views\SystemConfig\Index.cshtml"
Write(Html.DisplayFor(m => m.ProxyAddress));
@@ -1657,7 +1661,7 @@ WriteLiteral(">Port:\r\n \r\n \r\n");
WriteLiteral(" ");
- #line 544 "..\..\Areas\Config\Views\SystemConfig\Index.cshtml"
+ #line 547 "..\..\Areas\Config\Views\SystemConfig\Index.cshtml"
Write(Html.DisplayFor(m => m.ProxyPort));
@@ -1673,7 +1677,7 @@ WriteLiteral(">Username:\r\n \r\n \r\n");
WriteLiteral(" ");
- #line 551 "..\..\Areas\Config\Views\SystemConfig\Index.cshtml"
+ #line 554 "..\..\Areas\Config\Views\SystemConfig\Index.cshtml"
Write(Html.DisplayFor(m => m.ProxyUsername));
@@ -1688,7 +1692,7 @@ WriteLiteral(">Password:\r\n \r\n *******
" \r\n \r\n \r\n \r\n");
- #line 562 "..\..\Areas\Config\Views\SystemConfig\Index.cshtml"
+ #line 565 "..\..\Areas\Config\Views\SystemConfig\Index.cshtml"
}
@@ -1703,7 +1707,7 @@ WriteLiteral(">\r\n");
WriteLiteral(" ");
- #line 564 "..\..\Areas\Config\Views\SystemConfig\Index.cshtml"
+ #line 567 "..\..\Areas\Config\Views\SystemConfig\Index.cshtml"
Write(Html.ActionLinkButton("Update Device Last Network Logons", MVC.API.System.UpdateLastNetworkLogonDates()));
diff --git a/Disco.Web/Areas/Config/Views/UserFlag/Index.cshtml b/Disco.Web/Areas/Config/Views/UserFlag/Index.cshtml
index 0b593677..0c7d3dde 100644
--- a/Disco.Web/Areas/Config/Views/UserFlag/Index.cshtml
+++ b/Disco.Web/Areas/Config/Views/UserFlag/Index.cshtml
@@ -1,7 +1,7 @@
@model Disco.Web.Areas.Config.Models.UserFlag.IndexModel
@{
Authorization.Require(Claims.Config.UserFlag.Show);
- ViewBag.Title = Html.ToBreadcrumb("Configuration", MVC.Config.Config.Index(), "User Flags", MVC.Config.UserFlag.Index(null));
+ ViewBag.Title = Html.ToBreadcrumb("Configuration", MVC.Config.Config.Index(), "User Flags");
}