Story Id: 11821154 Daily Commit

Committed by: Jarrett Jordaan Reviewed by: Paul Barrett

Story Id: 11821154 Daily Commit
Committed by: Jarrett Jordaan Reviewed by: Paul Barrett
Jarrett Jordaan
1 parent ec8fc9ab
Showing 17 changed files with 276 additions and 112 deletions
setup/wizard/lib/services/unixOpenOffice.php
setup/wizard/lib/services/windowsOpenOffice.php
setup/wizard/resources/wizard.css
setup/wizard/resources/wizard.js
setup/wizard/steps/configuration.php
setup/wizard/steps/services.php
setup/wizard/templates/configuration.tpl
setup/wizard/templates/configuration_confirm.tpl
setup/wizard/templates/database.tpl
setup/wizard/templates/database_confirm.tpl
setup/wizard/templates/dependencies.tpl
setup/wizard/templates/install.tpl
setup/wizard/templates/license.tpl
setup/wizard/templates/registration.tpl
setup/wizard/templates/registration_confirm.tpl
setup/wizard/templates/services.tpl
setup/wizard/templates/welcome.tpl
+<?php
+/**
+* Unix Agent Service Controller. 
+*
+* KnowledgeTree Community Edition
+* Document Management Made Simple
+* Copyright(C) 2008,2009 KnowledgeTree Inc.
+* Portions copyright The Jam Warehouse Software(Pty) Limited
+*
+* This program is free software; you can redistribute it and/or modify it under
+* the terms of the GNU General Public License version 3 as published by the
+* Free Software Foundation.
+*
+* This program is distributed in the hope that it will be useful, but WITHOUT
+* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+* FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+* details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*
+* You can contact KnowledgeTree Inc., PO Box 7775 #87847, San Francisco,
+* California 94120-7775, or email info@knowledgetree.com.
+*
+* The interactive user interfaces in modified source and object code versions
+* of this program must display Appropriate Legal Notices, as required under
+* Section 5 of the GNU General Public License version 3.
+*
+* In accordance with Section 7(b) of the GNU General Public License version 3,
+* these Appropriate Legal Notices must retain the display of the "Powered by
+* KnowledgeTree" logo and retain the original copyright notice. If the display of the
+* logo is not reasonably feasible for technical reasons, the Appropriate Legal Notices
+* must display the words "Powered by KnowledgeTree" and retain the original
+* copyright notice.
+*
+* @copyright 2008-2009, KnowledgeTree Inc.
+* @license GNU General Public License version 3
+* @author KnowledgeTree Team
+* @package Installer
+* @version Version 0.1
+*/
+
+class unixOpenOffice extends unixService {
+
+	public function __construct() {
+		$this->name = "KTOpenOfficeTest";
+	}
+	
+
+}
+?>
 \ No newline at end of file
+<?php
+/**
+* Windows Agent Service Controller.
+*
+* KnowledgeTree Community Edition
+* Document Management Made Simple
+* Copyright(C) 2008,2009 KnowledgeTree Inc.
+* Portions copyright The Jam Warehouse Software(Pty) Limited
+*
+* This program is free software; you can redistribute it and/or modify it under
+* the terms of the GNU General Public License version 3 as published by the
+* Free Software Foundation.
+*
+* This program is distributed in the hope that it will be useful, but WITHOUT
+* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+* FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+* details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*
+* You can contact KnowledgeTree Inc., PO Box 7775 #87847, San Francisco,
+* California 94120-7775, or email info@knowledgetree.com.
+*
+* The interactive user interfaces in modified source and object code versions
+* of this program must display Appropriate Legal Notices, as required under
+* Section 5 of the GNU General Public License version 3.
+*
+* In accordance with Section 7(b) of the GNU General Public License version 3,
+* these Appropriate Legal Notices must retain the display of the "Powered by
+* KnowledgeTree" logo and retain the original copyright notice. If the display of the
+* logo is not reasonably feasible for technical reasons, the Appropriate Legal Notices
+* must display the words "Powered by KnowledgeTree" and retain the original
+* copyright notice.
+*
+* @copyright 2008-2009, KnowledgeTree Inc.
+* @license GNU General Public License version 3
+* @author KnowledgeTree Team
+* @package Installer
+* @version Version 0.1
+*/
+
+class windowsOpenOffice extends windowsService {
+
+	
+	public function __construct() {
+		$this->name = "KTOpenOfficeTest";
+	}
+    
+}
+?>
 \ No newline at end of file
@@ -70,6 +70,7 @@ select {
 #wrapper {
     background: white url("graphics/background.gif") repeat-y left;
+    height:465px;
 }
 #container {
@@ -83,6 +84,7 @@ select {
     margin-left: 200px;
     padding: 10px;
     padding-top: 0;
+    width:950px;
 }
 #sidebar {
@@ -291,7 +293,7 @@ refresh {
 	border:none;
 	background-color:#FFCCCC;
 	color:#A30000;
-	width:550px;
+/*	width:550px; */
 	padding:0px;
 }
@@ -302,4 +304,15 @@ refresh {
 	/*color:#339933;*/
 	width:550px;
 	padding:0px;
+}
+
+.license_agreement {
+	overflow: scroll;
+	height: 255px;
+	width:800px;
+	overflow-x:hidden;
+}
+
+.regSubmit {
+
 }
 \ No newline at end of file
@@ -10,6 +10,9 @@ wizard.prototype.doFormCheck = function() {
 // Toggle Advance Database options
 wizard.prototype.toggleClass = function(el) {
 	var el = document.getElementsByClassName(el); //adv_options|php_details|php_ext_details|php_con_details
+	if (el == 'adv_options') {
+		
+	}
 	if(el[0].style.display == 'none')
 	    el[0].style.display = 'block';
 	else
@@ -354,6 +354,7 @@ class configuration extends Step
 			if($class['class'] != 'tick') {
 				$this->temp_variables['paths_perms'] = $class['class'];
 				$this->done = false;
+				$this->error[] = "path error";
 			}
             $dirs[$key] = array_merge($dirs[$key], $class);
         }
@@ -60,7 +60,7 @@ class services extends Step
 	*/
     protected $runInstall = true;
-    private $services = array('Lucene', 'Scheduler');
+    private $services = array('Lucene', 'Scheduler', 'OpenOffice');
     protected $java;
@@ -68,7 +68,7 @@ class services extends Step
     protected $util;
-    private $javaVersion = '1.5';
+    private $javaVersion = '1.7';
 	/**
 	* Java Installed 
@@ -342,12 +342,23 @@ class services extends Step
     		if($auto) {
 				return $auto;
     		} else {
-				$this->specifyJava(); // Ask for settings
+    			// Check if auto detected java works
+    			$auto = $this->useDetected();
+    			if($auto) {
+    				$this->disableExtension = true; // Disable the use of the php bridge extension
+    				return $auto;
+    			} else {
+					$this->specifyJava(); // Ask for settings
+    			}
     		}
 			return $auto;
     	}
     }
+    private function useDetected() {
+    	return $this->detSettings();
+    }
+    
     private function specifyJava() {
     	$this->javaExeError = true;
     }
@@ -4,24 +4,37 @@
 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>
-<form action="index.php?step_name=configuration" method="post">
+<div class="continue_message">
+<?php
+	if(!$errors && !$warnings) {
+		?>
+			&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;All configuration settings are correctly set. Please click next to continue.
+		<?php
+	}
+?>
+</div>
+<div class="error_message">
+<?php if($errors) { ?>
+	<span class='cross'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Your system is not quite ready to run KnowledgeTree. See the list below to determine which areas you need to address. <br/>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Once you&rsquo;ve fixed these items, return to this wizard and try again.</span><br/>
+<?php } elseif ($warnings) {
+	?>
+	<span class='cross_orange'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;KnowledgeTree Optional Dependencies not met, but you will be able to continue.</span><br/>
+	<?php
+}?>
+<?php
+	if($errors || $warnings) {
+		?>
+	    	&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<a href="http://wiki.knowledgetree.com/Web_Based_Installer#System_Configuration" target="_blank">Click here for help on overcoming configuration issues</a>
+<?php } ?>
+</div>
+<form action="index.php?step_name=configuration" method="post">
 <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>
-<div class="error">
-    <?php
-    	if(isset($errors)) {
-	        foreach ($errors as $error){
-	            echo $error.'<br />';
-	        }
-    	}
-    ?>
-</div>
-
 <table>
     <tr>
         <td><label for='host'>Host: </label></td>
@@ -48,7 +61,6 @@ The settings below have been drawn from the system information. The host and por
     </tr>
 </table>
-<br />
 <h3><?php echo "<span class='{$paths_perms}'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span>"; ?>Paths and Permissions</h3>
 <?php if($silent) { ?>
 	<div id="options" class="onclick" onclick="javascript:{w.toggleClass('paths_perms');}">Show Details</div>
@@ -60,15 +72,20 @@ The following folders must be writable for KnowledgeTree to be able to run. The 
 <table>
 <?php
     foreach ($paths as $key => $path){
-        $row = '<tr>';
-        $row .= "<td><div class='{$path['class']}'></div></td>\n";
-        $row .= "<td><label for='{$path['setting']}'>{$path['name']}: </label></td>\n";
-        $row .= "<td><input name='{$path['setting']}' id='{$path['setting']}' size='60' value='{$path['path']}' /></td>\n";
-        $row .= '<td class="error">';
-        $row .= (isset($path['msg'])) ? $path['msg'] : '';
-        $row .= "</td>\n";
-        $row .= "</tr>\n";
-        echo $row;
+    	?>
+    	<tr>
+    		<td> <div class='<?php echo $path['class']; ?>'></div> </td>
+    		<td> <label for='<?php echo $path['setting']; ?>'> <?php echo $path['name']; ?>: </label> </td>
+    		<td><input name='<?php echo $path['setting']; ?>' id='<?php echo $path['setting']; ?>' size='60' value='<?php echo $path['path']; ?>' /></td>
+    		<?php if(isset($path['msg'])) {
+    			?>
+    			<td class="error"> <?php echo $path['msg']; ?> </td>
+    			<td><a href="javascript:this.location.reload();" class="refresh">Refresh</a></td>
+    			<?php
+    		}
+    		?>
+    	</tr>
+    	<?php
     }
 ?>
 </table>
@@ -78,6 +95,5 @@ The following folders must be writable for KnowledgeTree to be able to run. The 
 <div class="buttons">
     <input type="submit" name="Previous" value="Previous"/>
     <input type="submit" name="Next" value="Next"/>
-    <input type="submit" name="Refresh" value="Refresh"/>
 </div>
 </form>
 \ No newline at end of file
@@ -4,42 +4,39 @@
 <table>
     <tr>
-        <td><b>Host: </b></td>
+        <td>Host: </td>
         <td><?php echo $server['host']['value']; ?></td>
     </tr>
     <tr>
-        <td><b>Port: </b></td>
+        <td>Port: </td>
         <td><?php echo $server['port']['value']; ?></td>
     </tr>
     <tr>
-        <td><b>Root Url: </b></td>
+        <td>Root Url: </td>
         <td><?php echo $server['root_url']['value']; ?></td>
     </tr>
     <tr>
-        <td><b>File System Root: </b></td>
+        <td>File System Root: </td>
         <td><?php echo $server['file_system_root']['value']; ?></td>
     </tr>
     <tr>
-        <td><b>SSL Enabled: </b></td>
+        <td>SSL Enabled: </td>
         <td><?php echo $server['ssl_enabled']['value']; ?></td>
     </tr>
 </table>
-<br />
 <h3>Paths and Permissions</h3>
 <table>
 <?php
     foreach ($paths as $key => $path){
-        $row = '<tr>';
-
-        $row .= "<td><div class='{$path['class']}'></div></td>\n";
-        $row .= "<td><b>{$path['name']}:</b></td>\n";
-        $row .= "<td>{$path['path']}</td>\n";
-
-        $row .= "</tr>\n";
-
-        echo $row;
+?>
+	<tr>
+		<td><div class='<?php echo $path['class']; ?>'></div></td>
+		<td><?php echo $path['name']; ?>:</td>
+		<td><?php echo $path['path']; ?></td>
+	</tr>
+<?php
     }
 ?>
 </table>
-<h1>Database Configuration</h1>
+<h1>Confirming Database Configurations</h1>
 <!-- Check For immediate Errors -->
 <span class="error"> <?php if($errors['con']) { echo $errors['con']; } ?> </span>
 <form id="dbsettings" action="index.php?step_name=<?php echo $step_name; ?>" method="post" onsubmit="w.onSubmitValidate(<?php if ($silent) echo 'true'; else echo 'false'; ?>);return false;">
@@ -66,11 +66,11 @@
 	    </p>
 	</div>
 	<div class="buttons">
-	    <input type="submit" name="Previous" value="previous" />
+	    <input type="submit" name="Previous" value="Previous" />
 	    <?php if ($silent) { ?>
-	    <input type="submit" name="Next" value="next" />
+	    <input type="submit" name="Next" value="Next" />
 	    <?php } else { ?>
-	    <input type="button" name="Next" value="next" onclick="javascript:{w.showStep(1, 'n');}"/>
+	    <input type="button" name="Next" value="Next" onclick="javascript:{w.showStep(1, 'n');}"/>
 	    <?php } ?>
 	</div>
 </div>
@@ -100,8 +100,8 @@ An administrative user is required for creating tables within the database.
 	</table>
 	<div class="buttons">
-	    <input type="button" name="Previous" value="previous" onclick="javascript:{w.showStep(2, 'p');}"/>
-	    <input type="button" name="Next" value="next" onclick="javascript:{w.showStep(2, 'n');}"/>
+	    <input type="button" name="Previous" value="Previous" onclick="javascript:{w.showStep(2, 'p');}"/>
+	    <input type="button" name="Next" value="Next" onclick="javascript:{w.showStep(2, 'n');}"/>
 	</div>
 </div>
-<h1>Database Configuration Confirmation</h1>
+<h1>Confirming Database Configurations</h1>
 <div class="description">
-Please confirm that your database settings have been entered correctly before proceeding with the installation.
+Please confirm whether KnowledgeTree has correctly determined your database settings before proceeding.
 </div>
 <!--<div id="section">-->
 <form action="index.php?step_name=<?php echo $step_name; ?>" method="post">
 <h3><b>Database Settings</b></h3>
-<table width="20%" class="dbconf">
+<table width="33%" class="dbconf">
 <?php
 if($dtypes) {
         $type = '';
@@ -29,10 +29,6 @@ if($dtypes) {
         <td><?php echo $duname; ?></td>
     </tr>
     <tr>
-        <td>Root Username: </td>
-        <td><?php echo $duname; ?></td>
-    </tr>
-    <tr>
         <td>Root Password: </td>
         <td><?php echo $dpassword; ?></td>
     </tr>
@@ -45,7 +41,7 @@ if($dtypes) {
 <!--</div>-->
 <h3><b>Advanced Settings</b></h3>
-<table width="23%" class="dbconf">
+<table width="35%" class="dbconf">
     <tr>
         <td>Host: </td>
         <td><?php echo $dhost; ?></td>
@@ -68,7 +64,7 @@ if($dtypes) {
 <h3><b>Database Users</b></h3>
-<table width="23%" class="dbconf">
+<table width="35%" class="dbconf">
     <?php //if (!$silent) { ?>
     <tr>
         <td>DMS Admin Username: </td>
@@ -91,7 +87,7 @@ if($dtypes) {
     </tr>
 </table>
-<div class="buttons">
+<div class="buttons" style="top:0px;">
     <input type="submit" name="Edit" value="Edit"/>
     <input type="submit" name="Confirm" value="Confirm"/>
 </div>
@@ -17,11 +17,11 @@ Once the scan is completed, you&amp;rsquo;ll see whether your system has met the req
 <div class="error_message">
 <?php if($errors) { ?>
-	<span class='cross'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Your system is not quite ready to run KnowledgeTree. See the list below to determine which areas you need to address. Once you&rsquo;ve fixed these items, return to this wizard and try again.</span><br/>
-<?php } ?>
-<?php if($warnings) {?>
+	<span class='cross'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Your system is not quite ready to run KnowledgeTree. See the list below to determine which areas you need to address. <br/>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Once you&rsquo;ve fixed these items, return to this wizard and try again.</span><br/>
+<?php } elseif ($warnings) { ?>
 	<span class='cross_orange'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;KnowledgeTree Optional Dependencies not met, but you will be able to continue.</span><br/>
 <?php } ?>
+
 <?php
 	if($errors || $warnings) {
 		?>
@@ -129,7 +129,7 @@ B = Bytes, K = Kilobytes, M = Megabytes, G = Gigabytes
 	</div>
 <?php } ?>
 <form action="index.php?step_name=dependencies" method="post">
-<div class="buttons">
+<div class="buttons" style="top:14px;">
     <input type="submit" name="Previous" value="Previous"/>
     <input type="submit" name="Next" value="Next"/>
 </div>
-<h1>Installing System</h1>
+<h1>Finalizing System Installation</h1>
+
+<p class="description">
+The wizard will now complete the installation and run a final check on the system. 
+</p>
 <form action="index.php?step_name=install" method="post">
-    <div class="buttons">
+    <div class="buttons" style="top:325px;">
         <input type="submit" name="Previous" value="Previous"/>
         <input type="submit" name="Install" value="Install"/>
     </div>
@@ -13,7 +13,7 @@ Please read and accept the license agreement below before continuing with the se
 </p>
 <form action="index.php?step_name=license" method="POST">
-<div style="overflow: scroll; height: 500px; width:800px; overflow-x:hidden;">
+<div class="license_agreement">
 <h2>KnowledgeTree On-premise Commercial End-User</h2>
 <p>
 License Agreement Version 2.3
@@ -339,7 +339,7 @@ govern.
     <br/>
     <input type="radio" name="license" value="0"/>I do not accept the agreement
 </div>
-<div class="buttons">
+<div class="buttons" style="top:3px">
     <input type="submit" name="Previous" value="Previous"/>
     <input type="submit" name="Next" value="Next"/>
 </div>
-<h1>Register your KnowledgeTree Installation</h1>
-
-<div class="error">
-    <?php if(isset($errors)) {
-        foreach($errors as $k=>$e) {
-                echo $e;
-        }
-    }?>
-</div>
+<form action="index.php?step_name=registration" method="post">
+<h1>Registering KnowledgeTree</h1>
 <p>
-Register your KnowledgeTree Installation and receive the KnowledgeTree Drop Box for Windows software, a drag and drop tool that makes
-placing documents into KnowledgeTree even easier.
+Register with KnowledgeTree to receive important product updates. We respect your privacy and will not share your information with third parties. For more information, please refer to our Privacy and Data Retention Policies. 
+<input type="submit" name="Confirm" value="Skip Registration" class="regSubmit"/>
 </p>
 <p class='disclaimer'>
 We will not share your information with 3rd-parties, nor will we send you information not directly related to KnowledgeTree's products
 and services. Please see our <a href="http://www.knowledgetree.com/about/legal" target="_blank">Privacy and Data Retention policies</a> for more information.
 </p>
-<form action="index.php?step_name=registration" method="post">
-<!--<form id="registration" action="index.php?step_name=<?php //echo $step_name; ?>" method="post" onsubmit="w.validateRegistration();return false;">-->
+
 <p>
 <table>
@@ -70,7 +62,7 @@ and services. Please see our &lt;a href=&quot;http://www.knowledgetree.com/about/legal&quot; 
         </td>
     </tr>
     <tr>
-        <td><label for='size'>Organisation Size</label></td>
+        <td><label for='size'>Organization Size</label></td>
         <td>
             <select id='size' name='submitted[organization_size]'>
                 <?php
@@ -87,17 +79,6 @@ and services. Please see our &lt;a href=&quot;http://www.knowledgetree.com/about/legal&quot; 
 </table>
 </p>
-<?php
-/*
-<input type='hidden' name='submitted[telephone]' value='12345' />
-<input type='hidden' name='submitted[company]' value='empty' />
-<input type='hidden' name='submitted[contact]' value='12345' />
-<input type='hidden' name='submitted[partner]' value='empty' />
-<input type='hidden' name='submitted[hear_about_us]' value='empty' />
-<input type='hidden' name='submitted[installation_guid]' value='123456' />
-*/
-?>
-
 <input type='hidden' name='form_id' value='webform_client_form_242' />
 <input type='hidden' name='op' value='Submit' />
@@ -105,6 +86,6 @@ and services. Please see our &lt;a href=&quot;http://www.knowledgetree.com/about/legal&quot; 
 <div class="buttons">
     <input type="submit" name="Previous" value="Previous"/>
     <input type="submit" name="Next" value="Register"/>
-    <input type="submit" name="Confirm" value="Skip Registration"/>
+    <!--<input type="submit" name="Confirm" value="Skip Registration"/>-->
 </div>
 </form>
 \ No newline at end of file
 <h1>Thank you for registering</h1>
-<div class="error">
-    <?php if(isset($errors)) {
-        foreach($errors as $k=>$e) {
-                echo $e;
-        }
-    }?>
-</div>
-
 <p>
 Thank you for signing up. You'll receive an email from us shortly with download instructions for the KnowledgeTree Drop Box software.
 </p>
@@ -2,20 +2,26 @@
 <h1>Checking Service Dependencies</h1>
 <p class="description">
-The wizard will review your system to determine whether you can run KnowledgeTree background services. Once the scan is completed, you’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>
 <div class="continue_message">
 <?php
-	if(!$errors && $warnings) {
+	if(!$errors && !$warnings) {
 		?>
-			&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;All services have been installed. Please press Next to continue.
+			&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;All service dependencies are met. Please click next to continue.
 		<?php
 	}
 ?>
 </div>
-
 <div class="error_message">
+<?php if($errors) { ?>
+	<span class='cross'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Your system is not quite ready to run KnowledgeTree. See the list below to determine which areas you need to address. <br/>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Once you&rsquo;ve fixed these items, return to this wizard and try again.</span><br/>
+<?php } elseif ($warnings) {
+	?>
+	<span class='cross_orange'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;KnowledgeTree Optional Dependencies not met, but you will be able to continue.</span><br/>
+	<?php
+}?>
 <?php
 	if($errors || $warnings) {
 		?>
@@ -54,9 +60,28 @@ The wizard will review your system to determine whether you can run KnowledgeTre
 	<p class="description">
 	The Java version must be higher than 1.5.
 	</p>
-	<?php echo "<span class='{$step_vars['java']['class']}'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span>{$step_vars['java']['found']}"; ?>
-	<br/>
-	<?php echo "<span class='{$step_vars['version']['class']}'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span>{$step_vars['version']['found']}"; ?>
+	<table>
+		<tr>
+			<td> <span class='<?php echo $step_vars['java']['class']; ?>'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span> </td>
+			<td> <?php echo $step_vars['java']['found']; ?> </td>
+			<?php if ($step_vars['java']['class'] != 'tick') {
+				?>
+					<td><a href="javascript:this.location.reload();" class="refresh">Refresh</a></td>
+				<?php
+			}
+			?>
+		</tr>
+		<tr>
+			<td> <span class='<?php echo $step_vars['version']['class']; ?>'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span> </td>
+			<td> <?php echo $step_vars['version']['found']; ?> </td>
+			<?php if ($step_vars['version']['class'] != 'tick') {
+				?>
+					<td><a href="javascript:this.location.reload();" class="refresh">Refresh</a></td>
+				<?php
+			}
+			?>			
+		</tr>
+	</table>
 	<?php if($silent) { ?>
 		</div>
 	<?php } ?>
@@ -69,8 +94,20 @@ The wizard will review your system to determine whether you can run KnowledgeTre
 		<p class="description">
 		A PHP Java Bridge is required for KnowledgeTree to perform at an optimal level.
 		</p>
-		<?php echo "<span class='{$step_vars['extensions']['class']}'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span>{$step_vars['extensions']['found']}"; ?>
-		<br />
+		<table>
+			<tr>
+				<td> <span class='<?php echo $step_vars['extensions']['class']; ?>'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span> </td>
+				<td> <?php echo $step_vars['extensions']['found']; ?> </td>
+				<?php if ($step_vars['extensions']['class'] != 'tick') {
+					?>
+						<td><a href="javascript:this.location.reload();" class="refresh">Refresh</a></td>
+					<?php
+				}
+				?>
+			</tr>
+		</table>
+		<?php //echo "<span class='{$step_vars['extensions']['class']}'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span>{$step_vars['extensions']['found']}"; ?>
+<!--		<br />-->
 		<?php if($silent) { ?>
 			</div>
 		<?php } ?>
@@ -88,21 +125,32 @@ The wizard will review your system to determine whether you can run KnowledgeTre
 <p class="description">
 Preload Services if posibble.
 </p>
+<table>
 <?php
-if($step_vars){
+if($step_vars) {
 	if(isset($step_vars['services'])) {
 	    foreach ($step_vars['services'] as $ser){
-	    	echo "<span class='{$ser['class']}'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span>{$ser['msg']}<br/>";
+	    	?>
+	    	<tr>
+	    		<td> <span class='<?php echo $ser['class']; ?>'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span> </td>
+	    		<td> <?php echo $ser['msg']; ?> </td>
+	    		<?php if ($ser['class'] != 'tick') {
+	    			?>
+	    			<td><a href="javascript:this.location.reload();" class="refresh">Refresh</a></td>
+	    			<?php
+	    		} ?>
+	    	</tr>
+	    	<?php
 	    }
 	}
 }
 ?>
+</table>
 <?php if($silent) { ?>
 	</div>
 <?php } ?>
 <div class="buttons">
     <input type="submit" name="Previous" value="Previous"/>
     <input type="submit" name="Next" value="Next"/>
-    <input type="submit" name="Refresh" value="Refresh"/>
 </div>
 </form>
 \ No newline at end of file
@@ -7,7 +7,7 @@ This wizard will lead you through the steps needed to install and configure Know
 </div>
 <form action="index.php?step_name=welcome" method="post">
-<div class="buttons">
+<div class="buttons" style="top:325px;">
     <input type="submit" name="Next" value="Next"/>
 </div>
 </form>
 \ No newline at end of file