From a7b0695cedab2afae7282b0c2880b57d9a26977e Mon Sep 17 00:00:00 2001
From: PerPloug <unknown@kiln.example.com>
Date: Tue, 7 Dec 2010 21:08:15 +0000
Subject: [PATCH] Added progressbars to skins and starterkits, altho that part
 has problems, as the counter resets when the app-pool resets due to
 starter-kit dlls

[TFS Changeset #81610]
---
 umbraco/cms/umbraco.cms.csproj                |  3 +-
 umbraco/presentation/install/default.aspx     | 36 +-----------
 .../presentation/install/js/jquery.main.js    |  5 ++
 .../Skinning/loadStarterKitDesigns.ascx.cs    |  3 +
 .../steps/Skinning/loadStarterKits.ascx.cs    |  5 +-
 .../presentation/install/steps/skinning.ascx  | 55 ++++++++++++++++++-
 6 files changed, 68 insertions(+), 39 deletions(-)

diff --git a/umbraco/cms/umbraco.cms.csproj b/umbraco/cms/umbraco.cms.csproj
index 74fa1a1722..e8ea11eba1 100644
--- a/umbraco/cms/umbraco.cms.csproj
+++ b/umbraco/cms/umbraco.cms.csproj
@@ -104,8 +104,7 @@
     <Reference Include="HtmlAgilityPack">
       <HintPath>..\..\foreign dlls\HtmlAgilityPack.dll</HintPath>
     </Reference>
-    <Reference Include="ICSharpCode.SharpZipLib, Version=0.85.5.452, Culture=neutral, PublicKeyToken=1b03e6acf1164f73, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
+    <Reference Include="ICSharpCode.SharpZipLib">
       <HintPath>..\..\foreign dlls\ICSharpCode.SharpZipLib.dll</HintPath>
     </Reference>
     <Reference Include="System">
diff --git a/umbraco/presentation/install/default.aspx b/umbraco/presentation/install/default.aspx
index 4e2df548ab..c420cf41e0 100644
--- a/umbraco/presentation/install/default.aspx
+++ b/umbraco/presentation/install/default.aspx
@@ -84,41 +84,7 @@
 		</div>
 	</section>
 
-	<!-- lightbox -->
-	<div class="lightbox" id="lightbox">
-		<a href="#" class="btn-close btn-close-box">close</a>
-		<div class="t">&nbsp;</div>
-		<div class="c">
-			<div class="heading">
-
-				<strong class="title">Name of skin</strong>
-
-				<span class="create">Created by: <a href="#">Cogworks</a></span>
-
-			</div>
-
-			<div class="carusel">
-
-				<ul>
-					<li><img src="images/img09.jpg" alt="image description"></li>
-
-					<li><img src="images/img10.jpg" alt="image description"></li>
-
-					<li><img src="images/img11.jpg" alt="image description"></li>
-				</ul>
-
-			</div>
-
-			<footer class="btn-box">
-
-				<a href="#single-tab4" class="single-tab btn-install btn-close-box">Install</a>
-
-			</footer>
-
-		</div>
-
-		<div class="b">&nbsp;</div>
-	</div>
+	
 
 	<!-- bg page -->
 	<div class="bg-main">
diff --git a/umbraco/presentation/install/js/jquery.main.js b/umbraco/presentation/install/js/jquery.main.js
index ac200fb61c..e776ce97a4 100644
--- a/umbraco/presentation/install/js/jquery.main.js
+++ b/umbraco/presentation/install/js/jquery.main.js
@@ -16,6 +16,9 @@ function initProgressBar() {
     updateProgressBar(0);
 }
 
+
+
+
 function updateProgressBar(percent) {
     jQuery('.loader').each(function () {
         var set = jQuery(this);
@@ -32,6 +35,8 @@ function updateStatusMessage(message) {
     jQuery(".loader > strong").text(message);
 }
 
+
+
 function initButtonHover() {
     if (typeof document.body.style.maxHeight == 'undefined') ie6 = true;
     else ie6 = false;
diff --git a/umbraco/presentation/install/steps/Skinning/loadStarterKitDesigns.ascx.cs b/umbraco/presentation/install/steps/Skinning/loadStarterKitDesigns.ascx.cs
index c69f948fa9..7bf3bffc2e 100644
--- a/umbraco/presentation/install/steps/Skinning/loadStarterKitDesigns.ascx.cs
+++ b/umbraco/presentation/install/steps/Skinning/loadStarterKitDesigns.ascx.cs
@@ -36,6 +36,9 @@ namespace umbraco.presentation.install.steps.Skinning
              {
                  try
                  {
+                   //clear progress bar cache
+                   Helper.clearProgress();
+
                      rep_starterKitDesigns.DataSource = repo.Webservice.Skins(StarterKitGuid.ToString());
                      rep_starterKitDesigns.DataBind();
                  }
diff --git a/umbraco/presentation/install/steps/Skinning/loadStarterKits.ascx.cs b/umbraco/presentation/install/steps/Skinning/loadStarterKits.ascx.cs
index 68b9f011d8..bba69111b2 100644
--- a/umbraco/presentation/install/steps/Skinning/loadStarterKits.ascx.cs
+++ b/umbraco/presentation/install/steps/Skinning/loadStarterKits.ascx.cs
@@ -35,6 +35,9 @@ namespace umbraco.presentation.install.steps.Skinning
         {
                 base.OnInit(e);
 
+          //clear progressbar cache
+                Helper.clearProgress();
+
                 if (repo.HasConnection())
                 {
                     try
@@ -68,7 +71,7 @@ namespace umbraco.presentation.install.steps.Skinning
 
         protected void SelectStarterKit(object sender, EventArgs e)
         {
-            Helper.clearProgress();
+            
 
             Guid kitGuid = new Guid(((LinkButton)sender).CommandArgument);
 
diff --git a/umbraco/presentation/install/steps/skinning.ascx b/umbraco/presentation/install/steps/skinning.ascx
index a70e3fdfcf..2e1e22b534 100644
--- a/umbraco/presentation/install/steps/skinning.ascx
+++ b/umbraco/presentation/install/steps/skinning.ascx
@@ -6,11 +6,18 @@
 <ContentTemplate>
 
 <script type="text/javascript">
+    var intervalId = 0;
+
     jQuery(document).ready(function () {
         jQuery('.zoom-list a.selectStarterKit').click(function () {
             jQuery('.main-tabinfo').hide();
             jQuery('#starterkitname').html( jQuery('span', this).html() );
+            
             jQuery('#single-tab1').show();
+            //fire off the progressbar
+            intervalId = setInterval("progressBarCallback()", 1000);
+            
+            
             return true;
         });
     });
@@ -29,12 +36,34 @@
                 jQuery('#browseSkins').hide();
                 jQuery('#installingSkin').show();
 
+                //fire off the progressbar
+                intervalId = setInterval("progressBarCallback()", 1000);
+
                 jQuery('#skinname').html(jQuery('span', this).html());
-                
                 return true;
             });
         }
     }
+
+
+    function progressBarCallback() {
+        jQuery.getJSON('utills/p.aspx?feed=progress', function (data) {
+
+            updateProgressBar(data.percentage);
+            updateStatusMessage(data.message)
+
+            if (data.error != "") {
+                clearInterval(intervalId);
+                updateStatusMessage(data.error);
+            }
+
+            if (data.percentage == 100) {
+                clearInterval(intervalId);
+                jQuery(".btn-box").show();
+            }
+        });
+    }
+    </script>
 </script>
 
 
@@ -102,4 +131,28 @@
 			<strong>Starting installation...</strong>
 		</div>
 	</div>	
+</div>
+
+<!-- lightbox -->
+<div class="lightbox" id="lightbox">
+	<a href="#" class="btn-close btn-close-box">close</a>
+	<div class="t">&nbsp;</div>
+	<div class="c">
+		<div class="heading">
+	        <strong class="title">Name of skin</strong>
+            <span class="create">Created by: <a href="#">Cogworks</a></span>
+		</div>
+		<div class="carusel">
+			<ul>
+				<li><img src="images/img09.jpg" alt="image description"></li>
+				<li><img src="images/img10.jpg" alt="image description"></li>
+				<li><img src="images/img11.jpg" alt="image description"></li>
+			</ul>
+		</div>
+
+		<footer class="btn-box" style="display: none;">
+			<a href="#single-tab4" class="single-tab btn-install btn-close-box">Install</a>
+		</footer>
+	</div>
+	<div class="b">&nbsp;</div>
 </div>
\ No newline at end of file