From a6d1786e00e29e7329eb8b895920756318de2e6f Mon Sep 17 00:00:00 2001
From: Dave Reed <dareed@microsoft.com>
Date: Thu, 2 Dec 2010 15:17:46 -0800
Subject: [PATCH] #16899: Added a simple js 'loading' indicator to setup.

--HG--
branch : dev
---
 .../Orchard.Setup/Content/synchronizing.gif   | Bin 0 -> 1178 bytes
 .../Orchard.Setup/Orchard.Setup.csproj        |  16 ++++++++--
 .../Modules/Orchard.Setup/Scripts/setup.js    |  15 +++++++++-
 .../Orchard.Setup/Views/Setup/Index.cshtml    |  16 +++++++++-
 .../Themes/SafeMode/Styles/site.css           |  28 ++++++++++++++++++
 5 files changed, 70 insertions(+), 5 deletions(-)
 create mode 100644 src/Orchard.Web/Modules/Orchard.Setup/Content/synchronizing.gif

diff --git a/src/Orchard.Web/Modules/Orchard.Setup/Content/synchronizing.gif b/src/Orchard.Web/Modules/Orchard.Setup/Content/synchronizing.gif
new file mode 100644
index 0000000000000000000000000000000000000000..9fb3552b7c1e238a303f64034b738a70e598edee
GIT binary patch
literal 1178
zcmZ?wbhEHb3}Ikn*v!DtH>v*Mk)8KGEm?ayEVEgwdWO;Zvr+SRhaS9Le(XX0j*BIG
zuT@Xp=-jo;zGc33{~8Cy|J;7AA;Hd$0j@@R2F#2M3=E1tSy;G$v<?t6fQ)5esW&*`
zxq7d~>$B^BbSg@nVDDR^*^->OX;JkytvUNv?0KdpP}AM~VL<?EyX)n^87zFA$I^p0
zv}i32Tyn}hL1bU+@q|09?I%+=%y<*J`1bv;5_M^_pT7KY`?|spPQHxV`o@&zy4K|O
zhNk+Sw!Tj0?nzU68D`9!HG9t7dGi-6Tr^h@;U-1~Mus2;7NDDw0z4-6m}Xq+F5P?c
zOXNb6GNtgm1<SJz6`g5cbaIRB!_9ghw@T~okp7kAmY8QGVZe3a(BhjlZp%ZoMWTDX
zR{H6i*RW>qk2I{fps<6Jui&@r@^g2;K9kj}|NOSDGN-Y&qzJpU0-c(ZcDe<1e|<7N
zJW<lLOf4dB$%-zJwMnP8_&(fhhiq+z5y;w?JzguD(@VUrI_<owd#(Cy)WMs^WngP_
zFs+TiZtVpHM^~eWu-PErmMXC(sfy<<PoH#Zo6Hx%@Z#EF%e~yTv)8B{5v+H75@?XY
zC()Ym@L`SD^3WAiUR`n9>8ro3nl*a+&7x9}wS8H?Wy{fg>xaWy36)hIK|$T0*Ue3f
zy=l^>7GAfcd|JDap1bV%Z@Cw@?RmbBYrU8VPpOl_y6+Me>^)6eE&u~L^m*v4R=<`0
z`eu7rqxat}DhFE&4CMNAcT1lm1u`ycJ(^oYGtuJK%Y99Ox6b8nhVfhXM(>r@|1Qi@
zY7ze_K*NUZ0wdPAo$=s<8Ari3YrXz`k8`bU`S%|F$y`@jTU}g%)whWTGczaba6*e)
zFZUXaCranP`X+DN6TkO{zrc}?C6@7<4%G0>V`kgT+3Uycx1wZLZQjaT+1F34t=sra
zv+=<Svum%-zVJ@Be_3cgXYKm$pNp%@m@8PY+Zv$a%qxTuwWk&3y~NL#mYufTc6pm*
zfchKGI=7S!2Xw%m1*NF-FSg8V&6{~w`}(i7SsPQ-65nnxyOv`<=R)7UhovuU^X5Ni
zuP!O7XvSr0N6IQkjF<(b<DgSp=AvYucgHj=xceJRu*K};18NrgdbdgI)%!or-7Rwd
Q8vl>t^3syZ7C{DU0HB-iG5`Po

literal 0
HcmV?d00001

diff --git a/src/Orchard.Web/Modules/Orchard.Setup/Orchard.Setup.csproj b/src/Orchard.Web/Modules/Orchard.Setup/Orchard.Setup.csproj
index 3c67c661a..9a3f09c68 100644
--- a/src/Orchard.Web/Modules/Orchard.Setup/Orchard.Setup.csproj
+++ b/src/Orchard.Web/Modules/Orchard.Setup/Orchard.Setup.csproj
@@ -74,9 +74,9 @@
     <Compile Include="ViewModels\SetupViewModel.cs" />
   </ItemGroup>
   <ItemGroup>
-    <Content Include="Views\Setup\Index.cshtml">
-      <SubType>Designer</SubType>
-    </Content>
+    <Content Include="Content\synchronizing.gif" />
+    <Content Include="Scripts\setup.js" />
+    <Content Include="Views\Setup\Index.cshtml" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\..\Orchard\Orchard.Framework.csproj">
@@ -100,6 +100,16 @@
     <Content Include="Module.txt" />
     <Content Include="Views\Web.config" />
   </ItemGroup>
+  <ItemGroup>
+    <Content Include="Content\Web.config">
+      <SubType>Designer</SubType>
+    </Content>
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="Scripts\Web.config">
+      <SubType>Designer</SubType>
+    </Content>
+  </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v10.0\WebApplications\Microsoft.WebApplication.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
diff --git a/src/Orchard.Web/Modules/Orchard.Setup/Scripts/setup.js b/src/Orchard.Web/Modules/Orchard.Setup/Scripts/setup.js
index a9c59453d..c434af37b 100644
--- a/src/Orchard.Web/Modules/Orchard.Setup/Scripts/setup.js
+++ b/src/Orchard.Web/Modules/Orchard.Setup/Scripts/setup.js
@@ -1 +1,14 @@
-$("#SiteName").closest("form").helpfullyFocus();
\ No newline at end of file
+(function () {
+    function show() {
+        window.setTimeout(function () {
+            document.getElementById("throbber").style.display = "block";
+        }, 2000);
+    }
+
+    if (document.addEventListener) {
+        document.addEventListener("submit", show, false);
+    }
+    else {
+        document.attachEvent("onsubmit", show);
+    }
+})();
diff --git a/src/Orchard.Web/Modules/Orchard.Setup/Views/Setup/Index.cshtml b/src/Orchard.Web/Modules/Orchard.Setup/Views/Setup/Index.cshtml
index 3fd26831f..08a9a0836 100644
--- a/src/Orchard.Web/Modules/Orchard.Setup/Views/Setup/Index.cshtml
+++ b/src/Orchard.Web/Modules/Orchard.Setup/Views/Setup/Index.cshtml
@@ -1,5 +1,7 @@
 @model Orchard.Setup.ViewModels.SetupViewModel
-
+@{
+    Script.Include("setup.js");
+}
 <h1>@Html.TitleForPage(T("Get Started").ToString())</h1>
 
 @using (Html.BeginFormAntiForgeryPost()) {
@@ -48,6 +50,18 @@ if (!Model.DatabaseIsPreconfigured) {
     </div>
 </fieldset>
 }
+<div id="throbber">
+    <div class="curtain"></div>
+    <div class="curtain-content">
+        <div>
+            <h1>@T("Configuring Orchard...")</h1>
+            <p>
+                <img src="@Href("../../content/synchronizing.gif")" alt="" />
+            </p>
+        </div>
+    </div>
+</div>
+    
 <fieldset>
     <button class="primaryAction" type="submit">@T("Finish Setup")</button>
 </fieldset>
diff --git a/src/Orchard.Web/Themes/SafeMode/Styles/site.css b/src/Orchard.Web/Themes/SafeMode/Styles/site.css
index e7238cbcd..02f1cc0f8 100644
--- a/src/Orchard.Web/Themes/SafeMode/Styles/site.css
+++ b/src/Orchard.Web/Themes/SafeMode/Styles/site.css
@@ -173,6 +173,34 @@ button:focus::-moz-focus-inner, .button:focus::-moz-focus-inner {
 
 /* Confirmations, Messages and the like
 ***************************************************************/
+#throbber {
+    display:none;
+}
+#throbber .curtain 
+{
+    position:absolute;
+    left:0;
+    top:0;
+    width:100%;
+    height:100%;
+    background-color:Gray;
+    filter:alpha(opacity=70);
+    opacity: 0.7;
+}
+#throbber .curtain-content 
+{
+    position:absolute;
+    left:0;
+    top:0;
+    width:100%;
+    height:100%;
+}
+#throbber .curtain-content div {
+    text-align:center;
+    padding:250px;
+    color:White;
+}
+
 .message, .validation-summary-errors {
     margin:10px 0 4px 0;
     padding:4px;