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

fixup Disco -> Disco ICT

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files
Disco.Web/Views/InitialConfig/Administrators.cshtml
+3 -3
View File
@@ -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())
{
Disco.Web/Views/InitialConfig/Administrators.generated.cs
+7 -8
View File
@@ -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"
Disco.Web/Views/InitialConfig/Complete.cshtml
+5 -5
View File
@@ -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
{
Disco.Web/Views/InitialConfig/Complete.generated.cs
+17 -18
View File
@@ -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\"");
Disco.Web/Views/InitialConfig/Database.cshtml
+1 -1
View File
@@ -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 () {
Disco.Web/Views/InitialConfig/Database.generated.cs
+23 -24
View File
@@ -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");
}
}
Disco.Web/Views/InitialConfig/FileStore.cshtml
+1 -1
View File
@@ -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>
Disco.Web/Views/InitialConfig/FileStore.generated.cs
+3 -3
View File
@@ -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\"");
Disco.Web/Views/InitialConfig/RestartWebApp.cshtml
+3 -3
View File
@@ -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 () {
Disco.Web/Views/InitialConfig/RestartWebApp.generated.cs
+4 -5
View File
@@ -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 () {
Disco.Web/Views/InitialConfig/Welcome.cshtml
+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">
Disco.Web/Views/InitialConfig/Welcome.generated.cs
+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.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"