Updated templating.

Committed by: Jarrett Jordaan Reviewed by: Megan Watson

Updated templating.
Committed by: Jarrett Jordaan Reviewed by: Megan Watson
Jarrett Jordaan
1 parent c87d55af
Showing 6 changed files with 10 additions and 20 deletions
setup/migrate/migrateUtil.php
setup/wizard/template.php
setup/wizard/templates/configuration.tpl
setup/wizard/templates/install.tpl
setup/wizard/templates/services.tpl
setup/wizard/templates/welcome.tpl
@@ -104,6 +104,12 @@ class MigrateUtil extends InstallUtil {
     	return new $serviceName();
     }
  
+    /**
+     * Return port of the old installation
+     *
+     * @param location
+     * @return string
+     */
     public function getPort($location) {
     	if(WINDOWS_OS) {
     		$myIni = "my.ini";
@@ -75,7 +75,6 @@ class Template
 	*/
     public function set($name, $value)
 	{
-		//if(is_a($value, 'Template')) {
 		$class = 'Template';
 		$isA = $value instanceof $class;
 		if($isA) {
 <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 +33,6 @@
 	<!--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>
@@ -6,7 +6,6 @@
 		<div id="step_content" class="step">
 	<?php } ?>
 		<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/>-->
 <?php if($ce_check) { ?>
 		<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.
@@ -15,7 +14,6 @@
 			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/>-->
 <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>
 <?php } else { ?>
@@ -25,13 +23,11 @@
 			<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>
+		<p>		
+			<input type='checkbox' id="call_home" 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>
 <?php } ?>
 	</div>
 	<input type="submit" name="Previous" value="Previous" class="button_previous"/>
@@ -3,9 +3,7 @@
 <?php } else { ?>
 	<form action="index.php?step_name=<?php echo $step_name; ?>" method="post" id="_<?php echo $step_name; ?>">
 <?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.
 	</p>
@@ -86,9 +84,7 @@
 				<div id="option4" class="onclick" onclick="javascript:{w.toggleClass('java_details', 'option4');}"><?php echo $details; ?></div>
 				<div class="java_details" style="display:<?php echo $display; ?>">
 			<?php } ?>
-<!--			<p class="description">-->
 			The Java version must be higher than 1.5.
-<!--			</p>-->
 			<table>
 				<tr>
 					<td> <span class='<?php echo $step_vars['java']['class']; ?>'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span> </td>
@@ -167,11 +163,9 @@
 			<?php } ?>
 			<?php } ?>
 		<?php } else { ?>
-<!--			<p class="description">-->
 			<?php if($servicesValidation) { ?>
 				All services are already installed.
 			<?php } ?>
-<!--			</p>-->
 		<?php } ?>
 		<?php if($servicesValidation) { ?>
 		<h3><?php echo "<span class='{$serviceCheck}'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span>"; ?>Services Check</h3>
@@ -187,9 +181,7 @@
 			<div id="option6" class="onclick" onclick="javascript:{w.toggleClass('service_details', 'option6');}"><?php echo $details; ?></div>
 			<div class="service_details" style="display:<?php echo $display; ?>">
 		<?php } ?>
-<!--		<p class="description">-->
 		Preload Services if posibble.
-<!--		</p>-->
 		<table>
 		<?php
 		if($step_vars) {
@@ -4,7 +4,6 @@
 		<p class="empty_space"> This wizard will lead you through all the steps required to install and configure KnowledgeTree on your server.</p> 
 		<p class="empty_space">
 		Press <b>Next</b> to continue.</p>
-		<div class="demo"><?php //echo $html->image('kt_browse.png'); ?> </div>
 	</div>
 	<input type="submit" name="Next" value="Next" class="button_next"/>
 </form>