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

Initial config CSS animation

Browse Source 
Uses CSS animation instead of GIF; GIF animation stops when browser
navigation begins, CSS continues.
This commit is contained in:
Gary Sharp
2015-05-26 21:01:46 +07:00
parent b070283270
commit ad5aea6df2
10 changed files with 96 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Disco.Web/Views/InitialConfig/Administrators.cshtml
+4 -1
View File
@@ -39,7 +39,10 @@
</div> </div>
</div> </div>
<div id="dialogWait" title="Please Wait" class="dialog"> <div id="dialogWait" title="Please Wait" class="dialog">
<h2><span class="ajaxLoading"></span>Validating Configuration</h2> <h2>
<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 configuration is validated</div>
</div> </div>
@using (Html.BeginForm()) @using (Html.BeginForm())
Disco.Web/Views/InitialConfig/Administrators.generated.cs
+9 -9
View File
@@ -2,7 +2,7 @@
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
// <auto-generated> // <auto-generated>
// This code was generated by a tool. // This code was generated by a tool.
// Runtime Version:4.0.30319.34014 // Runtime Version:4.0.30319.0
// //
// Changes to this file may cause incorrect behavior and will be lost if // Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated. // the code is regenerated.
@@ -241,15 +241,15 @@ WriteLiteral(" title=\"Please Wait\"");
WriteLiteral(" class=\"dialog\""); WriteLiteral(" class=\"dialog\"");
WriteLiteral(">\r\n <h2><span"); WriteLiteral(">\r\n <h2>\r\n <i");
WriteLiteral(" class=\"ajaxLoading\""); WriteLiteral(" class=\"fa fa-lg fa-cog fa-spin\"");
WriteLiteral("></span>Validating Configuration</h2>\r\n <div>Please wait while the Disco confi" + WriteLiteral("></i>\r\n Validating Configuration\r\n </h2>\r\n <div>Please wait while th" +
"guration is validated</div>\r\n</div>\r\n"); "e Disco configuration is validated</div>\r\n</div>\r\n");
#line 45 "..\..\Views\InitialConfig\Administrators.cshtml" #line 48 "..\..\Views\InitialConfig\Administrators.cshtml"
using (Html.BeginForm()) using (Html.BeginForm())
{ {
@@ -273,7 +273,7 @@ WriteLiteral(" value=\"Continue\"");
WriteLiteral(" />\r\n </div>\r\n"); WriteLiteral(" />\r\n </div>\r\n");
#line 50 "..\..\Views\InitialConfig\Administrators.cshtml" #line 53 "..\..\Views\InitialConfig\Administrators.cshtml"
} }
@@ -304,7 +304,7 @@ WriteLiteral(@"<script>
url: '"); url: '");
#line 73 "..\..\Views\InitialConfig\Administrators.cshtml" #line 76 "..\..\Views\InitialConfig\Administrators.cshtml"
Write(Url.Action(MVC.InitialConfig.AdministratorsSubject())); Write(Url.Action(MVC.InitialConfig.AdministratorsSubject()));
@@ -340,7 +340,7 @@ WriteLiteral("\',\r\n method: \'post\',\r\n data:
"earch Subjects\')\r\n .autocomplete({\r\n source: \'"); "earch Subjects\')\r\n .autocomplete({\r\n source: \'");
#line 130 "..\..\Views\InitialConfig\Administrators.cshtml" #line 133 "..\..\Views\InitialConfig\Administrators.cshtml"
Write(Url.Action(MVC.InitialConfig.AdministratorsSearch())); Write(Url.Action(MVC.InitialConfig.AdministratorsSearch()));
Disco.Web/Views/InitialConfig/Complete.cshtml
+4 -1
View File
@@ -168,7 +168,10 @@
</div> </div>
</div> </div>
<div id="dialogWait" title="Please Wait"> <div id="dialogWait" title="Please Wait">
<h2><span class="ajaxLoading"></span>Re-running Verification Tests</h2> <h2>
<i class="fa fa-lg fa-cog fa-spin"></i>
Re-running Verification Tests
</h2>
<div>Please wait while the verification tests are performed.</div> <div>Please wait while the verification tests are performed.</div>
</div> </div>
<script> <script>
Disco.Web/Views/InitialConfig/Complete.generated.cs
+6 -4
View File
@@ -2,7 +2,7 @@
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
// <auto-generated> // <auto-generated>
// This code was generated by a tool. // This code was generated by a tool.
// Runtime Version:4.0.30319.34014 // Runtime Version:4.0.30319.0
// //
// Changes to this file may cause incorrect behavior and will be lost if // Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated. // the code is regenerated.
@@ -689,11 +689,13 @@ WriteLiteral(" id=\"dialogWait\"");
WriteLiteral(" title=\"Please Wait\""); WriteLiteral(" title=\"Please Wait\"");
WriteLiteral(">\r\n <h2><span"); WriteLiteral(">\r\n <h2>\r\n <i");
WriteLiteral(" class=\"ajaxLoading\""); WriteLiteral(" class=\"fa fa-lg fa-cog fa-spin\"");
WriteLiteral(@"></span>Re-running Verification Tests</h2> WriteLiteral(@"></i>
Re-running Verification Tests
</h2>
<div>Please wait while the verification tests are performed.</div> <div>Please wait while the verification tests are performed.</div>
</div> </div>
<script> <script>
Disco.Web/Views/InitialConfig/Database.cshtml
+11 -5
View File
@@ -6,12 +6,13 @@
@using (Html.BeginForm()) @using (Html.BeginForm())
{ {
@Html.ValidationSummary(true) @Html.ValidationSummary(true)
<div class="form" style="width: 650px"> <div class="form" style="width: 650px">
<h2>SQL Server Connection</h2> <h2>SQL Server Connection</h2>
<table> <table>
<tr> <tr>
<th style="width: 150px;">Server: <th style="width: 150px;">
Server:
</th> </th>
<td> <td>
@Html.EditorFor(m => m.Server) @Html.ValidationMessageFor(m => m.Server) @Html.EditorFor(m => m.Server) @Html.ValidationMessageFor(m => m.Server)
@@ -22,7 +23,8 @@
</td> </td>
</tr> </tr>
<tr> <tr>
<th>Database Name: <th>
Database Name:
</th> </th>
<td> <td>
@Html.EditorFor(m => m.DatabaseName) @Html.ValidationMessageFor(m => m.DatabaseName) @Html.EditorFor(m => m.DatabaseName) @Html.ValidationMessageFor(m => m.DatabaseName)
@@ -32,7 +34,8 @@
</td> </td>
</tr> </tr>
<tr> <tr>
<th>Authentication Method: <th>
Authentication Method:
</th> </th>
<td> <td>
@Html.DropDownListFor(m => m.AuthMethod, Model.AuthMethods) @Html.ValidationMessageFor(m => m.AuthMethod) @Html.DropDownListFor(m => m.AuthMethod, Model.AuthMethods) @Html.ValidationMessageFor(m => m.AuthMethod)
@@ -65,7 +68,10 @@
</div> </div>
} }
<div id="dialogWait" title="Please Wait"> <div id="dialogWait" title="Please Wait">
<h2><span class="ajaxLoading"></span>Building and Validating Database</h2> <h2>
<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 database is created and/or validated</div>
</div> </div>
<script> <script>
Disco.Web/Views/InitialConfig/Database.generated.cs
+43 -42
View File
@@ -2,7 +2,7 @@
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
// <auto-generated> // <auto-generated>
// This code was generated by a tool. // This code was generated by a tool.
// Runtime Version:4.0.30319.34014 // Runtime Version:4.0.30319.0
// //
// Changes to this file may cause incorrect behavior and will be lost if // Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated. // the code is regenerated.
@@ -81,7 +81,7 @@ Write(Html.ValidationSummary(true));
#line 8 "..\..\Views\InitialConfig\Database.cshtml" #line 8 "..\..\Views\InitialConfig\Database.cshtml"
#line default #line default
@@ -97,12 +97,12 @@ WriteLiteral(">\r\n <h2>SQL Server Connection</h2>\r\n <table>\r\n
WriteLiteral(" style=\"width: 150px;\""); WriteLiteral(" style=\"width: 150px;\"");
WriteLiteral(">Server:\r\n </th>\r\n <td>\r\n"); WriteLiteral(">\r\n Server:\r\n </th>\r\n <td>\r\n");
WriteLiteral(" "); WriteLiteral(" ");
#line 17 "..\..\Views\InitialConfig\Database.cshtml" #line 18 "..\..\Views\InitialConfig\Database.cshtml"
Write(Html.EditorFor(m => m.Server)); Write(Html.EditorFor(m => m.Server));
@@ -111,7 +111,7 @@ WriteLiteral(" ");
WriteLiteral(" "); WriteLiteral(" ");
#line 17 "..\..\Views\InitialConfig\Database.cshtml" #line 18 "..\..\Views\InitialConfig\Database.cshtml"
Write(Html.ValidationMessageFor(m => m.Server)); Write(Html.ValidationMessageFor(m => m.Server));
@@ -127,13 +127,13 @@ WriteLiteral(">\r\n If the default instance of SQL Server
WriteLiteral(" class=\"code\""); WriteLiteral(" class=\"code\"");
WriteLiteral(">\"SERVER_NAME\\INSTANCE_NAME\"</span>\r\n </div>\r\n " + WriteLiteral(">\"SERVER_NAME\\INSTANCE_NAME\"</span>\r\n </div>\r\n " +
"</td>\r\n </tr>\r\n <tr>\r\n <th>Database Name:\r\n" + "</td>\r\n </tr>\r\n <tr>\r\n <th>\r\n " +
" </th>\r\n <td>\r\n"); " Database Name:\r\n </th>\r\n <td>\r\n");
WriteLiteral(" "); WriteLiteral(" ");
#line 28 "..\..\Views\InitialConfig\Database.cshtml" #line 30 "..\..\Views\InitialConfig\Database.cshtml"
Write(Html.EditorFor(m => m.DatabaseName)); Write(Html.EditorFor(m => m.DatabaseName));
@@ -142,7 +142,7 @@ WriteLiteral(" ");
WriteLiteral(" "); WriteLiteral(" ");
#line 28 "..\..\Views\InitialConfig\Database.cshtml" #line 30 "..\..\Views\InitialConfig\Database.cshtml"
Write(Html.ValidationMessageFor(m => m.DatabaseName)); Write(Html.ValidationMessageFor(m => m.DatabaseName));
@@ -158,7 +158,8 @@ WriteLiteral(@">
</td> </td>
</tr> </tr>
<tr> <tr>
<th>Authentication Method: <th>
Authentication Method:
</th> </th>
<td> <td>
"); ");
@@ -166,7 +167,7 @@ WriteLiteral(@">
WriteLiteral(" "); WriteLiteral(" ");
#line 38 "..\..\Views\InitialConfig\Database.cshtml" #line 41 "..\..\Views\InitialConfig\Database.cshtml"
Write(Html.DropDownListFor(m => m.AuthMethod, Model.AuthMethods)); Write(Html.DropDownListFor(m => m.AuthMethod, Model.AuthMethods));
@@ -175,7 +176,7 @@ WriteLiteral(" ");
WriteLiteral(" "); WriteLiteral(" ");
#line 38 "..\..\Views\InitialConfig\Database.cshtml" #line 41 "..\..\Views\InitialConfig\Database.cshtml"
Write(Html.ValidationMessageFor(m => m.AuthMethod)); Write(Html.ValidationMessageFor(m => m.AuthMethod));
@@ -219,7 +220,7 @@ WriteLiteral(">\r\n <tr>\r\n
":</th>\r\n <td>"); ":</th>\r\n <td>");
#line 51 "..\..\Views\InitialConfig\Database.cshtml" #line 54 "..\..\Views\InitialConfig\Database.cshtml"
Write(Html.EditorFor(m => m.Auth_SQL_Username)); Write(Html.EditorFor(m => m.Auth_SQL_Username));
@@ -228,7 +229,7 @@ WriteLiteral(">\r\n <tr>\r\n
WriteLiteral(" "); WriteLiteral(" ");
#line 51 "..\..\Views\InitialConfig\Database.cshtml" #line 54 "..\..\Views\InitialConfig\Database.cshtml"
Write(Html.ValidationMessageFor(m => m.Auth_SQL_Username)); Write(Html.ValidationMessageFor(m => m.Auth_SQL_Username));
@@ -239,7 +240,7 @@ WriteLiteral("</td>\r\n </tr>\r\n
"td>"); "td>");
#line 55 "..\..\Views\InitialConfig\Database.cshtml" #line 58 "..\..\Views\InitialConfig\Database.cshtml"
Write(Html.EditorFor(m => m.Auth_SQL_Password)); Write(Html.EditorFor(m => m.Auth_SQL_Password));
@@ -248,7 +249,7 @@ WriteLiteral("</td>\r\n </tr>\r\n
WriteLiteral(" "); WriteLiteral(" ");
#line 55 "..\..\Views\InitialConfig\Database.cshtml" #line 58 "..\..\Views\InitialConfig\Database.cshtml"
Write(Html.ValidationMessageFor(m => m.Auth_SQL_Password)); Write(Html.ValidationMessageFor(m => m.Auth_SQL_Password));
@@ -275,7 +276,7 @@ WriteLiteral(" value=\"Continue\"");
WriteLiteral(" />\r\n </div>\r\n"); WriteLiteral(" />\r\n </div>\r\n");
#line 66 "..\..\Views\InitialConfig\Database.cshtml" #line 69 "..\..\Views\InitialConfig\Database.cshtml"
} }
@@ -287,33 +288,33 @@ WriteLiteral(" id=\"dialogWait\"");
WriteLiteral(" title=\"Please Wait\""); WriteLiteral(" title=\"Please Wait\"");
WriteLiteral(">\r\n <h2><span"); WriteLiteral(">\r\n <h2>\r\n <i");
WriteLiteral(" class=\"ajaxLoading\""); WriteLiteral(" class=\"fa fa-lg fa-cog fa-spin\"");
WriteLiteral("></span>Building and Validating Database</h2>\r\n <div>Please wait while the Dis" + WriteLiteral("></i>\r\n Building and Validating Database\r\n </h2>\r\n <div>Please wait " +
"co database is created and/or validated</div>\r\n</div>\r\n<script>\r\n (function (" + "while the Disco database is created and/or validated</div>\r\n</div>\r\n<script>\r\n " +
") {\r\n\r\n $(function () {\r\n var initialized = false;\r\n\r\n " + " (function () {\r\n\r\n $(function () {\r\n var initialized = false" +
" $(\'#AuthMethod\').change(function () {\r\n $this = $(this);\r\n " + ";\r\n\r\n $(\'#AuthMethod\').change(function () {\r\n $this = " +
" if ($this.val() === \'SQL\') {\r\n // Enable Validat" + "$(this);\r\n if ($this.val() === \'SQL\') {\r\n // E" +
"ion\r\n $(\'#Auth_SQL_Username\').attr(\'data-val\', true).attr(\'da" + "nable Validation\r\n $(\'#Auth_SQL_Username\').attr(\'data-val\', t" +
"ta-val-required\', \'The Username is required\');\r\n $(\'#Auth_SQL" + "rue).attr(\'data-val-required\', \'The Username is required\');\r\n " +
"_Password\').attr(\'data-val\', true).attr(\'data-val-required\', \'The Password is re" + " $(\'#Auth_SQL_Password\').attr(\'data-val\', true).attr(\'data-val-required\', \'The P" +
"quired\');\r\n\r\n $(\'#auth_Sql\').slideDown();\r\n } " + "assword is required\');\r\n\r\n $(\'#auth_Sql\').slideDown();\r\n " +
"else {\r\n $(\'#Auth_SQL_Username\').attr(\'data-val\', false);\r\n " + " } else {\r\n $(\'#Auth_SQL_Username\').attr(\'data-val\'" +
" $(\'#Auth_SQL_Password\').attr(\'data-val\', false);\r\n\r\n " + ", false);\r\n $(\'#Auth_SQL_Password\').attr(\'data-val\', false);\r" +
" $(\'#auth_Sql\').slideUp();\r\n }\r\n\r\n // Reb" + "\n\r\n $(\'#auth_Sql\').slideUp();\r\n }\r\n\r\n " +
"uild Validation\r\n if (initialized) {\r\n $.valid" + " // Rebuild Validation\r\n if (initialized) {\r\n " +
"ator.unobtrusive.reparse(\'#auth_Sql\');\r\n }\r\n }).change" + " $.validator.unobtrusive.reparse(\'#auth_Sql\');\r\n }\r\n " +
"();\r\n\r\n $(\'#dialogWait\').dialog({\r\n autoOpen: false,\r\n" + " }).change();\r\n\r\n $(\'#dialogWait\').dialog({\r\n autoO" +
" draggable: false,\r\n modal: true,\r\n " + "pen: false,\r\n draggable: false,\r\n modal: true,\r\n " +
" resizable: false,\r\n width: 400,\r\n height: 150,\r\n " + " resizable: false,\r\n width: 400,\r\n he" +
" closeOnEscape: false\r\n }).closest(\'.ui-dialog\').find(\'" + "ight: 150,\r\n closeOnEscape: false\r\n }).closest(\'.ui-di" +
".ui-dialog-titlebar-close\').hide();\r\n\r\n $(\'#submitForm\').closest(\'for" + "alog\').find(\'.ui-dialog-titlebar-close\').hide();\r\n\r\n $(\'#submitForm\')" +
"m\').submit(function () {\r\n if ($(this).valid()) {\r\n " + ".closest(\'form\').submit(function () {\r\n if ($(this).valid()) {\r\n " +
" $(\'#dialogWait\').dialog(\'open\');\r\n }\r\n retur" + " $(\'#dialogWait\').dialog(\'open\');\r\n }\r\n " +
"n true;\r\n });\r\n\r\n initialized = true;\r\n });\r\n\r\n " + " return true;\r\n });\r\n\r\n initialized = true;\r\n " +
"})();\r\n</script>\r\n"); " });\r\n\r\n })();\r\n</script>\r\n");
} }
} }
Disco.Web/Views/InitialConfig/FileStore.cshtml
+4 -1
View File
@@ -38,7 +38,10 @@
} }
</div> </div>
<div id="dialogWait" title="Please Wait" class="dialog"> <div id="dialogWait" title="Please Wait" class="dialog">
<h2><span class="ajaxLoading"></span>Building and Validating File Store</h2> <h2>
<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 File Store is created and/or validated</div>
</div> </div>
<div id="dialogCreateDirectory" title="Create Directory" class="dialog"> <div id="dialogCreateDirectory" title="Create Directory" class="dialog">
Disco.Web/Views/InitialConfig/FileStore.generated.cs
+7 -7
View File
@@ -2,7 +2,7 @@
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
// <auto-generated> // <auto-generated>
// This code was generated by a tool. // This code was generated by a tool.
// Runtime Version:4.0.30319.34014 // Runtime Version:4.0.30319.0
// //
// Changes to this file may cause incorrect behavior and will be lost if // Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated. // the code is regenerated.
@@ -181,12 +181,12 @@ WriteLiteral(" title=\"Please Wait\"");
WriteLiteral(" class=\"dialog\""); WriteLiteral(" class=\"dialog\"");
WriteLiteral(">\r\n <h2><span"); WriteLiteral(">\r\n <h2>\r\n <i");
WriteLiteral(" class=\"ajaxLoading\""); WriteLiteral(" class=\"fa fa-lg fa-cog fa-spin\"");
WriteLiteral("></span>Building and Validating File Store</h2>\r\n <div>Please wait while the D" + WriteLiteral("></i>\r\n Building and Validating File Store\r\n </h2>\r\n <div>Please wai" +
"isco File Store is created and/or validated</div>\r\n</div>\r\n<div"); "t while the Disco File Store is created and/or validated</div>\r\n</div>\r\n<div");
WriteLiteral(" id=\"dialogCreateDirectory\""); WriteLiteral(" id=\"dialogCreateDirectory\"");
@@ -211,7 +211,7 @@ WriteLiteral("></span></div>\r\n</div>\r\n<script>\r\n (function () {\r\n
" var fileSystemBranchUrl = \'"); " var fileSystemBranchUrl = \'");
#line 54 "..\..\Views\InitialConfig\FileStore.cshtml" #line 57 "..\..\Views\InitialConfig\FileStore.cshtml"
Write(Url.Action(MVC.InitialConfig.FileStoreBranch())); Write(Url.Action(MVC.InitialConfig.FileStoreBranch()));
@@ -220,7 +220,7 @@ WriteLiteral("></span></div>\r\n</div>\r\n<script>\r\n (function () {\r\n
WriteLiteral("\';\r\n var rootNodes = processNode("); WriteLiteral("\';\r\n var rootNodes = processNode(");
#line 55 "..\..\Views\InitialConfig\FileStore.cshtml" #line 58 "..\..\Views\InitialConfig\FileStore.cshtml"
Write(new HtmlString(Json.Encode(Model.DirectoryModel))); Write(new HtmlString(Json.Encode(Model.DirectoryModel)));
Disco.Web/Views/InitialConfig/RestartWebApp.cshtml
+4 -1
View File
@@ -3,7 +3,10 @@
} }
<h1>@CommonHelpers.Breadcrumbs("Initial Configuration > Starting Disco")</h1> <h1>@CommonHelpers.Breadcrumbs("Initial Configuration > Starting Disco")</h1>
<div id="dialog" title="Please Wait" style="padding-top: 30px;"> <div id="dialog" title="Please Wait" style="padding-top: 30px;">
<h2><span class="ajaxLoading" style="margin-right: 15px;"></span>Starting Disco</h2> <h2>
<i class="fa fa-lg fa-cog fa-spin"></i>
Starting Disco
</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 environment is initialized</div>
</div> </div>
<script> <script>
Disco.Web/Views/InitialConfig/RestartWebApp.generated.cs
+4 -6
View File
@@ -2,7 +2,7 @@
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
// <auto-generated> // <auto-generated>
// This code was generated by a tool. // This code was generated by a tool.
// Runtime Version:4.0.30319.34014 // Runtime Version:4.0.30319.0
// //
// Changes to this file may cause incorrect behavior and will be lost if // Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated. // the code is regenerated.
@@ -69,13 +69,11 @@ WriteLiteral(" title=\"Please Wait\"");
WriteLiteral(" style=\"padding-top: 30px;\""); WriteLiteral(" style=\"padding-top: 30px;\"");
WriteLiteral(">\r\n <h2><span"); WriteLiteral(">\r\n <h2>\r\n <i");
WriteLiteral(" class=\"ajaxLoading\""); WriteLiteral(" class=\"fa fa-lg fa-cog fa-spin\"");
WriteLiteral(" style=\"margin-right: 15px;\""); WriteLiteral("></i>\r\n Starting Disco\r\n </h2>\r\n <div");
WriteLiteral("></span>Starting Disco</h2>\r\n <div");
WriteLiteral(" style=\"padding-left: 31px;\""); WriteLiteral(" style=\"padding-left: 31px;\"");