fixup Disco -> Disco ICT

This commit is contained in:
Gary Sharp
2023-07-26 19:01:31 +10:00
parent e204ea4d5f
commit 6fcb1a1eae
68 changed files with 221 additions and 232 deletions
@@ -223,6 +223,6 @@ else
</script>
<!-- #endregion -->
<div class="actionBar">
<a id="Config_AuthRoles_UpdateAdministrators" href="#" class="button">Update Disco Administrators [@Model.AdministratorSubjects.Count]</a>
<a id="Config_AuthRoles_UpdateAdministrators" href="#" class="button">Update Disco ICT Administrators [@Model.AdministratorSubjects.Count]</a>
@Html.ActionLinkButton("Create Authorization Role", MVC.Config.AuthorizationRole.Create())
</div>
@@ -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.AuthorizationRole
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;
@@ -469,11 +468,11 @@ WriteLiteral(" href=\"#\"");
WriteLiteral(" class=\"button\"");
WriteLiteral(">Update Disco Administrators [");
WriteLiteral(">Update Disco ICT Administrators [");
#line 226 "..\..\Areas\Config\Views\AuthorizationRole\Index.cshtml"
Write(Model.AdministratorSubjects.Count);
Write(Model.AdministratorSubjects.Count);
#line default
@@ -28,7 +28,7 @@
{
<i class="fa fa-cog"></i>@Html.ActionLinkClass("Plugins", MVC.Config.Plugins.Index(), "config")
<div class="pageMenuBlurb">
Manage extensions to the Disco platform.
Manage extensions to the Disco ICT platform.
</div>
}
@if (Authorization.Has(Claims.DiscoAdminAccount))
@@ -42,7 +42,7 @@
{
<i class="fa fa-cog"></i>@Html.ActionLinkClass("Logging", MVC.Config.Logging.Index(), "config")
<div class="pageMenuBlurb">
Export Log files from various Disco Modules and view Live Logging.
Export Log files from various Disco ICT Modules and view Live Logging.
</div>
}
</div>
@@ -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.Config
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;
@@ -223,8 +222,8 @@ WriteLiteral(" <div");
WriteLiteral(" class=\"pageMenuBlurb\"");
WriteLiteral(">\r\n Manage extensions to the Disco platform.\r\n " +
" </div>\r\n");
WriteLiteral(">\r\n Manage extensions to the Disco ICT platform.\r\n " +
" </div>\r\n");
#line 33 "..\..\Areas\Config\Views\Config\Index.cshtml"
@@ -323,8 +322,8 @@ WriteLiteral(" <div");
WriteLiteral(" class=\"pageMenuBlurb\"");
WriteLiteral(">\r\n Export Log files from various Disco Modules and vi" +
"ew Live Logging.\r\n </div>\r\n");
WriteLiteral(">\r\n Export Log files from various Disco ICT Modules an" +
"d view Live Logging.\r\n </div>\r\n");
#line 47 "..\..\Areas\Config\Views\Config\Index.cshtml"
@@ -912,14 +911,14 @@ WriteLiteral(" class=\"fa fa-cloud-download info\"");
WriteLiteral("></i>\r\n <div>An updated version of Disco is available</div>\r\n <a");
WriteAttribute("href", Tuple.Create(" href=\"", 7810), Tuple.Create("\"", 7846)
WriteAttribute("href", Tuple.Create(" href=\"", 7818), Tuple.Create("\"", 7854)
#line 148 "..\..\Areas\Config\Views\Config\Index.cshtml"
, Tuple.Create(Tuple.Create("", 7817), Tuple.Create<System.Object, System.Int32>(Model.UpdateResponse.UrlLink
, Tuple.Create(Tuple.Create("", 7825), Tuple.Create<System.Object, System.Int32>(Model.UpdateResponse.UrlLink
#line default
#line hidden
, 7817), false)
, 7825), false)
);
WriteLiteral(" class=\"button small alert\"");
@@ -7,7 +7,7 @@
Html.BundleDeferred("~/ClientScripts/Modules/jQueryUI-DynaTree");
}
<div id="configurationDocumentTemplateExpressionBrowser">
Expressions within Disco are based on the <a href="http://www.springframework.net/"
Expressions within Disco ICT are based on the <a href="http://www.springframework.net/"
target="_blank">Spring.NET Framework</a>. Please refer to the <a href="http://www.springframework.net/doc-latest/reference/html/expressions.html"
target="_blank">Expression Evaluation</a> documentation.
<h2 id="DeviceScope">
@@ -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;
@@ -60,7 +59,7 @@ WriteLiteral("\r\n<div");
WriteLiteral(" id=\"configurationDocumentTemplateExpressionBrowser\"");
WriteLiteral(">\r\n Expressions within Disco are based on the <a");
WriteLiteral(">\r\n Expressions within Disco ICT are based on the <a");
WriteLiteral(" href=\"http://www.springframework.net/\"");
@@ -34,7 +34,7 @@
<div class="sessionPageDetails">
<h3 data-bind="text: title"></h3>
<div data-bind="visible: undetected">
Disco QR-Code not found<br />
Disco ICT QR-Code not found<br />
<a target="_blank" href="#" data-bind="attr: { href: manuallyAssignUrl }, visible: $parent.sessionEnded">Manually Assign Page</a>
</div>
<div data-bind="visible: detected">
@@ -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;
@@ -139,8 +138,8 @@ WriteLiteral("></h3>\r\n <div");
WriteLiteral(" data-bind=\"visible: undetected\"");
WriteLiteral(">\r\n Disco QR-Code not found<br />\r\n " +
" <a");
WriteLiteral(">\r\n Disco ICT QR-Code not found<br />\r\n " +
" <a");
WriteLiteral(" target=\"_blank\"");
@@ -71,7 +71,7 @@
<div class="info-box">
<p class="fa-p">
<i class="fa fa-exclamation-triangle"></i><strong>Warning:</strong> All plugins run with the same level of network privileges as the Disco Web App.<br />
<i class="fa fa-exclamation-triangle"></i><strong>Warning:</strong> All plugins run with the same level of network privileges as the Disco ICT Web App.<br />
<strong>Only Install plugins from a trusted source.</strong>
</p>
</div>
@@ -88,7 +88,7 @@
</div>
<div class="info-box error">
<p class="fa-p">
<i class="fa fa-exclamation-triangle"></i><strong>Warning:</strong> All plugins run with the same level of network privileges as the Disco Web App.<br />
<i class="fa fa-exclamation-triangle"></i><strong>Warning:</strong> All plugins run with the same level of network privileges as the Disco ICT Web App.<br />
<strong>Only install plugins from a trusted source.</strong>
</p>
</div>
@@ -413,8 +413,8 @@ WriteLiteral(">\r\n <i");
WriteLiteral(" class=\"fa fa-exclamation-triangle\"");
WriteLiteral("></i><strong>Warning:</strong> All plugins run with the same level of network pri" +
"vileges as the Disco Web App.<br />\r\n <strong>Only Install plugins fr" +
"om a trusted source.</strong>\r\n </p>\r\n </div>\r\n</div>\r\n");
"vileges as the Disco ICT Web App.<br />\r\n <strong>Only Install plugin" +
"s from a trusted source.</strong>\r\n </p>\r\n </div>\r\n</div>\r\n");
#line 79 "..\..\Areas\Config\Views\Plugins\Install.cshtml"
@@ -488,9 +488,9 @@ WriteLiteral(">\r\n <i");
WriteLiteral(" class=\"fa fa-exclamation-triangle\"");
WriteLiteral("></i><strong>Warning:</strong> All plugins run with the same level of network pri" +
"vileges as the Disco Web App.<br />\r\n <strong>Only install plugin" +
"s from a trusted source.</strong>\r\n </p>\r\n </div>\r\n </div>\r" +
"\n");
"vileges as the Disco ICT Web App.<br />\r\n <strong>Only install pl" +
"ugins from a trusted source.</strong>\r\n </p>\r\n </div>\r\n </d" +
"iv>\r\n");
#line 96 "..\..\Areas\Config\Views\Plugins\Install.cshtml"
@@ -19,7 +19,7 @@
<table>
<tr>
<th style="width: 135px">
Disco Version:
Disco ICT Version:
</th>
<td>
<div>
@@ -268,7 +268,7 @@
@Html.CheckBoxFor(m => m.ADSearchAllServers, new { disabled = "disabled" }) @Html.LabelFor(m => m.ADSearchAllServers)
<div class="info-box">
<p class="fa-p">
<i class="fa fa-exclamation-circle warning"></i>Disco will not search the entire directory which consists of more than @(Disco.Services.Interop.ActiveDirectory.ActiveDirectory.MaxAllServerSearch) servers. Only servers within this site will be searched.
<i class="fa fa-exclamation-circle warning"></i>Disco ICT will not search the entire directory which consists of more than @(Disco.Services.Interop.ActiveDirectory.ActiveDirectory.MaxAllServerSearch) servers. Only servers within this site will be searched.
</p>
</div>
}
@@ -277,7 +277,7 @@
@Html.CheckBoxFor(m => m.ADSearchAllServers) @Html.LabelFor(m => m.ADSearchAllServers) @AjaxHelpers.AjaxLoader()
<div class="info-box">
<p class="fa-p">
<i class="fa fa-info-circle"></i>If this setting is enabled, Disco will query all servers within the directory rather than only servers within this site.
<i class="fa fa-info-circle"></i>If this setting is enabled, Disco ICT will query all servers within the directory rather than only servers within this site.
</p>
</div>
<script>
@@ -294,7 +294,7 @@
@Html.CheckBoxFor(m => m.ADSearchAllServers, new { disabled = "disabled" }) @Html.LabelFor(m => m.ADSearchAllServers)
<div class="info-box">
<p class="fa-p">
<i class="fa fa-info-circle"></i>If this setting is enabled, Disco will query all servers within the directory rather than only servers within this site.
<i class="fa fa-info-circle"></i>If this setting is enabled, Disco ICT will query all servers within the directory rather than only servers within this site.
</p>
</div>
</div>
@@ -369,7 +369,7 @@
@Html.CheckBoxFor(m => m.ADSearchWildcardSuffixOnly, ADSearchWildcardSuffixOnlyAttributes) @Html.LabelFor(m => m.ADSearchWildcardSuffixOnly) @AjaxHelpers.AjaxLoader()
<div class="info-box">
<p class="fa-p">
<i class="fa fa-info-circle"></i>If this setting is enabled, Disco will utilize Active Directory indexes to greatly improve search performance.
<i class="fa fa-info-circle"></i>If this setting is enabled, Disco ICT will utilize Active Directory indexes to greatly improve search performance.
If disabled, more results may be returned however performance will be reduced especially in large Active Directory domains.
</p>
</div>
@@ -74,8 +74,8 @@ WriteLiteral(">\r\n <table>\r\n <tr>\r\n <th");
WriteLiteral(" style=\"width: 135px\"");
WriteLiteral(">\r\n Disco Version:\r\n </th>\r\n <td>\r\n " +
" <div>\r\n <code>");
WriteLiteral(">\r\n Disco ICT Version:\r\n </th>\r\n <td>\r\n " +
" <div>\r\n <code>");
#line 26 "..\..\Areas\Config\Views\SystemConfig\Index.cshtml"
@@ -322,14 +322,14 @@ WriteLiteral(">");
#line hidden
WriteLiteral("</div>\r\n <a");
WriteAttribute("href", Tuple.Create(" href=\"", 4275), Tuple.Create("\"", 4319)
WriteAttribute("href", Tuple.Create(" href=\"", 4279), Tuple.Create("\"", 4323)
#line 111 "..\..\Areas\Config\Views\SystemConfig\Index.cshtml"
, Tuple.Create(Tuple.Create("", 4282), Tuple.Create<System.Object, System.Int32>(Model.UpdateLatestResponse.UrlLink
, Tuple.Create(Tuple.Create("", 4286), Tuple.Create<System.Object, System.Int32>(Model.UpdateLatestResponse.UrlLink
#line default
#line hidden
, 4282), false)
, 4286), false)
);
WriteLiteral(" target=\"_blank\"");
@@ -699,18 +699,18 @@ WriteLiteral(" <i");
WriteLiteral(" class=\"fa fa-exclamation warning fa-fw fa-lg\"");
WriteAttribute("title", Tuple.Create(" title=\"", 8706), Tuple.Create("\"", 8789)
, Tuple.Create(Tuple.Create("", 8714), Tuple.Create("Unavailable,", 8714), true)
, Tuple.Create(Tuple.Create(" ", 8726), Tuple.Create("will", 8727), true)
, Tuple.Create(Tuple.Create(" ", 8731), Tuple.Create("retry", 8732), true)
, Tuple.Create(Tuple.Create(" ", 8737), Tuple.Create("at", 8738), true)
WriteAttribute("title", Tuple.Create(" title=\"", 8710), Tuple.Create("\"", 8793)
, Tuple.Create(Tuple.Create("", 8718), Tuple.Create("Unavailable,", 8718), true)
, Tuple.Create(Tuple.Create(" ", 8730), Tuple.Create("will", 8731), true)
, Tuple.Create(Tuple.Create(" ", 8735), Tuple.Create("retry", 8736), true)
, Tuple.Create(Tuple.Create(" ", 8741), Tuple.Create("at", 8742), true)
#line 215 "..\..\Areas\Config\Views\SystemConfig\Index.cshtml"
, Tuple.Create(Tuple.Create(" ", 8740), Tuple.Create<System.Object, System.Int32>(server.AvailableWhen.Value.ToLongTimeString()
, Tuple.Create(Tuple.Create(" ", 8744), Tuple.Create<System.Object, System.Int32>(server.AvailableWhen.Value.ToLongTimeString()
#line default
#line hidden
, 8741), false)
, 8745), false)
);
WriteLiteral("></i>\r\n");
@@ -967,11 +967,11 @@ WriteLiteral(">\r\n <i");
WriteLiteral(" class=\"fa fa-exclamation-circle warning\"");
WriteLiteral("></i>Disco will not search the entire directory which consists of more than ");
WriteLiteral("></i>Disco ICT will not search the entire directory which consists of more than ");
#line 271 "..\..\Areas\Config\Views\SystemConfig\Index.cshtml"
Write(Disco.Services.Interop.ActiveDirectory.ActiveDirectory.MaxAllServerSearch);
Write(Disco.Services.Interop.ActiveDirectory.ActiveDirectory.MaxAllServerSearch);
#line default
@@ -1040,9 +1040,9 @@ WriteLiteral(">\r\n <i");
WriteLiteral(" class=\"fa fa-info-circle\"");
WriteLiteral("></i>If this setting is enabled, Disco will query all servers within the director" +
"y rather than only servers within this site.\r\n " +
" </p>\r\n </div>\r\n");
WriteLiteral("></i>If this setting is enabled, Disco ICT will query all servers within the dire" +
"ctory rather than only servers within this site.\r\n " +
" </p>\r\n </div>\r\n");
WriteLiteral(" <script>\r\n $(f" +
"unction () {\r\n document.DiscoFunctions.Pr" +
@@ -1108,9 +1108,9 @@ WriteLiteral(">\r\n <i");
WriteLiteral(" class=\"fa fa-info-circle\"");
WriteLiteral("></i>If this setting is enabled, Disco will query all servers within the director" +
"y rather than only servers within this site.\r\n </" +
"p>\r\n </div>\r\n </div>\r\n");
WriteLiteral("></i>If this setting is enabled, Disco ICT will query all servers within the dire" +
"ctory rather than only servers within this site.\r\n " +
" </p>\r\n </div>\r\n </div>\r\n");
#line 301 "..\..\Areas\Config\Views\SystemConfig\Index.cshtml"
@@ -1299,7 +1299,7 @@ WriteLiteral(">\r\n <i");
WriteLiteral(" class=\"fa fa-info-circle\"");
WriteLiteral(@"></i>If this setting is enabled, Disco will utilize Active Directory indexes to greatly improve search performance.
WriteLiteral(@"></i>If this setting is enabled, Disco ICT will utilize Active Directory indexes to greatly improve search performance.
If disabled, more results may be returned however performance will be reduced especially in large Active Directory domains.
</p>
</div>
@@ -2180,14 +2180,14 @@ WriteLiteral(" name=\"Recipient\"");
WriteLiteral(" type=\"text\"");
WriteAttribute("value", Tuple.Create(" value=\"", 34655), Tuple.Create("\"", 34688)
WriteAttribute("value", Tuple.Create(" value=\"", 34675), Tuple.Create("\"", 34708)
#line 748 "..\..\Areas\Config\Views\SystemConfig\Index.cshtml"
, Tuple.Create(Tuple.Create("", 34663), Tuple.Create<System.Object, System.Int32>(CurrentUser.EmailAddress
, Tuple.Create(Tuple.Create("", 34683), Tuple.Create<System.Object, System.Int32>(CurrentUser.EmailAddress
#line default
#line hidden
, 34663), false)
, 34683), false)
);
WriteLiteral(" />\r\n");
@@ -22,7 +22,7 @@
<div class="pageMenuArea MicrosoftNET">
<a href="http://www.microsoft.com/net/" target="_blank">Microsoft .NET Framework</a>
<div class="pageMenuBlurb">
The Microsoft .NET Framework is the hosting virtual machine most of Disco runs on.
The Microsoft .NET Framework is the hosting virtual machine most of Disco ICT runs on.
Most of Disco's components are written in <a href="http://msdn.microsoft.com/en-us/vstudio/hh388566.aspx"
target="_blank">C#</a>.
</div>
@@ -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.
@@ -26,7 +26,6 @@ namespace Disco.Web.Areas.Public.Views.Public
using System.Web.Security;
using System.Web.UI;
using System.Web.WebPages;
using Disco.BI.Extensions;
using Disco.Models.Repository;
using Disco.Services;
using Disco.Services.Authorization;
@@ -94,8 +93,8 @@ WriteLiteral(">Microsoft .NET Framework</a>\r\n <div");
WriteLiteral(" class=\"pageMenuBlurb\"");
WriteLiteral(">\r\n The Microsoft .NET Framework is the hosting virtual machin" +
"e most of Disco runs on.\r\n Most of Disco\'s components are wri" +
"tten in <a");
"e most of Disco ICT runs on.\r\n Most of Disco\'s components are" +
" written in <a");
WriteLiteral(" href=\"http://msdn.microsoft.com/en-us/vstudio/hh388566.aspx\"");
@@ -42,7 +42,7 @@ namespace Disco.Web.Areas.Services.Controllers
{
if (clientVersion < new Version(2, 2))
{
return new HttpStatusCodeResult(400, "Disco Client not compatible");
return new HttpStatusCodeResult(400, "Disco ICT Client not compatible");
}
}
}
@@ -115,7 +115,7 @@ namespace Disco.Web.Areas.Services.Controllers
{
if (clientVersion < new Version(2, 2))
{
return new HttpStatusCodeResult(400, "Disco Client not compatible");
return new HttpStatusCodeResult(400, "Disco ICT Client not compatible");
}
}
}
@@ -1070,7 +1070,7 @@ else {
self._uploadFilesInput.attr({
type: 'file',
multiple: 'multiple',
title: 'Disco File Uploading'
title: 'Disco ICT File Uploading'
})
.hide()
.change(function (e) {
File diff suppressed because one or more lines are too long
@@ -20,7 +20,7 @@
self._uploadFilesInput.attr({
type: 'file',
multiple: 'multiple',
title: 'Disco File Uploading'
title: 'Disco ICT File Uploading'
})
.hide()
.change(function (e) {
@@ -1,7 +1,7 @@
<!doctype html>
<html>
<head>
<title>Disco - Expressions Editor</title>
<title>Disco ICT - Expressions Editor</title>
<link href="ExpressionEditor.css" rel="stylesheet" type="text/css" />
</head>
<body>
+2 -2
View File
@@ -689,7 +689,7 @@ namespace Disco.Web.Controllers
}
model.JobDetailsSupported = false;
model.JobDetailsNotSupportedMessage = string.Format("Warranty Provider '{0}' is not integrated with Disco", job.JobMetaWarranty.ExternalName);
model.JobDetailsNotSupportedMessage = string.Format("Warranty Provider '{0}' is not integrated with Disco ICT", job.JobMetaWarranty.ExternalName);
return View(model);
}
else
@@ -871,7 +871,7 @@ namespace Disco.Web.Controllers
}
model.JobDetailsSupported = false;
model.JobDetailsNotSupportedMessage = string.Format("Repair Provider '{0}' is not integrated with Disco", job.JobMetaNonWarranty.RepairerName);
model.JobDetailsNotSupportedMessage = string.Format("Repair Provider '{0}' is not integrated with Disco ICT", job.JobMetaNonWarranty.RepairerName);
return View(model);
}
else
@@ -58,7 +58,7 @@ namespace Disco.Web.Models.InitialConfig
IntegratedSecurity = (this.AuthMethod.Equals("SSPI", StringComparison.OrdinalIgnoreCase)),
UserID = (this.AuthMethod.Equals("SQL", StringComparison.OrdinalIgnoreCase)) ? this.Auth_SQL_Username : string.Empty,
Password = (this.AuthMethod.Equals("SQL", StringComparison.OrdinalIgnoreCase)) ? this.Auth_SQL_Password : string.Empty,
ApplicationName = "Disco WebApp",
ApplicationName = "Disco ICT WebApp",
MultipleActiveResultSets = true,
Pooling = true
};
+3 -3
View File
@@ -107,7 +107,7 @@
</table>
<div id="Devices_Import_Documentation_DeviceModels_Dialog" class="dialog" title="Disco Device Model Ids">
<div id="Devices_Import_Documentation_DeviceModels_Dialog" class="dialog" title="Disco ICT Device Model Ids">
<table class="tableData">
<thead>
<tr>
@@ -131,7 +131,7 @@
</table>
</div>
<div id="Devices_Import_Documentation_DeviceProfiles_Dialog" class="dialog" title="Disco Device Profile Ids">
<div id="Devices_Import_Documentation_DeviceProfiles_Dialog" class="dialog" title="Disco ICT Device Profile Ids">
<table class="tableData">
<thead>
<tr>
@@ -155,7 +155,7 @@
</table>
</div>
<div id="Devices_Import_Documentation_DeviceBatches_Dialog" class="dialog" title="Disco Device Batch Ids">
<div id="Devices_Import_Documentation_DeviceBatches_Dialog" class="dialog" title="Disco ICT Device Batch Ids">
<table class="tableData">
<thead>
<tr>
+3 -3
View File
@@ -374,7 +374,7 @@ WriteLiteral(" id=\"Devices_Import_Documentation_DeviceModels_Dialog\"");
WriteLiteral(" class=\"dialog\"");
WriteLiteral(" title=\"Disco Device Model Ids\"");
WriteLiteral(" title=\"Disco ICT Device Model Ids\"");
WriteLiteral(">\r\n <table");
@@ -457,7 +457,7 @@ WriteLiteral(" id=\"Devices_Import_Documentation_DeviceProfiles_Dialog\"");
WriteLiteral(" class=\"dialog\"");
WriteLiteral(" title=\"Disco Device Profile Ids\"");
WriteLiteral(" title=\"Disco ICT Device Profile Ids\"");
WriteLiteral(">\r\n <table");
@@ -540,7 +540,7 @@ WriteLiteral(" id=\"Devices_Import_Documentation_DeviceBatches_Dialog\"");
WriteLiteral(" class=\"dialog\"");
WriteLiteral(" title=\"Disco Device Batch Ids\"");
WriteLiteral(" title=\"Disco ICT Device Batch Ids\"");
WriteLiteral(">\r\n <table");
@@ -2,11 +2,11 @@
@{
ViewBag.Title = null;
}
<h1>@CommonHelpers.Breadcrumbs(Html.ToBreadcrumb("Initial Configuration", MVC.InitialConfig.Index(), "Disco Administrators"))</h1>
<h1>@CommonHelpers.Breadcrumbs(Html.ToBreadcrumb("Initial Configuration", MVC.InitialConfig.Index(), "Disco ICT Administrators"))</h1>
<div id="initialConfig_Administrators">
<div class="form" style="width: 450px">
<div>
Disco Administrators have access to the entire Disco application.
Disco ICT Administrators have access to the entire Disco ICT application.
<code>Domain Admins</code> is a required member and is always included regardless of configuration.
</div>
<table>
@@ -43,7 +43,7 @@
<i class="fa fa-lg fa-cog fa-spin"></i>
Validating Configuration
</h2>
<div>Please wait while the Disco configuration is validated</div>
<div>Please wait while the Disco ICT configuration is validated</div>
</div>
@using (Html.BeginForm())
{
@@ -2,7 +2,7 @@
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
// Runtime Version:4.0.30319.0
// 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.Views.InitialConfig
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;
@@ -56,7 +55,7 @@ WriteLiteral("\r\n<h1>");
#line 5 "..\..\Views\InitialConfig\Administrators.cshtml"
Write(CommonHelpers.Breadcrumbs(Html.ToBreadcrumb("Initial Configuration", MVC.InitialConfig.Index(), "Disco Administrators")));
Write(CommonHelpers.Breadcrumbs(Html.ToBreadcrumb("Initial Configuration", MVC.InitialConfig.Index(), "Disco ICT Administrators")));
#line default
@@ -73,7 +72,7 @@ WriteLiteral(" style=\"width: 450px\"");
WriteLiteral(@">
<div>
Disco Administrators have access to the entire Disco application.
Disco ICT Administrators have access to the entire Disco ICT application.
<code>Domain Admins</code> is a required member and is always included regardless of configuration.
</div>
<table>
@@ -114,14 +113,14 @@ WriteLiteral(">\r\n");
#line hidden
WriteLiteral(" <li");
WriteAttribute("class", Tuple.Create(" class=\"", 1161), Tuple.Create("\"", 1201)
WriteAttribute("class", Tuple.Create(" class=\"", 1173), Tuple.Create("\"", 1213)
#line 21 "..\..\Views\InitialConfig\Administrators.cshtml"
, Tuple.Create(Tuple.Create("", 1169), Tuple.Create<System.Object, System.Int32>(sg.IsGroup ? "group" : "user"
, Tuple.Create(Tuple.Create("", 1181), Tuple.Create<System.Object, System.Int32>(sg.IsGroup ? "group" : "user"
#line default
#line hidden
, 1169), false)
, 1181), false)
);
WriteLiteral(" data-subjectid=\"");
@@ -246,7 +245,7 @@ WriteLiteral(">\r\n <h2>\r\n <i");
WriteLiteral(" class=\"fa fa-lg fa-cog fa-spin\"");
WriteLiteral("></i>\r\n Validating Configuration\r\n </h2>\r\n <div>Please wait while th" +
"e Disco configuration is validated</div>\r\n</div>\r\n");
"e Disco ICT configuration is validated</div>\r\n</div>\r\n");
#line 48 "..\..\Views\InitialConfig\Administrators.cshtml"
@@ -42,7 +42,7 @@
</tr>
<tr>
<td>
<h3><i class="fa @(Model.DiscoDnsTestResult.Item2 == null ? "fa-check-square success" : "fa-exclamation-circle error")"></i>&nbsp;Disco DNS Entry</h3>
<h3><i class="fa @(Model.DiscoDnsTestResult.Item2 == null ? "fa-check-square success" : "fa-exclamation-circle error")"></i>&nbsp;Disco ICT DNS Entry</h3>
<div class="testResult">
@{
if (Model.DiscoDnsTestResult.Item1 != null)
@@ -114,7 +114,7 @@
}
else
{
<text>There was an error establishing a connection to <a href="https://discoict.com.au" target="_blank">https://discoict.com.au</a>. This may be caused by missing proxy settings - after starting Disco check these settings in the 'System' configuration area.</text>
<text>There was an error establishing a connection to <a href="https://discoict.com.au" target="_blank">https://discoict.com.au</a>. This may be caused by missing proxy settings - after starting Disco ICT check these settings in the 'System' configuration area.</text>
<br />
<div class="exception">
@{var ex = Model.DiscoIctComAuWebResult;
@@ -138,9 +138,9 @@
</tr>
<tr>
<td>
<h3><i class="fa fa-info-circle information"></i>&nbsp;Unblock ICMP (Ping) for the Disco server</h3>
<h3><i class="fa fa-info-circle information"></i>&nbsp;Unblock ICMP (Ping) for the Disco ICT server</h3>
<div class="testResult">
The Disco Client Bootstrapper requires the Disco server to respond to ICMP Echo requests (Ping) to function correctly. Please ensure any firewall rules are updated accordingly.
The Disco ICT Client Bootstrapper requires the Disco server to respond to ICMP Echo requests (Ping) to function correctly. Please ensure any firewall rules are updated accordingly.
</div>
</td>
</tr>
@@ -158,7 +158,7 @@
@{
if (Model.LaunchAllowed)
{
<a href="@(Url.Action(MVC.InitialConfig.RestartWebApp()))" class="button">Start Disco</a>
<a href="@(Url.Action(MVC.InitialConfig.RestartWebApp()))" class="button">Start Disco ICT</a>
}
else
{
@@ -2,7 +2,7 @@
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
// Runtime Version:4.0.30319.0
// 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.Views.InitialConfig
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;
@@ -210,7 +209,7 @@ WriteAttribute("class", Tuple.Create(" class=\"", 2073), Tuple.Create("\"", 2185
, 2084), false)
);
WriteLiteral("></i>&nbsp;Disco DNS Entry</h3>\r\n <div");
WriteLiteral("></i>&nbsp;Disco ICT DNS Entry</h3>\r\n <div");
WriteLiteral(" class=\"testResult\"");
@@ -444,15 +443,15 @@ WriteLiteral("\r\n </div>\r\n");
WriteLiteral("\r\n </div>\r\n </td>\r\n </tr>\r\n " +
" <tr>\r\n <td>\r\n <h3><i");
WriteAttribute("class", Tuple.Create(" class=\"", 5012), Tuple.Create("\"", 5122)
, Tuple.Create(Tuple.Create("", 5020), Tuple.Create("fa", 5020), true)
WriteAttribute("class", Tuple.Create(" class=\"", 5016), Tuple.Create("\"", 5126)
, Tuple.Create(Tuple.Create("", 5024), Tuple.Create("fa", 5024), true)
#line 108 "..\..\Views\InitialConfig\Complete.cshtml"
, Tuple.Create(Tuple.Create(" ", 5022), Tuple.Create<System.Object, System.Int32>(Model.DiscoIctComAuWebResult == null ? "fa-check-square success" : "fa-exclamation-circle error"
, Tuple.Create(Tuple.Create(" ", 5026), Tuple.Create<System.Object, System.Int32>(Model.DiscoIctComAuWebResult == null ? "fa-check-square success" : "fa-exclamation-circle error"
#line default
#line hidden
, 5023), false)
, 5027), false)
);
WriteLiteral("></i>&nbsp;Connectivity to <a");
@@ -512,7 +511,7 @@ WriteLiteral(" href=\"https://discoict.com.au\"");
WriteLiteral(" target=\"_blank\"");
WriteLiteral(">https://discoict.com.au</a>. This may be caused by missing proxy settings - afte" +
"r starting Disco check these settings in the \'System\' configuration area.");
"r starting Disco ICT check these settings in the \'System\' configuration area.");
WriteLiteral("\r\n");
@@ -590,13 +589,13 @@ WriteLiteral("\r\n </div>\r\n </td>\r\n
WriteLiteral(" class=\"fa fa-info-circle information\"");
WriteLiteral("></i>&nbsp;Unblock ICMP (Ping) for the Disco server</h3>\r\n <di" +
"v");
WriteLiteral("></i>&nbsp;Unblock ICMP (Ping) for the Disco ICT server</h3>\r\n " +
" <div");
WriteLiteral(" class=\"testResult\"");
WriteLiteral(@">
The Disco Client Bootstrapper requires the Disco server to respond to ICMP Echo requests (Ping) to function correctly. Please ensure any firewall rules are updated accordingly.
The Disco ICT Client Bootstrapper requires the Disco server to respond to ICMP Echo requests (Ping) to function correctly. Please ensure any firewall rules are updated accordingly.
</div>
</td>
</tr>
@@ -635,19 +634,19 @@ WriteLiteral(">\r\n");
#line hidden
WriteLiteral(" <a");
WriteAttribute("href", Tuple.Create(" href=\"", 7927), Tuple.Create("\"", 7982)
WriteAttribute("href", Tuple.Create(" href=\"", 7943), Tuple.Create("\"", 7998)
#line 161 "..\..\Views\InitialConfig\Complete.cshtml"
, Tuple.Create(Tuple.Create("", 7934), Tuple.Create<System.Object, System.Int32>(Url.Action(MVC.InitialConfig.RestartWebApp())
, Tuple.Create(Tuple.Create("", 7950), Tuple.Create<System.Object, System.Int32>(Url.Action(MVC.InitialConfig.RestartWebApp())
#line default
#line hidden
, 7934), false)
, 7950), false)
);
WriteLiteral(" class=\"button\"");
WriteLiteral(">Start Disco</a>\r\n");
WriteLiteral(">Start Disco ICT</a>\r\n");
#line 162 "..\..\Views\InitialConfig\Complete.cshtml"
@@ -662,14 +661,14 @@ WriteLiteral(" <a");
WriteLiteral(" id=\"tryAgain\"");
WriteAttribute("href", Tuple.Create(" href=\"", 8092), Tuple.Create("\"", 8142)
WriteAttribute("href", Tuple.Create(" href=\"", 8112), Tuple.Create("\"", 8162)
#line 165 "..\..\Views\InitialConfig\Complete.cshtml"
, Tuple.Create(Tuple.Create("", 8099), Tuple.Create<System.Object, System.Int32>(Url.Action(MVC.InitialConfig.Complete())
, Tuple.Create(Tuple.Create("", 8119), Tuple.Create<System.Object, System.Int32>(Url.Action(MVC.InitialConfig.Complete())
#line default
#line hidden
, 8099), false)
, 8119), false)
);
WriteLiteral(" class=\"button\"");
@@ -72,7 +72,7 @@
<i class="fa fa-lg fa-cog fa-spin"></i>
Building and Validating Database
</h2>
<div>Please wait while the Disco database is created and/or validated</div>
<div>Please wait while the Disco ICT database is created and/or validated</div>
</div>
<script>
(function () {
@@ -2,7 +2,7 @@
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
// Runtime Version:4.0.30319.0
// 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.Views.InitialConfig
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;
@@ -293,28 +292,28 @@ WriteLiteral(">\r\n <h2>\r\n <i");
WriteLiteral(" class=\"fa fa-lg fa-cog fa-spin\"");
WriteLiteral("></i>\r\n Building and Validating Database\r\n </h2>\r\n <div>Please wait " +
"while the Disco database is created and/or validated</div>\r\n</div>\r\n<script>\r\n " +
" (function () {\r\n\r\n $(function () {\r\n var initialized = false" +
";\r\n\r\n $(\'#AuthMethod\').change(function () {\r\n $this = " +
"$(this);\r\n if ($this.val() === \'SQL\') {\r\n // E" +
"nable Validation\r\n $(\'#Auth_SQL_Username\').attr(\'data-val\', t" +
"rue).attr(\'data-val-required\', \'The Username is required\');\r\n " +
" $(\'#Auth_SQL_Password\').attr(\'data-val\', true).attr(\'data-val-required\', \'The P" +
"assword is required\');\r\n\r\n $(\'#auth_Sql\').slideDown();\r\n " +
" } else {\r\n $(\'#Auth_SQL_Username\').attr(\'data-val\'" +
", false);\r\n $(\'#Auth_SQL_Password\').attr(\'data-val\', false);\r" +
"\n\r\n $(\'#auth_Sql\').slideUp();\r\n }\r\n\r\n " +
" // Rebuild Validation\r\n if (initialized) {\r\n " +
" $.validator.unobtrusive.reparse(\'#auth_Sql\');\r\n }\r\n " +
" }).change();\r\n\r\n $(\'#dialogWait\').dialog({\r\n autoO" +
"pen: false,\r\n draggable: false,\r\n modal: true,\r\n " +
" resizable: false,\r\n width: 400,\r\n he" +
"ight: 150,\r\n closeOnEscape: false\r\n }).closest(\'.ui-di" +
"alog\').find(\'.ui-dialog-titlebar-close\').hide();\r\n\r\n $(\'#submitForm\')" +
".closest(\'form\').submit(function () {\r\n if ($(this).valid()) {\r\n " +
" $(\'#dialogWait\').dialog(\'open\');\r\n }\r\n " +
" return true;\r\n });\r\n\r\n initialized = true;\r\n " +
" });\r\n\r\n })();\r\n</script>\r\n");
"while the Disco ICT database is created and/or validated</div>\r\n</div>\r\n<script>" +
"\r\n (function () {\r\n\r\n $(function () {\r\n var initialized = f" +
"alse;\r\n\r\n $(\'#AuthMethod\').change(function () {\r\n $thi" +
"s = $(this);\r\n if ($this.val() === \'SQL\') {\r\n " +
"// Enable Validation\r\n $(\'#Auth_SQL_Username\').attr(\'data-val" +
"\', true).attr(\'data-val-required\', \'The Username is required\');\r\n " +
" $(\'#Auth_SQL_Password\').attr(\'data-val\', true).attr(\'data-val-required\', \'T" +
"he Password is required\');\r\n\r\n $(\'#auth_Sql\').slideDown();\r\n " +
" } else {\r\n $(\'#Auth_SQL_Username\').attr(\'data-" +
"val\', false);\r\n $(\'#Auth_SQL_Password\').attr(\'data-val\', fals" +
"e);\r\n\r\n $(\'#auth_Sql\').slideUp();\r\n }\r\n\r\n " +
" // Rebuild Validation\r\n if (initialized) {\r\n " +
" $.validator.unobtrusive.reparse(\'#auth_Sql\');\r\n }\r\n " +
" }).change();\r\n\r\n $(\'#dialogWait\').dialog({\r\n a" +
"utoOpen: false,\r\n draggable: false,\r\n modal: true," +
"\r\n resizable: false,\r\n width: 400,\r\n " +
" height: 150,\r\n closeOnEscape: false\r\n }).closest(\'.u" +
"i-dialog\').find(\'.ui-dialog-titlebar-close\').hide();\r\n\r\n $(\'#submitFo" +
"rm\').closest(\'form\').submit(function () {\r\n if ($(this).valid()) " +
"{\r\n $(\'#dialogWait\').dialog(\'open\');\r\n }\r\n " +
" return true;\r\n });\r\n\r\n initialized = true;\r\n " +
" });\r\n\r\n })();\r\n</script>\r\n");
}
}
@@ -42,7 +42,7 @@
<i class="fa fa-lg fa-cog fa-spin"></i>
Building and Validating File Store
</h2>
<div>Please wait while the Disco File Store is created and/or validated</div>
<div>Please wait while the Disco ICT File Store is created and/or validated</div>
</div>
<div id="dialogCreateDirectory" title="Create Directory" class="dialog">
<h2>Create Directory</h2>
@@ -2,7 +2,7 @@
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
// Runtime Version:4.0.30319.0
// 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.Views.InitialConfig
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;
@@ -186,7 +185,8 @@ WriteLiteral(">\r\n <h2>\r\n <i");
WriteLiteral(" class=\"fa fa-lg fa-cog fa-spin\"");
WriteLiteral("></i>\r\n Building and Validating File Store\r\n </h2>\r\n <div>Please wai" +
"t while the Disco File Store is created and/or validated</div>\r\n</div>\r\n<div");
"t while the Disco ICT File Store is created and/or validated</div>\r\n</div>\r\n<div" +
"");
WriteLiteral(" id=\"dialogCreateDirectory\"");
@@ -1,13 +1,13 @@
@{
ViewBag.Title = null;
}
<h1>@CommonHelpers.Breadcrumbs("Initial Configuration > Starting Disco")</h1>
<h1>@CommonHelpers.Breadcrumbs("Initial Configuration > Starting Disco ICT")</h1>
<div id="dialog" title="Please Wait" style="padding-top: 30px;">
<h2>
<i class="fa fa-lg fa-cog fa-spin"></i>
Starting Disco
Starting Disco ICT
</h2>
<div style="padding-left: 31px;">Please wait while the Disco environment is initialized</div>
<div style="padding-left: 31px;">Please wait while the Disco ICT environment is initialized</div>
</div>
<script>
(function () {
@@ -2,7 +2,7 @@
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
// Runtime Version:4.0.30319.0
// 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.Views.InitialConfig
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;
@@ -56,7 +55,7 @@ WriteLiteral("\r\n<h1>");
#line 4 "..\..\Views\InitialConfig\RestartWebApp.cshtml"
Write(CommonHelpers.Breadcrumbs("Initial Configuration > Starting Disco"));
Write(CommonHelpers.Breadcrumbs("Initial Configuration > Starting Disco ICT"));
#line default
@@ -73,11 +72,11 @@ WriteLiteral(">\r\n <h2>\r\n <i");
WriteLiteral(" class=\"fa fa-lg fa-cog fa-spin\"");
WriteLiteral("></i>\r\n Starting Disco\r\n </h2>\r\n <div");
WriteLiteral("></i>\r\n Starting Disco ICT\r\n </h2>\r\n <div");
WriteLiteral(" style=\"padding-left: 31px;\"");
WriteLiteral(@">Please wait while the Disco environment is initialized</div>
WriteLiteral(@">Please wait while the Disco ICT environment is initialized</div>
</div>
<script>
(function () {
+1 -1
View File
@@ -4,7 +4,7 @@
}
<h1>Welcome to Disco ICT Management!</h1>
<div id="initialConfig_Welcome">
<p>The installation is complete, but a few things need to be configured before Disco can be started.</p>
<p>The installation is complete, but a few things need to be configured before Disco ICT can be started.</p>
@using (Html.BeginForm())
{
<div class="form" style="width: 400px">
@@ -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.Views.InitialConfig
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;
@@ -57,7 +56,7 @@ WriteLiteral("\r\n<h1>Welcome to Disco ICT Management!</h1>\r\n<div");
WriteLiteral(" id=\"initialConfig_Welcome\"");
WriteLiteral(">\r\n <p>The installation is complete, but a few things need to be configured be" +
"fore Disco can be started.</p>\r\n");
"fore Disco ICT can be started.</p>\r\n");
#line 8 "..\..\Views\InitialConfig\Welcome.cshtml"
+1 -1
View File
@@ -4,5 +4,5 @@
Html.BundleDeferred("~/Style/Config");
}
<h1>Disco Post-Update Configuration</h1>
<h1>Disco ICT Post-Update Configuration</h1>
@Html.PartialCompiled(typeof(Disco.Web.Areas.Config.Views.Shared.TaskStatus), Model.SessionId)
+2 -3
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.Views.Update
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;
@@ -54,7 +53,7 @@ namespace Disco.Web.Views.Update
#line default
#line hidden
WriteLiteral("\r\n<h1>Disco Post-Update Configuration</h1>\r\n");
WriteLiteral("\r\n<h1>Disco ICT Post-Update Configuration</h1>\r\n");
#line 8 "..\..\Views\Update\Index.cshtml"