From 41c3db56a0c25fa2f87c7f7bf393e230fea7dfea Mon Sep 17 00:00:00 2001
From: PerPloug <unknown@kiln.example.com>
Date: Tue, 7 Dec 2010 13:41:58 +0000
Subject: [PATCH] progress feed for database installer

[TFS Changeset #81595]
---
 .../presentation/install/steps/database.ascx  | 29 ++++++++++---------
 umbraco/presentation/install/utills/Helper.cs | 13 ++++-----
 2 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/umbraco/presentation/install/steps/database.ascx b/umbraco/presentation/install/steps/database.ascx
index 545ed1d37b..96f5c9bce8 100644
--- a/umbraco/presentation/install/steps/database.ascx
+++ b/umbraco/presentation/install/steps/database.ascx
@@ -162,10 +162,14 @@
     <script type="text/javascript">
 
     var intervalId = 0;
+    var pBar = jQuery(".progress-bar").progressbar({value: 0});
 
-    jQuery(document).ready(function(){
 
-        intervalId = setInterval("updateProgressBar()", 500);
+    jQuery(document).ready(function () {
+
+        jQuery(".progress-bar").progressbar("option", "value", 0);
+        intervalId = setInterval("updateProgressBar()", 1000);
+
 
         jQuery.ajax({
             type: 'POST',
@@ -174,24 +178,21 @@
             dataType: 'json',
             url: 'utills/p.aspx/installOrUpgrade',
             success: function (result) {
-                alert(result);
+
                 clearInterval(intervalId);
+
+                jQuery(".btn-box").show();
             }
         });
     });
 
     function updateProgressBar() {
-        jQuery.ajax({
-            type: 'POST',
-            contentType: 'application/json; charset=utf-8',
-            data: '{}',
-            dataType: 'json',
-            url: 'utills/p.aspx?feed=progress',
-            success: function (result) {
-                alert(result.percentage + " " + result.progress.percentage);
-                jQuery("h1").html(result.percentage + " " + result.progress.percentage);
-            }
+        jQuery.getJSON('utills/p.aspx?feed=progress', function (data) {
+            alert(data.percentage);
+            jQuery(".progress-bar").progressbar("option", "value", data.percentage);
+            jQuery(".loader strong").text(data.description);
         });
+
     }
 
     </script>
@@ -220,7 +221,7 @@
             </div>
     </asp:PlaceHolder>
     <!-- btn box -->
-    <footer class="btn-box">
+    <footer class="btn-box" style="display: none;">
 	     <div class="t">&nbsp;</div>
             <asp:LinkButton class="btn-step btn btn-continue" runat="server" OnClick="gotoNextStep"><span>Continue</span></asp:LinkButton>
 	     </footer>
diff --git a/umbraco/presentation/install/utills/Helper.cs b/umbraco/presentation/install/utills/Helper.cs
index 2c8696cd39..370650cad8 100644
--- a/umbraco/presentation/install/utills/Helper.cs
+++ b/umbraco/presentation/install/utills/Helper.cs
@@ -28,13 +28,12 @@ namespace umbraco.presentation.install {
     }
 
     public static string getProgress(){
-        string json = @"{'progress': {
-                                        'percentage': '%p',
-                                        'message': '%m',
-                                        'error': '%e'
-                                        }   
-                                 }";
-        string retval = json.Replace("%p", Percentage.ToString()).Replace("%m", Description).Replace("%e", Error);
+        string json = @"{
+                            'percentage': '%p',
+                            'message': '%m',
+                            'error': '%e'
+                        }";
+        string retval = json.Replace("%p", Percentage.ToString()).Replace("%m", Description).Replace("%e", Error).Replace("'", "\"");
         return retval;
     }
   }