Merge branch 'edge' of git@github.com:ktgit/knowledgetree into edge

jarrett
2 parents af20b25e 6b7ad149
Showing 8 changed files with 84 additions and 35 deletions
setup/upgrade/resources/graphics/loading.gif
setup/upgrade/steps/upgradeBackup.php
setup/upgrade/steps/upgradeDatabase.php
setup/upgrade/steps/upgradeRestore.php
setup/upgrade/templates/backup.tpl
setup/upgrade/templates/database.tpl
setup/upgrade/templates/loading.tpl
setup/upgrade/templates/restore.tpl
@@ -57,7 +57,8 @@ class upgradeBackup extends Step {
     protected $temp_variables = array();
     public function __construct() {
-    	$this->temp_variables = array("step_name"=>"backup", "silent"=>$this->silent);
+    	$this->temp_variables = array("step_name"=>"backup", "silent"=>$this->silent, 
+                                      "loadingText"=>"Your backup is under way.  Please wait until it completes");
         $this->_dbhandler = new UpgradedbUtil();
     	$this->util = new UpgradeUtil();
     }
@@ -121,7 +121,8 @@ class upgradeDatabase extends Step
 	* @param none
  	*/
     public function __construct() {
-        $this->temp_variables = array("step_name"=>"database", "silent"=>$this->silent);
+        $this->temp_variables = array("step_name"=>"database", "silent"=>$this->silent, 
+                                      "loadingText"=>"The database upgrade is under way.  Please wait until it completes");
     	$this->_dbhandler = new UpgradedbUtil();
         $this->_util = new UpgradeUtil();
     	if(WINDOWS_OS)
@@ -195,8 +196,10 @@ class upgradeDatabase extends Step
         else if ($action == 'runUpgrade') {
             $this->temp_variables['title'] = 'Upgrade In Progress';
             if (!$this->upgradeDatabase()) {
+                $this->temp_variables['backupSuccessful'] = false;
                 return false;
             }
+            $this->temp_variables['backupSuccessful'] = true;
         }
         return true;
@@ -221,7 +224,7 @@ class upgradeDatabase extends Step
         $ret .= "<tr bgcolor='darkgrey'><th width='10'>Code</th><th width='100%'>Description</th><th width='30'>Applied</th></tr>\n";
         $i=0;
         foreach ($upgrades as $upgrade) {
-            $color=((($i++)%2)==0)?'white':'lightgrey';
+            $color = ((($i++)%2)==0) ? 'white' : 'lightgrey';
             $ret .= sprintf("<tr bgcolor='$color'><td>%s</td><td>%s</td><td>%s</td></tr>\n",
             htmlspecialchars($upgrade->getDescriptor()),
             htmlspecialchars($upgrade->getDescription()),
@@ -299,11 +302,14 @@ class upgradeDatabase extends Step
     {
         global $default;
+        $errors = false;
+        
         $this->temp_variables['detail'] = '<p>The table below describes the upgrades that have occurred to
             upgrade your KnowledgeTree installation to <strong>' . $default->systemVersion . '</strong>';
         $pre_res = $this->performPreUpgradeActions();
         if (PEAR::isError($pre_res)) {
+            $errors = true;
             $this->temp_variables['preUpgrade'] = '<font color="red">Pre-Upgrade actions failed.</font>';
         }
         else {
@@ -313,7 +319,8 @@ class upgradeDatabase extends Step
         $res = $this->performAllUpgrades();
         if (PEAR::isError($res) || PEAR::isError($pres)) {
-            // TODO instantiate error details hideable section
+            $errors = true;
+            // TODO instantiate error details hideable section?
             $this->temp_variables['upgradeStatus'] = '<font color="red">Database upgrade failed</font>
                                                       <br/><br/>
                                                       Please restore from your backup and ensure that the database does not contain 
@@ -327,11 +334,14 @@ class upgradeDatabase extends Step
         $post_pres = $this->performPostUpgradeActions();
         if (PEAR::isError($post_res)) {
+            $errors = true;
             $this->temp_variables['postUpgrade'] = '<font color="red">Post-Upgrade actions failed.</font>';
         }
         else {
             $this->temp_variables['postUpgrade'] = '<font color="green">Post-Upgrade actions succeeded.</font>';
         }
+        
+        return !$errors;
     }
     private function performPreUpgradeActions() {
@@ -404,7 +414,7 @@ class upgradeDatabase extends Step
             ++$row;
             $res = $upgrade->performUpgrade();
             $this->temp_variables['upgradeTable'] .= sprintf('<div class="bar">%s</div>', $this->showResult($res));
-            $this->temp_variables['upgradeTable'] .= '<br style="clear: both">' . "\n";
+            $this->temp_variables['upgradeTable'] .= '<br>' . "\n";
             $this->temp_variables['upgradeTable'] .= "</div>\n";
             if (PEAR::isError($res)) {
                 if (!is_a($res, 'Upgrade_Already_Applied')) {
@@ -58,7 +58,8 @@ class upgradeRestore extends Step {
     protected $util = null;
     public function __construct() {
-    	$this->temp_variables = array("step_name"=>"restore", "silent"=>$this->silent);
+    	$this->temp_variables = array("step_name"=>"restore", "silent"=>$this->silent, 
+                                      "loadingText"=>"The database restore is under way.  Please wait until it completes");
         $this->_dbhandler = new UpgradedbUtil();
     	$this->util = new UpgradeUtil();
     }
-<form action="index.php?step_name=backup" method="post">
-	<p class="title"><?php echo $title; ?></p>
+<form action="index.php?step_name=backup" method="post" name="dbForm" id="dbForm">
+    <p class="title"><?php echo $title; ?></p>
-	<?php
-	if($errors || $warnings){
-	    echo '<div>'
-	       . '<a href="http://wiki.knowledgetree.com/Web_Based_Upgrader#Post_Upgrade" target="_blank">'
-	       . 'Click Here for help on overcoming backup issues</a></div><br/>';
-	}
-	?>
-	<div id="step_content_complete" class="step">
-	<br/><br/>
-	<div>
+    <?php
+    if($errors || $warnings){
+        echo '<div>'
+           . '<a href="http://wiki.knowledgetree.com/Web_Based_Upgrader#Post_Upgrade" target="_blank">'
+           . 'Click Here for help on overcoming backup issues</a></div><br/>';
+    }
+    ?>
+    <div id="step_content_complete" class="step">
+    <br/><br/>
+    <div>
     <?php
     if ($dir != '') {
         if (!$backupStatus) {
@@ -44,23 +44,26 @@ You can continue to do the backup manually using the following process:
 ?><nobr><?php echo $display; ?></nobr>
 </table>
 <P>
-	</div>
-	</div>
+    </div>
+    </div>
+    <?php include 'templates/loading.tpl'; ?>
+	<div id="buttonBar">
+    <input type="submit" name="Previous" value="Back" class="button_previous">
     <?php
 if ($dir != '')
 {
     if (($action == '') || ($action == 'confirm')) {
-        ?><input type="submit" name="BackupNow" value="Next" class="button_next"><?php
+        ?><input type="button" name="BackupNow" value="Next" class="button_next" onclick="doSubmit(this);"><?php
     }
     else if ($backupStatus) {
         ?><input type="submit" name="Next" value="Restore" class="button_next">
         <input type="submit" name="Upgrade" value="Upgrade" class="button_next"><?php
     }
     else {
-        ?><input type="submit" name="Next" value="Next" class="button_next"><?php
+        ?><input type="submit" name="Next" value="Next" class="button_next""><?php
     }
 }
     ?>
-    <input type="submit" name="Previous" value="Back" class="button_previous">
+    </div>
 </form>
 \ No newline at end of file
-<form id="dbsettings" action="index.php?step_name=database" method="post">
+<form action="index.php?step_name=database" method="post" name="dbForm" id="dbForm">
 	<p class="title"><?php echo $title; ?></p>
 	<div id="database" class="step1" style="display:block;">
 		<div class="description">
@@ -23,30 +23,42 @@
                 <?php } ?>
             <?php }
             else if ($action == 'runUpgrade') {
-                echo $preUpgrade;
+                // hiding pre-upgrade notification
+				/*
+				echo $preUpgrade;
                 echo '<br/><br/>';
+				*/
                 echo $upgradeTable;
                 echo '<br/><br/>';
-                echo $postUpgrade;
+                // hiding pre-upgrade notification
+				/*
+				echo $postUpgrade;
                 echo '<br/><br/>';
+				*/
                 echo $upgradeStatus;
                 echo '<br/><br/>';
             }
             ?>
 		</div>
 	</div>
+	<?php include 'templates/loading.tpl'; ?>
+	<div id="buttonBar">
     <?php if (empty($action) || ($action == 'preview')) { ?>
-    <input type="submit" name="Previous" value="previous" class="button_previous"/>
-    <input type="submit" name="ConfirmUpgrade" value="next" class="button_next"/>
+    <input type="submit" name="Previous" value="Previous" class="button_previous"/>
+    <input type="submit" name="ConfirmUpgrade" value="Next" class="button_next"/>
     <?php }
     else if ($action == 'confirm') { ?>
-    <input type="submit" name="Cancel" value="cancel" class="button_previous"/>
-    <input type="submit" name="RunUpgrade" value="next" class="button_next"/>
+    <input type="submit" name="Cancel" value="Cancel" class="button_previous"/>
+    <input type="button" name="RunUpgrade" value="Next" class="button_next" onclick="doSubmit(this);"/>
     <?php }
     else if ($action == 'runUpgrade') { ?>
-    <script type="text/javascript">
-        alert("To complete the upgrade please do the following before continuing:\n\n1. Restart the services as appropriate for your environment.\n\n\nOn first run of your upgraded installaton please do the following:\n\n1. Hard refresh your bowser (CTRL-F5) on first view of the Dashboard.\n2. Enable the new plugins you wish to use.\n\n\nSelect 'next' at the bottom of this page to continue.")
+		<?php if ($backupSuccessful) { ?>
+		<script type="text/javascript">
+        alert("To complete the upgrade please do the following before continuing:\n\n1. Restart the services as appropriate for your environment.\n\n\nOn first run of your upgraded installaton please do the following:\n\n1. Hard refresh your bowser (CTRL-F5) on first view of the Dashboard.\n2. Enable the new plugins you wish to use.\n\n\nSelect 'Finish' at the bottom of this page to continue.")
     </script>
-    <input type="submit" name="Next" value="next" class="button_next"/>
+				<input type="submit" name="Next" value="Finish" class="button_next"/>
+		<?php }
+			  else { ?><input type="submit" name="Previous" value="Restore" class="button_previous"/><?php } ?>
     <?php } ?>
+	</div>
 </form>
 \ No newline at end of file
+<div id="loadingBar" style="display:none; text-align: center; padding: 4px;">
+	<img src="/setup/upgrade/resources/graphics/loading.gif">
+	<br/>
+	<?php echo $loadingText; ?>
+</div>
+<script>
+    function doSubmit(obj)
+	{
+        var e = document.createElement('input');
+            e.setAttribute('type','hidden');
+            e.setAttribute('name',obj.name);
+            e.setAttribute('value',obj.value);
+        document.getElementById('loadingBar').appendChild(e);
+
+        $('#buttonBar').hide();            
+        $('#loadingBar').show();
+        $('#dbForm').submit();
+    }
+</script>
 \ No newline at end of file
-<form action="index.php?step_name=restore" method="post">
+<form action="index.php?step_name=restore" method="post" name="dbForm" id="dbForm">
     <p class="title"><?php echo $title; ?></p>
     <?php
@@ -92,11 +92,14 @@ Press &lt;i&gt;Next&lt;/i&gt; to attempt the command(s) above.
     ?>
     </div>
     </div>
+	<?php include 'templates/loading.tpl'; ?>
+	<div id="buttonBar">
     <input type="submit" name="Previous" value="Back" class="button_previous">
     <?php if (($dir != '') && ($selected)) { ?>
-    <input type="submit" name="RunRestore" value="Next" class="button_next">
+    <input type="button" name="RunRestore" value="Next" class="button_next" onclick="doSubmit(this);">
     <?php }
     else { ?>
     <input type="submit" name="Next" value="Next" class="button_next">
     <?php } ?>
+	</div>
 </form>
 \ No newline at end of file