Updated templates for 1024X768. Renamed win32 extension check. Added login detai…

…ls to Complete Step. Updated Registration Step. Turned on ajax form plugin. Committed by: Jarrett Jordaan Reviewed by: Megan Watson

Updated templates for 1024X768. Renamed win32 extension check. Added login detai…
…ls to Complete Step. Updated Registration Step. Turned on ajax form plugin. Committed by: Jarrett Jordaan Reviewed by: Megan Watson
Jarrett Jordaan
1 parent 481fd888
Showing 24 changed files with 467 additions and 267 deletions
setup/upgrade/templates/database.tpl
setup/upgrade/templates/installation.tpl
setup/upgrade/templates/welcome.tpl
setup/wizard/path.php
setup/wizard/resources/css/ie6.css
setup/wizard/resources/css/wizard.css
setup/wizard/resources/graphics/loader.gif
setup/wizard/resources/js/form.js
setup/wizard/resources/js/wizard.js
setup/wizard/steps/complete.php
setup/wizard/steps/dependencies.php
setup/wizard/steps/registration.php
setup/wizard/template.php
setup/wizard/templates/complete.tpl
setup/wizard/templates/configuration.tpl
setup/wizard/templates/configuration_confirm.tpl
setup/wizard/templates/database.tpl
setup/wizard/templates/dependencies.tpl
setup/wizard/templates/install.tpl
setup/wizard/templates/license.tpl
@@ -66,4 +66,5 @@
 			  else { ?><input type="submit" name="Previous" value="Restore" class="button_previous"/><?php } ?>
     <?php } ?>
 	</div>
-</form>
 \ No newline at end of file
+</form>
+<?php if (AJAX) { echo $html->js('form.js'); } ?>
 \ No newline at end of file
@@ -18,4 +18,5 @@
     <input type="submit" name="Upgrade" value="Upgrade" class="button_next"/>
     <input type="submit" name="Restore" value="Restore Database" class="button_next"/>
     <input type="submit" name="Next" value="Backup Now" class="button_next"/>
-</form>
 \ No newline at end of file
+</form>
+<?php if (AJAX) { echo $html->js('form.js'); } ?>
 \ No newline at end of file
@@ -13,7 +13,7 @@
                 <tr><td>Password</td><td><input name=password type="password"></td></tr>
                 <?php if (!empty($errors)) { ?><tr><td></td><td><span class="error">Could Not Authenticate User</span></td></tr> <?php } ?>
             </table>
-            
+
         </div>
 	</div>
 	<?php
@@ -29,4 +29,5 @@
 </form>
 <script type="text/javascript">
 	$('#username').focus();
-</script>
 \ No newline at end of file
+</script>
+<?php if (AJAX) { echo $html->js('form.js'); } ?>
 \ No newline at end of file
@@ -47,7 +47,7 @@
 		define('AGENT', 'OTHER');
 	}
 	// Define installer environment
-	define('AJAX', 0);
+	define('AJAX', 1);
 	if (substr(php_uname(), 0, 7) == "Windows") {
     	define('WINDOWS_OS', true);
     	define('UNIX_OS', false);
@@ -64,34 +64,25 @@
 	}
 	$wizard = realpath(dirname(__FILE__));
 	// Define environment root
+	$wizard = realpath(dirname(__FILE__));
+	$xdir = explode(DS, $wizard);
+	array_pop($xdir);
+	$sys = '';
+	foreach ($xdir as $k=>$v) {
+		$sys .= $v.DS;
+	}
 	if(isset($_GET['type'])) {
 		switch ($_GET['type']) {
 			case 'migrate' :
-				$wizard = realpath(dirname(__FILE__));
-				$xdir = explode(DS, $wizard);
-				array_pop($xdir);
-				$sys = '';
-				foreach ($xdir as $k=>$v) {
-					$sys .= $v.DS;
-				}
 				$wizard = $sys.'migrate';
 			break;
 			case 'upgrade' :
-				$wizard = realpath(dirname(__FILE__));
-				$xdir = explode(DS, $wizard);
-				array_pop($xdir);
-				$sys = '';
-				foreach ($xdir as $k=>$v) {
-					$sys .= $v.DS;
-				}
 				$wizard = $sys.'upgrade';
 			break;
 			default:
-				
+
 			break;
 		}
-	} else {
-//		die("Environment Error");
 	}
 	$xdir = explode(DS, $wizard);
 	array_pop($xdir);
+#logo {
+	right:70%;
+}
 \ No newline at end of file
@@ -64,20 +64,20 @@ select {
 /* *** Layout Styles *** */
 #wrapper {
-	background: white;
+	background: white; min-height:410px;
 }
 #outer-wrapper {
 	border:1px solid #B7B7B7;
 	margin-top:20px;
-	width:1024px;
+	/*width:1024px;*/width:964px;
 }
 #header {
 	background: transparent url("../graphics/dame/installer_head.png") repeat scroll 0% 0%;
-	text-align: right; 
-	font-size: 100%; 
-	color: rgb(167, 167, 167); 
+	text-align: right;
+	font-size: 100%;
+	color: rgb(167, 167, 167);
 	font-family: sans-serif;
 	height: 71px;
 	font-family:sans-serif;
@@ -87,11 +87,12 @@ select {
 #container {
 	background: white url("../graphics/left.png") repeat-y left;
 	overflow:auto;
+	/*min-height:630px;height:410px;*/min-height:410px;
 }
 #content {
     margin-left: 220px;
-    height:515px;
+    /*height:515px;*/height:400px;
 }
 #content_container {
@@ -104,43 +105,49 @@ select {
 	border: 1px solid rgb(207, 207, 207);
 	padding: 5px;
 	overflow: auto;
-	min-height: 400px;
+	/*min-height: 400px;*/min-height: 300px;
 }
 #step_content_dependencies {
 	border: 1px solid rgb(207, 207, 207);
-	padding: 5px;
-	min-height:270px;
+	/*padding: 5px;*/padding: 12px;
+	/*min-height:270px;*/min-height:170px;
 }
 #step_content_configuration {
 	border: 1px solid rgb(207, 207, 207);
 	padding: 5px;
-	min-height:320px;
+	/*min-height:320px;*//*height:330px*/min-height:130px;
+}
+
+#step_content_services {
+	border: 1px solid rgb(207, 207, 207);
+	padding: 5px;
+	min-height:230px;
 }
 #step_content_registration {
 	border: 1px solid rgb(207, 207, 207);
 	padding: 5px;
-	min-height:320px;
+	/*min-height:320px;*/min-height:100px;
 }
 #step_content_registration_confirm {
 	border: 1px solid rgb(207, 207, 207);
 	padding: 5px;
-	min-height:400px;
+	/*min-height:400px;*/min-height:300px;
 }
 #step_content_install {
 	border: 1px solid rgb(207, 207, 207);
 	padding: 5px;
-	min-height:400px;
+	/*min-height:400px;*/min-height:150px;
 }
 #step_content_database {
 	border: 1px solid rgb(207, 207, 207);
 	padding: 5px;
-	min-height:365px;
+	/*min-height:365px;*/min-height:240px;
 }
 #step_content_database_confirm {
@@ -157,15 +164,15 @@ select {
 .license_agreement {
 	overflow: scroll;
-	height:370px;
+	/*height:370px;*/height:270px;
 	overflow-x:hidden;
 	border:1px solid #CFCFCF;
 }
 #sidebar {
 	font-size: 85%;
-	color: grey; 
-	font-family: sans-serif; 
+	color: grey;
+	font-family: sans-serif;
 	margin-top: 0px;
 	float: left;
 	padding-top: 20px;
@@ -197,8 +204,8 @@ select {
 #logo {
 	position:relative;
-	right:760px;
-	top:20px;
+	/*right:760px;*/right:75%;
+	/*top:20px;*/top:25%;
 }
 #install_details {
@@ -208,26 +215,26 @@ select {
 }
 .indicator a {
-	background:url("../graphics/dame/tick1.png") no-repeat left; 
-	padding-top:15px;			
-	padding-bottom:10px;		
-	padding-left:30px;			
-	color: #1c9e00;	
+	background:url("../graphics/dame/tick1.png") no-repeat left;
+	padding-top:15px;
+	padding-bottom:10px;
+	padding-left:30px;
+	color: #1c9e00;
 }
 .active {
-	background:url("../graphics/dame/tick1.png") no-repeat left; 
-	padding-top:15px;			
-	padding-bottom:10px;		
-	padding-left:30px;			
-	color: #1c9e00;	
+	background:url("../graphics/dame/tick1.png") no-repeat left;
+	padding-top:15px;
+	padding-bottom:10px;
+	padding-left:30px;
+	color: #1c9e00;
 }
 .inactive {
 	background:url("../graphics/dame/tick2.png") no-repeat left;
 	padding-top:15px;
 	padding-bottom:10px;
-	padding-left:30px; 
+	padding-left:30px;
 	color:#a7a7a7;
 }
@@ -238,7 +245,7 @@ select {
 	padding-left:30px;
 	color: #f36a00;
 }
-	
+
 .tick {
     background: url("../graphics/tick.png") no-repeat;
     height: 16px;
@@ -275,7 +282,7 @@ select {
 }
 .conf_paths {
-	width:755px;
+	/*width:755px;*/width:100%;
 }
 .errors {
@@ -361,7 +368,7 @@ select {
 .onclick {
      cursor: pointer;
      color: #EC7725;
-     width: 150px;
+     /*width: 150px;*/width:350px;top:12px;position:relative;
 }
 .description {
@@ -397,7 +404,7 @@ table#dbconf tr td {
 }
 table#dbconf tr td input{
-	
+
 }
 .options {
@@ -408,17 +415,17 @@ table#dbconf tr td input{
 	padding: 5px 8px;
 }
-#section {
+/*#section {
-}
+}*/
 .php_ext_details table {
 	width:745px;
 }
-.php_ext_details table tr {
-	
-}
+/*.php_ext_details table tr {
+
+}*/
 td.ext_indicator {
 	width:10px;
@@ -449,7 +456,7 @@ td.dir_description {
 }
 .php_con_details table {
-	width:745px;
+	/*width:745px;*/width:675px;
 }
 .error_message {
@@ -471,7 +478,7 @@ td.dir_description {
 	margin-bottom:0.75em;
 	font-weight:bold;
 }
-	
+
 .continue_message {
 	border:none;
 	width:550px;
@@ -533,7 +540,7 @@ td.dir_description {
 #loading {
 	bottom:250px;
-	left:500px;
+	/*left:500px;*/left:400px;
 	position:relative;
 	height:0px;
 	width:0px;
@@ -548,4 +555,38 @@ td.dir_description {
 #left_space {
 	float:left;
 	width:50%;
+	font-size:11pt;
+}
+
+#welcome_license_dependencies {
+	height:100px;
+}
+
+.dependency_details {
+	top:12px;
+	position:relative;
+	width:650px;
+}
+
+.dependencies {
+	position:relative;
+	right:30%;
+}
+
+.registration_template {
+	width:90%;
+}
+
+.registration_select {
+    width: 270px;
+}
+
+.description_complete {
+	position:relative;
+	right:35%;
+	width:100%;
+}
+
+.space{
+	padding-bottom:5px;
 }
 \ No newline at end of file
@@ -9,8 +9,8 @@ $(document).ready(function() {
 	    var options = {target: '#content_container', beforeSubmit: w.validateRegistration, success: w.adjustMenu($('form').attr('id'))};
 	    $('form').ajaxForm(options);
  	}
- 	$(document).bind('keydown', 'Ctrl+n',function (evt){alert("n"); return false; });
- 	$(document).bind('keydown', 'Ctrl+p',function (evt){alert("p"); return false; });
- 	$(document).bind('keydown', 'Ctrl+e',function (evt){alert("e"); return false; });
- 	$(document).bind('keydown', 'Ctrl+i',function (evt){alert("i"); return false; });
+ 	$(document).bind('keydown', 'Ctrl+n',function (evt){  });
+ 	$(document).bind('keydown', 'Ctrl+p',function (evt){  });
+ 	$(document).bind('keydown', 'Ctrl+e',function (evt){  });
+ 	$(document).bind('keydown', 'Ctrl+i',function (evt){  });
 });
 \ No newline at end of file
 // Class Wizard
-function wizard() {	
+var ajaxOn = false;
+function wizard() {
+	this.ajaxOn = false;
 }
 // Toggle Advance Database options
@@ -10,12 +12,20 @@ wizard.prototype.toggleClass = function(ele, option) { //adv_options|php_details
 	var patt1=/none/gi; // preg match
 	var patt2=/block/gi;
 	if(style.match(patt1) == 'none') {
-		$('.'+ele).attr('style', 'display: block;');
+		if(this.ajaxOn) {
+			w.slideElement($('.'+ele), 'down');
+		} else {
+			$('.'+ele).attr('style', 'display: block;');
+		}
     	if($('#'+option).attr('innerHTML') != '&nbsp;&nbsp;Advanced Options') {
     		$('#'+option).attr('innerHTML', 'Hide Details');
     	}
 	} else if(style.match(patt2) == 'block') {
-		$('.'+ele).attr('style', 'display: none;');
+		if(this.ajaxOn) {
+			w.slideElement($('.'+ele), 'up');
+		} else {
+			$('.'+ele).attr('style', 'display: none;');
+		}
 		if($('#'+option).attr('innerHTML') != '&nbsp;&nbsp;Advanced Options') {
     		$('#'+option).attr('innerHTML', 'Show Details');
 		}
@@ -23,6 +33,13 @@ wizard.prototype.toggleClass = function(ele, option) { //adv_options|php_details
 	}
 }
+wizard.prototype.slideElement = function(el, dir) {
+	if(dir == 'down')
+		$(el).slideDown("slow");
+	else
+		$(el).slideUp("slow");
+}
+
 // Focus on element
 wizard.prototype.focusElement = function(el) {
 	el.focus();
@@ -59,7 +76,7 @@ wizard.prototype.validateRegistration = function() {
 		$('#sendAll').attr('value', 'previous');
 		return true;
 	}
-	
+
 	return false;
 }
@@ -92,7 +109,7 @@ wizard.prototype.valRegHelper = function() {
 		w.focusElement(email);
 		return false;
 	}
-	
+
 	return true;
 }
@@ -107,7 +124,7 @@ wizard.prototype.nameCheck = function(str) {
 }
 // Validate Registration Page Courtesy of SmartWebby.com (http://www.smartwebby.com/dhtml/)
-wizard.prototype.emailCheck = function(str) { 
+wizard.prototype.emailCheck = function(str) {
 	str = w.trim(str);
 	var at="@";
 	var dot=".";
@@ -141,12 +158,12 @@ wizard.prototype.emailCheck = function(str) {
 wizard.prototype.trim = function (str, chars) {
 	return w.ltrim(w.rtrim(str, chars), chars);
 }
- 
+
 wizard.prototype.ltrim = function (str, chars) {
 	chars = chars || "\\s";
 	return str.replace(new RegExp("^[" + chars + "]+", "g"), "");
 }
- 
+
 wizard.prototype.rtrim = function (str, chars) {
 	chars = chars || "\\s";
 	return str.replace(new RegExp("[" + chars + "]+$", "g"), "");
@@ -170,17 +187,18 @@ wizard.prototype.adjustMenu = function (form_id, previous) {
 }
 wizard.prototype.dummy = function () {
-	
+
 }
-// pre-submit callback 
+// pre-submit callback
 wizard.prototype.showRequest = function (formData, jqForm, options) {
-	$.blockUI({message:''});
+	//$.blockUI({message:''});
+	$.blockUI({overlayCSS:{opacity:0.1}, fadeIn:500, fadeOut:500, message:''});
 	$('#loading').attr('style', 'display:block;');
 }
-// post-submit callback 
-wizard.prototype.showResponse = function (responseText, statusText)  {
+// post-submit callback
+wizard.prototype.showResponse = function (responseText, statusText) {
 	$.unblockUI();
 	$('#loading').attr('style', 'display:none;');
 }
@@ -194,12 +212,12 @@ wizard.prototype.refresh = function (page)  {
 		type: "GET",
 		cache: false,
 		beforeSubmit: w.showRequest,
-		success: function(data){
-					$("#"+div).empty();
-					$("#"+div).append(data);
-					w.showResponse;
-					return;
-				}
+		success: function(data) {
+			$("#"+div).empty();
+			$("#"+div).append(data);
+			w.showResponse;
+			return;
+		}
 	});
 }
@@ -210,7 +228,7 @@ wizard.prototype.getUrl = function (address, div)  {
 		dataType: "html",
 		type: "GET",
 		cache: false,
-		success: function(data){
+		success: function(data) {
 			$("#"+div).empty();
 			$("#"+div).append(data);
 			return;
@@ -227,11 +245,5 @@ wizard.prototype.sendRegistration = function ()  {
 }
 wizard.prototype.clearSessions = function ()  {
-//	var address = 'session.php?action=destroyAll';
-//	$.ajax({
-//		url: address,
-//		dataType: "html",
-//		type: "POST",
-//		cache: false,
-//	});
+
 }
 \ No newline at end of file
 <?php
 /**
-* Complete Step Controller. 
+* Complete Step Controller.
 *
 * KnowledgeTree Community Edition
 * Document Management Made Simple
@@ -44,7 +44,7 @@ class complete extends Step {
     /**
      * List of services to check
-     * 
+     *
      * @access private
      * @var array
      */
@@ -55,13 +55,16 @@ class complete extends Step {
     private $migrate_check = false;
     public $silent = true;
     private $servicesValidation = false;
-    
+    private $pathsSection = true;
+    private $databaseSection = true;
+    private $privilegesSection = true;
+
     function doStep() {
     	$this->temp_variables = array("step_name"=>"complete", "silent"=>$this->silent);
         $this->doRun();
     	return 'landing';
     }
-    
+
     function doRun() {
         $this->checkFileSystem(); // check filesystem (including location of document directory and logging)
         $this->checkDb(); // check database
@@ -69,7 +72,7 @@ class complete extends Step {
         $this->checkInstallType();// Set silent mode variables
         $this->storeSilent();// Set silent mode variables
     }
-    
+
     private function checkFileSystem()
     {
         // defaults
@@ -81,36 +84,33 @@ class complete extends Step {
         $this->temp_variables['config'] = '';
         $this->temp_variables['docLocation'] = '';
         $docRoot = '';
-        // retrieve path information from session
-        $config = $this->getDataFromSession("configuration");
+        $config = $this->getDataFromSession("configuration"); // retrieve path information from session
         $paths = $config['paths'];
-
         $html = '<td><div class="%s"></div></td>'
               . '<td %s>%s</td>';
         $pathhtml = '<td><div class="%s"></div></td>'
                   . '<td>%s</td>'
                   . '<td %s>%s</td>';
-        // check paths are writeable
-        if(is_array($paths)) {
+        if(is_array($paths)) { // check paths are writeable
 	        foreach ($paths as $path)
 	        {
 	            $output = '';
 	            $path['path'] = $class = strtolower(substr($path['path'],0,1)).substr($path['path'],1); // Damn you windows
 	            $result = $this->util->checkPermission($path['path']);
-            	$output = sprintf($pathhtml, $result['class'], $path['path'], 
-                                     (($result['class'] == 'tick') ? 'class="green"' : 'class="error"' ), 
+            	$output = sprintf($pathhtml, $result['class'], $path['path'],
+                                     (($result['class'] == 'tick') ? 'class="green"' : 'class="error"' ),
                                      (($result['class'] == 'tick') ? 'Writeable' : 'Not Writeable' ));
 	            $this->temp_variables[($path['setting'] != '') ? $path['setting'] : 'config'] = $output;
 	            if($result['class'] != 'tick') {
+	            	$this->pathsSection = false;
 					$this->paths_check = $result['class'];
 	            }
 	            // for document location check
 	            if ($path['setting'] == 'documentRoot') {
-	                $docRoot = $path['path']; 
+	                $docRoot = $path['path'];
 	            }
 	        }
         }
-        
         // check document path internal/external to web root
         // compare SYSTEM_DIR to root path of documentRoot
         // NOTE preg_replace is to ensure all slash separators are the same (forward slash)
@@ -121,15 +121,15 @@ class complete extends Step {
                                                  . '<td class="warning" colspan="2">Your document directory is set to the default, which is inside the web root. '
                                                  . 'This may present a security problem if your documents can be accessed from the web, '
                                                  . 'working around the permission system in KnowledgeTree.</td>';
-                                                 if($this->paths_check == 'tick')
-                                                 	$this->paths_check = 'cross_orange';
-                                                 $this->warnings[] = 'Move var directory';
+			$this->paths_check = 'cross_orange';
+			$this->warnings[] = 'Move var directory';
+			$this->pathsSection = false;
         }
         else {
             $this->temp_variables['docLocation'] = sprintf($html, 'tick', '', 'Your document directory is outside the web root.');
         }
     }
-    
+
     private function checkDb()
     {
         // defaults
@@ -146,16 +146,17 @@ class complete extends Step {
         $loaded = $this->util->dbUtilities->getDatabaseLink();
         if (!$loaded) {
             $this->temp_variables['dbConnectAdmin'] .= '<td><div class="cross"></div></td>'
-                                               		.  '<td class="error">Unable to connect to database (user: ' 
+                                               		.  '<td class="error">Unable to connect to database (user: '
                                                		. $dbconf['dmsname'] . ')</td>';
 			$this->database_check = 'cross';
             $this->temp_variables['dbConnectAdmin'] .= sprintf($html, 'cross', 'class="error"', 'Unable to connect to database (user: ' . $dbconf['dmsname'] . ')');
+            $this->privilegesSection = false;
         }
         else
         {
             $this->temp_variables['dbConnectAdmin'] .= sprintf($html, 'tick', '', 'Database connectivity successful (user: ' . $dbconf['dmsname'] . ')');
         }
-        
+
         // make db connection - user
         $this->util->dbUtilities->load($dbconf['dhost'], $dbconf['dport'], $dbconf['dmsusername'], $dbconf['dmsuserpassword'], $dbconf['dname']);
         $loaded = $this->util->dbUtilities->getDatabaseLink();
@@ -170,17 +171,16 @@ class complete extends Step {
             {
                 $this->temp_variables['dbPrivileges'] .= '<td style="width:15px;"><div class="cross" style="float:left;"></div></td>'
                                                       .  '<td class="error" style="width:500px;">'
-                                                      .  'Unable to do a basic database query. Error: ' . $this->util->dbUtilities->getLastError()
-                                                      .  '</td>';
-                                                      $this->privileges_check = 'cross';
+                                                      .  'Unable to do a basic database query. Error: ' . $this->util->dbUtilities->getLastError()                                                   .  '</td>';
 				$this->privileges_check = 'cross';
+				$this->privilegesSection = false;
             }
             else
             {
                 $this->temp_variables['dbPrivileges'] .= sprintf($html, 'tick', '', 'Basic database query successful');
-                
+
             }
-            
+
             // check transaction support
             $sTable = 'system_settings';
             $this->util->dbUtilities->startTransaction();
@@ -190,6 +190,7 @@ class complete extends Step {
             if (!$res) {
                 $this->temp_variables['dbTransaction'] .= sprintf($html, 'cross', 'class="error"', 'Transaction support not available in database');
                 $this->privileges_check = 'cross';
+                $this->privilegesSection = false;
             } else {
                 $this->temp_variables['dbTransaction'] .= sprintf($html, 'tick', '', 'Database has transaction support');
             }
@@ -200,7 +201,7 @@ class complete extends Step {
             $this->temp_variables['dbConnectUser'] .= sprintf($html, 'cross', 'class="error"', 'Unable to connect to database (user: ' . $dbconf['dmsusername'] . ')');
         }
     }
-    
+
     private function checkServices()
     {
         $services = new services();
@@ -215,10 +216,10 @@ class complete extends Step {
 				$this->temp_variables[$serviceName."Status"] = 'cross_orange';
 				$this->services_check = 'cross_orange';
 			}
-        }     
+        }
 		return true;
     }
-    
+
     function checkInstallType() {
     	if ($this->util->isMigration()) {
     		$this->migrate_check = true;
@@ -226,7 +227,7 @@ class complete extends Step {
     		$this->migrate_check = false;
     	}
     }
-    
+
     /**
      * Set all silent mode varibles
      *
@@ -238,6 +239,10 @@ class complete extends Step {
     	$this->temp_variables['database_check'] = $this->database_check;
     	$this->temp_variables['migrate_check'] = $this->migrate_check;
     	$this->temp_variables['servicesValidation'] = $this->servicesValidation;
+    	//if(!$this->pathsSection) {die;} else {echo 'huh';}
+    	$this->temp_variables['pathsSection'] = $this->pathsSection;
+    	$this->temp_variables['databaseSection'] = $this->databaseSection;
+    	$this->temp_variables['privilegesSection'] = $this->privilegesSection;
     }
 }
 ?>
 \ No newline at end of file
@@ -48,7 +48,7 @@ class dependencies extends Step
 	private $versionSection = false;
 	private $extensionSection = false;
 	private $configurationSection = false;
-	
+
 	/**
 	* Flag to store class information in session
 	*
@@ -167,7 +167,7 @@ class dependencies extends Step
     public function getWarnings() {
         return $this->warnings;
     }
-    
+
     /**
      * Get the variables to be passed to the template
      *
@@ -264,7 +264,7 @@ class dependencies extends Step
         }
         $check['class'] = 'tick';
         $check['version'] =  "You are running version <b>{$phpversion}</b>.";
-		
+
         return $check;
     }
@@ -337,7 +337,7 @@ class dependencies extends Step
 	            array('extension' => 'mysql', 'required' => 'yes', 'name' => 'MySQL', 'details' => 'Used for accessing a MySQL database.'),
 	            array('extension' => 'curl', 'required' => 'yes', 'name' => 'cURL', 'details' => 'Allows the connection and communication between different servers types using various protocols.'),
 	            array('extension' => 'xmlrpc', 'required' => 'yes', 'name' => 'XMLRPC', 'details' => 'Used with XML-RPC servers and clients.'),
-	            array('extension' => 'win32', 'required' => 'no', 'name' => 'Win32', 'details' => 'Allows control of Microsoft Windows services.'),
+	            array('extension' => 'win32service', 'required' => 'no', 'name' => 'Win32 Services', 'details' => 'Allows control of Microsoft Windows services.'),
 	            array('extension' => 'mbstring', 'required' => 'no', 'name' => 'Multi Byte Strings', 'details' => 'Used in the manipulation of multi-byte strings.'),
 	            array('extension' => 'ldap', 'required' => 'no', 'name' => 'LDAP', 'details' => 'Used to access LDAP directory servers.'),
 	            array('extension' => 'json', 'required' => 'yes', 'name' => 'JSON', 'details' => 'Implements the javascript object notation (json) data-interchange format.'),
@@ -392,7 +392,7 @@ class dependencies extends Step
             array('name' => 'Memory limit', 'configuration' => 'memory_limit', 'recommended' => '32M', 'type' => 'int'),
         );
     }
-    
+
     public function storeSilent() {
 	  	$this->temp_variables['versionSection'] = $this->versionSection;
 		$this->temp_variables['extensionSection'] = $this->extensionSection;
@@ -280,6 +280,14 @@ class registration extends Step
     	);
     	$countries = array(
+    		'noneselected' => 'Select Country...',
+            'US' => 'UNITED STATES',
+            'GB' => 'UNITED KINGDOM',
+            'FR' => 'FRANCE',
+            'DE' => 'GERMANY',
+            'IT' => 'ITALY',
+            'PT' => 'PORTUGAL',
+            'ES' => 'SPAIN',
             'AF' => 'AFGHANISTAN',
             'AX' => '&Aring;LAND ISLANDS',
             'AL' => 'ALBANIA',
@@ -353,14 +361,12 @@ class registration extends Step
             'FO' => 'FAROE ISLANDS',
             'FJ' => 'FIJI',
             'FI' => 'FINLAND',
-            'FR' => 'FRANCE',
             'GF' => 'FRENCH GUIANA',
             'PF' => 'FRENCH POLYNESIA',
             'TF' => 'FRENCH SOUTHERN TERRITORIES',
             'GA' => 'GABON',
             'GM' => 'GAMBIA',
             'GE' => 'GEORGIA',
-            'DE' => 'GERMANY',
             'GH' => 'GHANA',
             'GI' => 'GIBRALTAR',
             'GR' => 'GREECE',
@@ -387,9 +393,7 @@ class registration extends Step
             'IE' => 'IRELAND',
             'IM' => 'ISLE OF MAN',
             'IL' => 'ISRAEL',
-            'IT' => 'ITALY',
             'JM' => 'JAMAICA',
-            'JP' => 'JAPAN',
             'JE' => 'JERSEY',
             'JO' => 'JORDAN',
             'KZ' => 'KAZAKHSTAN',
@@ -456,7 +460,6 @@ class registration extends Step
             'PH' => 'PHILIPPINES',
             'PN' => 'PITCAIRN',
             'PL' => 'POLAND',
-            'PT' => 'PORTUGAL',
             'PR' => 'PUERTO RICO',
             'QA' => 'QATAR',
             'RE' => 'REUNION',
@@ -486,7 +489,6 @@ class registration extends Step
             'SO' => 'SOMALIA',
             'ZA' => 'SOUTH AFRICA',
             'GS' => 'SOUTH GEORGIA AND THE SOUTH SANDWICH ISLANDS',
-            'ES' => 'SPAIN',
             'LK' => 'SRI LANKA',
             'SD' => 'SUDAN',
             'SR' => 'SURINAME',
@@ -512,8 +514,6 @@ class registration extends Step
             'UG' => 'UGANDA',
             'UA' => 'UKRAINE',
             'AE' => 'UNITED ARAB EMIRATES',
-            'GB' => 'UNITED KINGDOM',
-            'US' => 'UNITED STATES',
             'UM' => 'UNITED STATES MINOR OUTLYING ISLANDS',
             'UY' => 'URUGUAY',
             'UZ' => 'UZBEKISTAN',
@@ -40,63 +40,63 @@
 * @version Version 0.1
 */
-class Template 
+class Template
 {
 	/**
 	* Hold all the variables that are going to be imported into the template file
 	* @var array
 	*/
-    var $template_vars = Array(); 
+    var $template_vars = Array();
+
-	
     /**
 	* Constructor
-	* 
+	*
 	* @author KnowledgeTree Team
 	* @param string $file the file name you want to load
 	* @access public
 	* @return void
 	*/
-    public function Template($file = null) 
+    public function Template($file = null)
 	{
         $this->file = $file;
     }
-	
+
 	/**
 	* Set a variable into the template
 	* If the variable is a template object, go and call its template::fetch() method
-	* 
+	*
 	* @author KnowledgeTree Team
 	* @param string $name The name for this value in the template file
 	* @param string $value The value to show in the template file
 	* @access public
 	* @return void
 	*/
-    public function set($name, $value) 
+    public function set($name, $value)
 	{
 		//if(is_a($value, 'Template')) {
 		$class = 'Template';
 		$isA = $value instanceof $class;
 		if($isA) {
-			$value = $value->fetch();	
+			$value = $value->fetch();
 		}
 		$this->template_vars[$name] = $value;
     }
-    
+
 	/**
 	* Create the template and import its variables
-	* 
+	*
 	* @author KnowledgeTree Team
 	* @param string $file The file to use as the template
 	* @access public
 	* @return string The parsed template
 	*/
-    public function fetch($file = null) 
+    public function fetch($file = null)
 	{
         if (is_null($file)) $file = $this->file;
-        
+
         $file = WIZARD_DIR . $file;
 		if (!file_exists($file)) {
 			trigger_error('Template file '.$file.' does not exist ', E_USER_ERROR);
@@ -105,10 +105,10 @@ class Template
         extract($this->template_vars); // Extract the vars to local namespace
         ob_start();
 		include($file);
-        $contents = ob_get_contents(); 
-        ob_end_clean();              
+        $contents = ob_get_contents();
+        ob_end_clean();
         return $contents;
     }
-	
+
 }
 ?>
 \ No newline at end of file
 <form id="install_complete_none">
-	<p class="title">Installation Completed</p>
-
-	<p class="description">This allows you to check that your KnowledgeTree configuration is set
-	up correctly.  You can run this at any time after configuration to check
-	that things are still set up correctly.</p>
-	
-	<?php
-//	if($errors || $warnings){
-	    echo '<div>'
-	       . '<a href="http://wiki.knowledgetree.com/Web_Based_Installer#Post_Install" target="_blank">'
-	       . 'Click Here for help on overcoming post install issues</a></div><br/>';
-//	}
-	?>
+	<p class="title">
+		Installation Completed
+	</p>
+	<p class="description">
+		This allows you to check that your KnowledgeTree configuration is set up correctly.
+		<br/>
+		Use the Finish link to login to the system using username: <b><i>admin</b></i> and password: <b><i>admin</b></i>.
+<!--		You can run this at any time after configuration to check	that things are still set up correctly.-->
+	</p>
+	<div>
+		<a href="http://wiki.knowledgetree.com/Web_Based_Installer#Post_Install" target="_blank">
+			Click Here for help on overcoming post install issues
+		</a>
+	</div>
+	<br/>
 	<div id="step_content_<?php echo $step_name; ?>" class="step">
-	
 	<?php if(!$servicesValidation) { ?>
 		<h3>Services</h3>
 		The KnowledgeTree services need to be started to allow for optimal functioning of the search, indexing and pdf generation.
 		<?php if(!WINDOWS_OS) { ?>
-		To start the services, execute the dmsctl.sh shell script in the KnowledgeTree directory from a terminal.<br/><br/>
+		To start the services, execute the dmsctl.sh shell script in the KnowledgeTree directory from a terminal.
+		<br/>
+		<br/>
 		<?php } else { ?>
-		To start the services, execute the dmsctl.bat batch file in the KnowledgeTree directory from a command prompt, run as administrator.<br/><br/>
+		To start the services, execute the dmsctl.bat batch file in the KnowledgeTree directory from a command prompt, run as administrator.
+		<br/>
+		<br/>
 		<?php } ?>
 		<p class="disclaimer">
 		<?php if(WINDOWS_OS) { ?>
-		cd KnowledgeTree_Installation_Folder<br/>
-		dmsctl.bat install<br/>
-		dmsctl.bat start
+			cd KnowledgeTree_Installation_Folder<br/>
+			dmsctl.bat install<br/>
+			dmsctl.bat start
 		<?php } else { ?>
-		cd /usr/share/knowledgetree-ce<br/>
-		sudo ./dmsctl.sh start
+			cd /usr/share/knowledgetree-ce<br/>
+			sudo ./dmsctl.sh start
 		<?php } ?>
 		</p>
-		
 		<br/>
 	<?php } ?>
 	<!--	Paths and Permissions	-->
-		<div>
-		    <h3><?php echo "<span class='{$paths_check}'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span>"; ?>Paths and Permissions</h3>
+	<?php
+		$iconFlag = "<span class='{$paths_check}'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span>";
+		$checkHeading = "<h3 style='width:35%; float:left;'>".$iconFlag."Paths and Permissions</h3>";
+	?>
+<!--		<div>-->
+			<?php if($pathsSection) {
+				$details = 'Show Details';
+				$display = 'none';
+			} else {
+				$details = 'Hide Details';
+				$display = 'block';
+			}?>
+<!--		    <h3><?php //echo "<span class='{$paths_check}'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span>"; ?>Paths and Permissions</h3>-->
 		<?php if($silent) { ?>
-			<div id="option8" class="onclick" onclick="javascript:{w.toggleClass('paths_check', 'option8');}">Show Details</div>
-			<div class="paths_check" style="display:none">
+<!--			<div id="option8" class="onclick" onclick="javascript:{w.toggleClass('paths_check', 'option8');}">Show Details</div>-->
+<!--			<div class="paths_check" style="display:none">-->
 		<?php } ?>
-		    <table>
+			<?php
+				$pathsCheck = $checkHeading;
+				$pathsCheck .= "<div id='option8' class='onclick' onclick='javascript:{w.toggleClass(\"paths_check\", \"option8\");}'>";
+				$pathsCheck .= $details."</div>";
+				$pathsCheck .= "<div class='paths_check dependency_details' style='display:".$display.";'>";
+				echo $pathsCheck;
+			?>
+		    <table class="description_complete">
+<!--			<table class="description">-->
 		        <tr><?php echo $varDirectory; ?></tr>
 		        <tr><?php echo $documentRoot; ?></tr>
 		        <tr><?php echo $logDirectory; ?></tr>
@@ -54,39 +77,78 @@
 		<?php if($silent) { ?>
 			</div>
 		<?php } ?>
-		</div>
-		<br/><br/>
-		<div>
+<!--		</div>-->
+		<br/>
+		<br/>
+<!--		<div>-->
 	<!--	Database connectivity	-->
-		    <h3><?php echo "<span class='{$database_check}'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span>"; ?>Database connectivity</h3>
+	<?php
+		$iconFlag = "<span class='{$database_check}'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span>";
+		$checkHeading = "<h3 style='width:35%; float:left;'>".$iconFlag."Database connectivity</h3>";
+	?>
+			<?php if($databaseSection) {
+				$details = 'Show Details';
+				$display = 'none';
+			} else {
+				$details = 'Hide Details';
+				$display = 'block';
+			}?>
+<!--		    <h3><?php //echo "<span class='{$database_check}'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span>"; ?>Database connectivity</h3>-->
 		<?php if($silent) { ?>
-			<div id="option9" class="onclick" onclick="javascript:{w.toggleClass('database_check', 'option9');}">Show Details</div>
-			<div class="database_check" style="display:none">
+<!--			<div id="option9" class="onclick" onclick="javascript:{w.toggleClass('database_check', 'option9');}">Show Details</div>-->
+<!--			<div class="database_check" style="display:none">-->
+			<?php
+				$databaseCheck = $checkHeading;
+				$databaseCheck .= "<div id='option9' class='onclick' onclick='javascript:{w.toggleClass(\"database_check\", \"option9\");}'>";
+				$databaseCheck .= $details."</div>";
+				$databaseCheck .= "<div class='database_check dependency_details' style='display:".$display.";'>";
+				echo $databaseCheck;
+			?>
 		<?php } ?>
-		    <table>
+		    <table class="description_complete">
 		        <tr><?php echo $dbConnectAdmin; ?></tr>
 		        <tr><?php echo $dbConnectUser; ?></tr>
 		    </table>
 		<?php if($silent) { ?>
 		</div>
 	<!--	Privileges	-->
-		<br/><br/>
+		<br/>
+		<br/>
 		<?php } ?>
-		    <h3><?php echo "<span class='{$privileges_check}'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span>"; ?>Privileges</h3>
+	<?php
+		$iconFlag = "<span class='{$privileges_check}'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span>";
+		$checkHeading = "<h3 style='width:35%; float:left;'>".$iconFlag."Privileges</h3>";
+	?>
+			<?php if($privilegesSection) {
+				$details = 'Show Details';
+				$display = 'none';
+			} else {
+				$details = 'Hide Details';
+				$display = 'block';
+			}?>
+<!--		    <h3><?php //echo "<span class='{$privileges_check}'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span>"; ?>Privileges</h3>-->
 		<?php if($silent) { ?>
-			<div id="option1" class="onclick" onclick="javascript:{w.toggleClass('privileges_check', 'option1');}">Show Details</div>
-			<div class="privileges_check" style="display:none">
+<!--			<div id="option1" class="onclick" onclick="javascript:{w.toggleClass('privileges_check', 'option1');}">Show Details</div>-->
+<!--			<div class="privileges_check" style="display:none">-->
+			<?php
+				$privilegesCheck = $checkHeading;
+				$privilegesCheck .= "<div id='option1' class='onclick' onclick='javascript:{w.toggleClass(\"privileges_check\", \"option1\");}'>";
+				$privilegesCheck .= $details."</div>";
+				$privilegesCheck .= "<div class='privileges_check dependency_details' style='display:".$display.";'>";
+				echo $privilegesCheck;
+			?>
 		<?php } ?>
-		    <table style="width:265px;">
+		    <table class="description_complete">
 		        <tr><?php echo $dbPrivileges; ?></tr>
 		        <tr><?php echo $dbTransaction; ?></tr>
 		    </table>
 		<?php if($silent) { ?>
 			</div>
 		<?php } ?>
-		</div>
+<!--		</div>-->
 	<!--	Services	-->
-		<br/><br/>
+		<br/>
+<!--		<br/>-->
 <?php if($servicesValidation) { ?>
 <?php if(!$migrate_check) { ?>
 		<div>
@@ -95,7 +157,8 @@
 			<div id="option2" class="onclick" onclick="javascript:{w.toggleClass('services_check', 'option2');}">Show Details</div>
 			<div class="services_check" style="display:none">
 		<?php } ?>
-		    <table style="width:755px;">
+<!--		    <table class="description_complete">-->
+			<table class="description">
 		        <tr>
 		        	<td style="width:15px;"> <?php echo "<span class='{$LuceneStatus}'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span>"; ?> </td>
 		        	<td style="width:640px;"> Lucene Service <?php if ($LuceneStatus != 'tick') { ?> Could not be started <?php } else { ?> Started <?php } ?></td>
@@ -108,7 +171,7 @@
 						<?php } ?>
 		        		</td>
 		        	<?php } ?>
-		        </tr> 
+		        </tr>
 		        <tr>
 		        	<td> <?php echo "<span class='{$SchedulerStatus}'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span>"; ?> </td>
 		        	<td> Scheduler Service <?php if ($SchedulerStatus != 'tick') { ?> Could not be started <?php } else { ?> Started <?php } ?></td>
@@ -154,7 +217,7 @@
         $root_url = substr($script, 0, $pos);
         if($port == '')
         	$redirect = "http://".$_SERVER['SERVER_NAME'].$root_url."/admin.php";
-        else 
+        else
         	$redirect = "http://".$_SERVER['SERVER_NAME'].":$port".$root_url."/admin.php";
 	?>
 	<?php if($migrate_check) { ?>
 <form id="dependencies_configuration_services" action="index.php?step_name=<?php echo $step_name; ?>" method="post">
 	<p class="title">Checking System Configuration</p>
-	
+
 	<p class="description">
 	The wizard will review your system to determine whether KnowledgeTree is correctly configured. You&rsquo;ll see whether KnowledgeTree has the correct settings or whether changes are required.
 	</p>
@@ -34,7 +34,7 @@
 	<!--Content-->
 	<div id="step_content_<?php echo $step_name; ?>" class="step">
 	<h3>Server Settings</h3>
-	
+
 	<p class="description">
 	The settings below have been drawn from the system information. The host and port should reflect the host and port that will be used to access KnowledgeTree. The Root Url is only needed if your installation is in a directory off the main web server root.
 	</p>
@@ -64,7 +64,7 @@
 	    <tr>
 	        <td> <label for='yes'>Do you have SSL Enabled?: </label> </td>
 	        <td> <div id="tooltips" title="Whether or not you have SSL installed">&nbsp;</div> </td>
-	        <td> 
+	        <td>
 	        	<label for='yes'>Yes</label>
 	        	<input class="radio" type='radio' name='ssl_enabled' id='yes' value='yes' <?php echo $server['ssl_enabled']['value'] == 'yes' ? 'CHECKED' : ''; ?> />
 	        	&nbsp;&nbsp;&nbsp;
@@ -73,7 +73,7 @@
 			</td>
 	    </tr>
 	</table>
-	
+
 	<h3><?php echo "<span class='{$paths_perms}'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span>"; ?>Paths and Permissions</h3>
 	<?php if($silent) { ?>
 		<div id="option7" class="onclick" onclick="javascript:{w.toggleClass('paths_perms', 'option7');}">Show Details</div>
@@ -118,4 +118,4 @@
     <input type="submit" name="Previous" value="Previous" class="button_previous"/>
     <input type="submit" name="Next" value="Next" class="button_next"/>
 </form>
 -<?php if (AJAX) { echo $html->js('form.js'); } ?>
+<?php if (AJAX) { echo $html->js('form.js'); } ?>
 \ No newline at end of file
@@ -55,24 +55,30 @@
 		        <td><?php echo $server['ssl_enabled']['value']; ?></td>
 		    </tr>
 		</table>
-		
+
 		<h3>Paths and Permissions</h3>
-		
+
 		<table class="conf_paths">
 		<?php
 			if($errors || $warnings) {
 				$width = "50%";
+				$width = "40%";
 			} else {
 				$width = "60%";
 			}
+			$td1 = "10";
+			$td2 = "32%";
+			$td3 = "27%";
+			$td4 = "27%";
+			$td5 = "10";
 		    foreach ($paths as $key => $path){
 		?>
 			<tr>
-				<td width="10"><div class='<?php echo $path['class']; ?>'></div></td>
-				<td width="22%"><?php echo $path['name']; ?>:</td>
+				<td width="<?php echo $td1; ?>"><div class='<?php echo $path['class']; ?>'></div></td>
+				<td width="<?php echo $td2; ?>"><?php echo $path['name']; ?>:</td>
 				<td width="<?php echo $width; ?>"><?php echo $path['path']; ?></td>
 	    		<?php if($path['class'] != 'tick') {	?>
-	    			<td class="error" width="27%"> <?php echo $path['msg']; ?> </td>
+	    			<td class="error" width="<?php echo $td3; ?>"> <?php echo $path['msg']; ?> </td>
 	    			<td width="10">
 					<?php if (AJAX) { ?>
 						<a href="#" class="refresh" onclick="w.refresh('configuration')">Refresh</a>
@@ -81,8 +87,8 @@
 					<?php } ?>
 	    			</td>
 	    		<?php } else { ?>
-	    			<td class="error" width="27%"> </td>
-	    			<td width="10"> </td>
+	    			<td class="error" width="<?php echo $td4; ?>"> </td>
+	    			<td width="<?php echo $td5; ?>"> </td>
 	    		<?php } ?>
 			</tr>
 		<?php
@@ -94,4 +100,4 @@
     <input type="submit" name="Confirm" value="Confirm" class="button_next"/>
     <input type="submit" name="Edit" value="Edit"  class="button_next"/>
 </form>
 -<?php if (AJAX) { echo $html->js('form.js'); } ?>
+<?php if (AJAX) { echo $html->js('form.js'); } ?>
 \ No newline at end of file
@@ -52,9 +52,11 @@
 		        <td id="error" class="error"><?php if($errors['dpassword']) echo $errors['dpassword']; ?></td>
 		    </tr>
 	</table>
-<br/><br/>
+<br/>
+<!--<br/>-->
 	<div id="option3" class="onclick" onclick="javascript:{w.toggleClass('adv_options', 'option3');}">&nbsp;&nbsp;Advanced Options</div>
 	<div id="database" class="adv_options" style="display:none;">
+	<br/>
 	    <div class="description">
 	        These options are only necessary for some sites. If you're not sure what you should enter here, leave the default settings.
 	    </div>
 <form id="license_dependencies_configuration" action="index.php?step_name=<?php echo $step_name; ?>" method="post">
 	<p class="title">Checking PHP Dependencies</p>
 	<p class="description">
-	The wizard will review your system to determine whether you have the right PHP components in place to run KnowledgeTree. <br/>
-	Once the scan is completed, you&rsquo;ll see whether your system has met the requirements or whether there are areas you need to address. 
+	The wizard will review your system to determine whether you have the right PHP components in place to run KnowledgeTree. <!--<br/> -->
+	Once the scan is completed, you&rsquo;ll see whether your system has met the requirements or whether there are areas you need to address.
 	</p>
 <!--Continue Message-->
 	<?php
@@ -10,7 +10,8 @@
 			?>
 				<span class='big_ok'>&nbsp;&nbsp;&nbsp;</span>
 				<span class='description'>Congratulations! Your system is ready to run KnowledgeTree. Click <b>Next</b> to continue.</span>
-				<br/><br/>
+				<br/>
+<!--				<br/>-->
 			<?php
 		}
 	?>
@@ -18,19 +19,29 @@
 	<?php if($errors) { ?>
 		<span class='cross'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span>
 		<span class='error_message'>Your system is not quite ready to run KnowledgeTree. See the list below to determine which areas you need to address. </span>
-		<br/>
+		<!--<br/>-->
 	<?php } elseif ($warnings) { ?>
 			<span class='cross_orange'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span>
-			<span class='warning_message'>Not all optional dependencies required by KnowledgeTree have been met but you will be able to continue.</span><br/>
+			<span class='warning_message'>Not all optional dependencies required by KnowledgeTree have been met but you will be able to continue.</span>
+		<!--<br/>-->
 	<?php } ?>
 	<?php
 		if($errors || $warnings) {
 			?>
-		    	&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<a href="http://wiki.knowledgetree.com/Web_Based_Installer#PHP_Dependencies" target="_blank" class="description_click">Click here for help on overcoming dependency issues</span></a>
+<!--&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;-->
+		    	<a href="http://wiki.knowledgetree.com/Web_Based_Installer#PHP_Dependencies" target="_blank" class="description_click">Click here for help on overcoming dependency issues</span></a>
 	<?php } ?>
 <!--Content-->
 	<div id="step_content_<?php echo $step_name; ?>" class="step">
-		<h3><?php echo "<span class='{$php}'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span>"; ?>PHP Version Check</h3>
+	<?php
+		$iconFlag = "<span class='{$php}'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span>";
+		$checkHeading = "<h3 style='width:30%; float:left'>".$iconFlag."PHP Version Check</h3>";
+	?>
+<!--		<h3>-->
+			<?php
+//				echo "<span class='{$php}'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span>";
+			?>
+<!--		PHP Version Check</h3>-->
 		<?php if($silent) { ?>
 			<?php if($versionSection) {
 				$details = 'Hide Details';
@@ -40,25 +51,43 @@
 				$display = 'none';
 			}
 			?>
-			<div id="option1" class="onclick" onclick="javascript:{w.toggleClass('php_details', 'option1');}"><?php echo $details; ?></div>
-			<div class="php_details" style="display:<?php echo $display; ?>">
+			<?php
+				$phpVersionCheck = $checkHeading;
+				$phpVersionCheck .= "<div id='option1' class='onclick' onclick='javascript:{w.toggleClass(\"php_details\", \"option1\");}'>";
+				$phpVersionCheck .= $details."</div>";
+				$phpVersionCheck .= "<div class='php_details dependency_details' style='display:".$display.";'>";
+			?>
+<!--			<div id="option1" class="onclick" onclick="javascript:{w.toggleClass('php_details', 'option1');}"> <?php //echo $details; ?></div>-->
+<!--			<div class="php_details" style="display:<?php //echo $display; ?>">-->
 		<?php } ?>
-		<p class="description">
+		<?php
+			$phpVersionCheck .= "<p class='space'>&nbsp;</p><p class='description'>Your version of PHP must be between 5.0 and 5.2 to run optimally. Versions that are 5.3 or higher  are not recommended.</p>";
+		?>
+<!--		<p class="description">
 		Your version of PHP must be between 5.0 and 5.2 to run optimally. Versions that are 5.3 or higher  are not recommended.
-		</p>
-		<?php echo "<span class='{$version['class']}'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span>{$version['version']}"; ?>
+		</p>-->
+		<?php $phpVersionCheck .= "<span class='{$version['class']}'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span>{$version['version']}"; ?>
+		<?php //echo "<span class='{$version['class']}'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span>{$version['version']}"; ?>
 		<?php if($version['class'] != 'tick') { ?>
 			<?php if (AJAX) { ?>
-				<a href="#" class="refresh" onclick="w.refresh('dependencies')">Refresh</a>
+			<?php $phpVersionCheck .= "<a href='#' class='refresh' onclick='w.refresh('dependencies')'>Refresh</a>"; ?>
+<!--				<a href="#" class="refresh" onclick="w.refresh('dependencies')">Refresh</a>-->
 			<?php } else { ?>
-				<a href="javascript:this.location.reload();" class="refresh">Refresh</a>
+			<?php $phpVersionCheck .=  "<a href='javascript:this.location.reload();' class='refresh'>Refresh</a>"; ?>
+<!--				<a href="javascript:this.location.reload();" class="refresh">Refresh</a>-->
 			<?php } ?>
 		<?php } ?>
 		<?php if($silent) { ?>
-			</div>
+			<?php $phpVersionCheck .= "</div>"; ?>
+<!--			</div>-->
 		<?php } ?>
+		<?php echo $phpVersionCheck; ?>
 		<br />
-		<h3><?php echo "<span class='{$php_ext}'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span>"; ?>PHP Extensions</h3>
+	<?php
+		$iconFlag = "<span class='{$php_ext}'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span>";
+		$checkHeading = "<h3 style='width:30%; float:left'>".$iconFlag."PHP Extensions</h3>";
+	?>
+<!--		<h3><?php //echo "<span class='{$php_ext}'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span>"; ?>PHP Extensions</h3>-->
 		<?php
 		if($silent) { ?>
 			<?php if($extensionSection) {
@@ -69,12 +98,23 @@
 				$display = 'none';
 			}
 			?>
-			<div id="option2" class="onclick" onclick="javascript:{w.toggleClass('php_ext_details', 'option2');}"><?php echo $details; ?></div>
-			<div class="php_ext_details" style="display:<?php echo $display; ?>">
+			<?php
+				$phpExtensionCheck = $checkHeading;
+				$phpExtensionCheck .= "<div id='option2' class='onclick' onclick='javascript:{w.toggleClass(\"php_ext_details\", \"option2\");}'>";
+				$phpExtensionCheck .= $details."</div>";
+				$phpExtensionCheck .= "<div class='php_ext_details dependency_details' style='display:".$display.";'>";
+			?>
+<!--			<div id="option2" class="onclick" onclick="javascript:{w.toggleClass('php_ext_details', 'option2');}"><?php //echo $details; ?></div>-->
+<!--			<div class="php_ext_details" style="display:<?php //echo $display; ?>">-->
 		<?php } ?>
-		<p class="description">
+		<?php
+			$phpExtensionCheck .= "<p class='space'>&nbsp;</p><p class='description'>The extensions shown in red below are required for KnowledgeTree to run optimally. Items shown in orange are optional, but recommended.</p>";
+		?>
+<!--		<p class="description">
 			The extensions shown in red below are required for KnowledgeTree to run optimally. Items shown in orange are optional, but recommended.
-		</p>
+		</p>-->
+		<br/>
+		<?php echo $phpExtensionCheck; ?>
 		<table class="description">
 		<?php
 		    foreach($extensions as $ext) {
@@ -118,7 +158,11 @@
 			</div>
 		<?php } ?>
 		<br />
-		<h3><?php echo "<span class='{$php_con}'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span>"; ?>PHP Configuration</h3>
+		<?php
+			$iconFlag = "<span class='{$php_con}'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span>";
+			$checkHeading = "<h3 style='width:30%; float:left'>".$iconFlag."PHP Configurations</h3>";
+		?>
+<!--		<h3><?php //echo "<span class='{$php_con}'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span>"; ?>PHP Configuration</h3>-->
 		<?php
 		if($silent) { ?>
 			<?php if($configurationSection) {
@@ -129,12 +173,25 @@
 				$display = 'none';
 			}
 			?>
-			<div id="option3" class="onclick" onclick="javascript:{w.toggleClass('php_con_details', 'option3');}"><?php echo $details; ?></div>
-			<div class="php_con_details" style="display:<?php echo $display; ?>">
+			<?php
+				$phpDirectivesCheck = $checkHeading;
+				$phpDirectivesCheck .= "<div id='option3' class='onclick' onclick='javascript:{w.toggleClass(\"php_con_details\", \"option3\");}'>";
+				$phpDirectivesCheck .= $details."</div>";
+				$phpDirectivesCheck .= "<div class='php_con_details dependency_details' style='display:".$display.";'>";
+			?>
+<!--			<div id="option3" class="onclick" onclick="javascript:{w.toggleClass('php_con_details', 'option3');}"><?php //echo $details; ?></div>-->
+<!--			<div class="php_con_details" style="display:<?php //echo $display; ?>">-->
 		<?php } ?>
-		<p class="description">
-		The configurations shown in red below are required for KnowledgeTree to run optimally. Items shown in orange are optional, but recommended.
-		</p>
+		<?php
+			//$phpDirectivesCheck .= "<p class='description'>The configurations shown in red below are required for KnowledgeTree to run optimally. Items shown in orange are optional, but recommended.</p>";
+			//$phpDirectivesCheck .= "Test";
+			$phpDirectivesCheck .= "<p class='space'>&nbsp;</p><p class='description'>The configurations shown in red below are required for KnowledgeTree to run optimally. Items shown in orange are optional, but recommended.</p>";
+		?>
+<!--		<p class="description">-->
+<!--		The configurations shown in red below are required for KnowledgeTree to run optimally. Items shown in orange are optional, but recommended.-->
+<!--		</p>-->
+		<br/>
+		<?php echo $phpDirectivesCheck; ?>
 		<table class="description">
 		<tr>
 		    <th>Setting</th>
 <form id="registration_install_complete" action="index.php?step_name=<?php echo $step_name; ?>" method="post">
 	<p class="title">Finalizing System Installation</p>
 	<div id="step_content_<?php echo $step_name; ?>" class="step">
-		<p class="empty_space">	The wizard will now complete the installation and run a final check on your system.	</p>
-		<br/>
-		<p class="empty_space" id="left_space">
-			We would greatly appreciate it if you would allow us to collect anonymous usage statistics to help us provide a better quality product. 
-			<br/><br/>
+		<p class="empty_space" style="font-size:11pt;">	The wizard will now complete the installation and run a final check on your system.	</p>
+<!--		<br/>-->
+		<p class="empty_space" style="font-size:11pt;" id="left_space">
+			We would greatly appreciate it if you would allow us to collect anonymous usage statistics to help us provide a better quality product.
+			<br/>
+			<br/>
 			The information includes a unique identification number, number of users you have created, your operating system type and your IP address. Your privacy is protected by the <a href="http://www.knowledgetree.com/about/legal" target="_blank">KnowledgeTree Privacy and Data Protection Agreements.</a>
 		</p>
 		<div class="demo"><?php echo $html->image('greenit.jpg', array('style'=>'padding-left: 35px;')); ?></div>
-		<br/><br/><br/><br/>
+<!--		<br/><br/><br/><br/>-->
 <p>		<input type='checkbox' name='call_home' value='enable' checked style="float:left;"/>&nbsp;&nbsp;
 		<label for='call_home'>Help to improve KnowledgeTree by providing anonymous usage statistics</label></p>
 	</div>
@@ -4,12 +4,13 @@
         foreach($errors as $k=>$e) {
                 echo "<span class='error'>".$e."</span>";
         }
+        //print_r($errors);
     }?>
 <p class="description">
 Please read and accept the license agreement below before continuing with the setup.
 </p>
-<?php if(isset($errors)) { ?>
+<?php if(!empty($errors)) { ?>
 	<div class="license_agreement" tabindex="-1" style="height:270px;">
 <?php } else { ?>
 	<div class="license_agreement" tabindex="-1">
@@ -10,7 +10,11 @@
 	?>
 	<p class="description">
 	Register with KnowledgeTree to receive important product updates.
-	<a href="index.php?step_name=install">Skip Registration</a>
+	<?php if(AJAX) { ?>
+		<a href='#' onclick='javascript:{w.getUrl("index.php?step_name=install", "content_container");}'>Skip Registration</a>
+	<?php } else { ?>
+		<a href="index.php?step_name=install">Skip Registration</a>
+	<?php } ?>
 	</p>
 	<!-- Hidden Fields -->
 	<input type="hidden" id="sendAll" name="" value="" />
@@ -22,16 +26,17 @@
 	<br/>
 	<div id="step_content_<?php echo $step_name; ?>" class="step">
 		<span class="error" id="reg_error"></span>
-		<?php if(WINDOWS_OS) $input_width = 40; else { $input_width = 32; } ?>
-		<table>
+		<?php $rowspan = "6";?>
+		<?php if(WINDOWS_OS) $input_width = 40; else { $input_width = 28; } ?>
+		<table class="registration_template">
 		    <tr>
 		        <td><label for='first'>First Name</label></td>
-		        <td rowspan='6' width='5%'>&nbsp;</td>
+		        <td rowspan='<?php echo $rowspan; ?>' width='5%'>&nbsp;</td>
 		        <td><input value="<?php echo $first_name; ?>" name='submitted[first_name]' id='first' size='<?php echo $input_width; ?>' style="float:left;"/></td>
-		        <td rowspan='6' width='5%'>&nbsp;</td>
-		        <td rowspan='6'> <?php echo $html->image('dropbox.png'); ?> </td>
+		        <td rowspan='<?php echo $rowspan; ?>' width='5%'>&nbsp;</td>
+		        <td rowspan='<?php echo $rowspan; ?>'> <?php echo $html->image('dropbox.png'); ?> </td>
 		    </tr>
-		    
+
 		    <tr>
 		        <td><label for='last'>Last Name</label></td>
 		        <td><input value="<?php echo $last_name; ?>" name='submitted[last_name]' id='last' size='<?php echo $input_width; ?>' style="float:left;"/></td>
@@ -43,7 +48,7 @@
 		    <tr>
 		        <td><label for='country'>Country</label></td>
 		        <td>
-		            <select id='country' name='submitted[country]'>
+		            <select id='country' class="registration_select" name='submitted[country]'>
 		                <?php
 		                    $str = '';
 		                    foreach ($countries as $code => $country) {
@@ -52,9 +57,9 @@
 		                    	} else {
 		                    		$str .= "<option name='{$code}' value='{$country}'>{$country}</option>";
 		                    	}
-		                        
+
 		                    }
-		
+
 		                    echo $str;
 		                ?>
 		            </select>
@@ -63,7 +68,7 @@
 		    <tr>
 		        <td><label for='industry'>Industry</label></td>
 		        <td>
-		            <select id='industry' name='submitted[industry]'>
+		            <select id='industry' name='submitted[industry]' class="registration_select">
 		                <?php
 		                    $str = '';
 		                    foreach ($industries as $code => $industry) {
@@ -73,7 +78,7 @@
 		                        	$str .= "<option name='{$code}' value='{$industry}'>{$industry}</option>";
 		                    	}
 		                    }
-		
+
 		                    echo $str;
 		                ?>
 		            </select>
@@ -82,7 +87,7 @@
 		    <tr>
 		        <td><label for='size'>Organization Size</label></td>
 		        <td>
-		            <select id='size' name='submitted[organization_size]'>
+		            <select id='size' name='submitted[organization_size]' class="registration_select">
 		                <?php
 		                    $str = '';
 		                    foreach ($org_size as $code => $size) {
@@ -92,18 +97,18 @@
 		                        	$str .= "<option name='{$code}' value='{$size}'>{$size}</option>";
 	                    		}
 		                    }
-		
+
 		                    echo $str;
 		                ?>
 		            </select>
 		        </td>
 		    </tr>
 		</table>
-		
+
 		<input type='hidden' name='form_id' value='webform_client_form_242' />
 		<input type='hidden' name='op' value='Submit' />
 	</div>
-	
+
 	<input type="submit" name="Previous" value="Previous" onclick="w.pClick()" class="button_previous"/>
 	<input type="submit" name="Next" value="Register" onclick="w.nClick()" class="button_next"/>
 </form>
@@ -5,9 +5,9 @@
 <?php } ?>
 	<p class="title">Checking Service Dependencies</p>
-	
+
 	<p class="description">
-	The wizard will review your system to determine whether you can run KnowledgeTree background services. <br/>Once the scan is completed, you&rsquo;ll see whether your system has met the requirements or whether there are areas you need to address. 
+	The wizard will review your system to determine whether you can run KnowledgeTree background services. <br/>Once the scan is completed, you&rsquo;ll see whether your system has met the requirements or whether there are areas you need to address.
 	</p>
 <!--Continue Message-->
 <?php if($servicesValidation) { ?>
@@ -39,7 +39,7 @@
 	<?php } ?>
 <?php } ?>
 <!--Content-->
-	<div id="step_content_configuration" class="step">
+	<div id="step_content_<?php echo $step_name; ?>" class="step">
 		<?php if(!$alreadyInstalled) { ?>
 			<?php if($servicesValidation) { ?>
 				<?php if($javaExeError) { ?>
@@ -93,7 +93,7 @@
 				<tr>
 					<td> <span class='<?php echo $step_vars['java']['class']; ?>'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span> </td>
 					<td style="width:645px;"> <?php echo $step_vars['java']['found']; ?> </td>
-					<?php 
+					<?php
 					if ($step_vars['java']['class'] != 'tick') {
 					?>
 						<td>
@@ -122,7 +122,7 @@
 							</td>
 						<?php
 					}
-					?>			
+					?>
 				</tr>
 			</table>
 			<?php if($silent) { ?>
 <?php
+	$passCurrent = false;
 	foreach ($sideMenuElements as $ele) {
 		?>
 		<span id="<?php echo $ele['step']; ?>" class="<?php echo $ele['class']; ?>">
 			<?php if ($ele['class'] == "current") { ?>
 				<?php echo $ele['name']; ?>
+				<?php $passCurrent = true; ?>
 			<?php } else { ?>
 				<?php if ($ajax) { ?>
+					<?php if(!$passCurrent) { ?>
 					<a tabindex="-1" href='#' onclick='javascript:{w.getUrl("index.php?step_name=<?php echo $ele['step']; ?>", "content_container");}'>
+					<?php } ?>
 						<?php echo $ele['name']; ?>
 					</a>
 				<?php } else { ?>
@@ -32,11 +32,17 @@
 		                	<?php echo $content; ?>
 		                </div>
 		            </div>
-		            <div id="loading" style="display:none;"> <?php echo $html->image('loading.gif', array("height"=>"32px", "width"=>"32px")); ?> </div>
+		            <div id="loading" style="display:none;">
+		            	<?php
+		            		$options = array("height"=>"32px", "width"=>"32px");
+		            		$options = array();
+		            		echo $html->image('loader.gif', $options);
+		            	?>
+		            </div>
 		        </div>
 		        <div class="clearing">&nbsp;</div>
 		    </div>
-			
+
 		    <div id="footer">
 		    	<?php echo $html->image('dame/powered-by-kt.png', array("height"=>"23px", "width"=>"105px", "style"=>"padding: 5px;")); ?>
 		    </div>