Updated templating.

Committed by: Jarrett Jordaan Reviewed by: Megan Watson

Updated templating.
Committed by: Jarrett Jordaan Reviewed by: Megan Watson
Jarrett Jordaan
1 parent 87453e40
Showing 6 changed files with 5 additions and 27 deletions
setup/migrate/steps/migrateDatabase.php
setup/wizard/templates/configuration_confirm.tpl
setup/wizard/templates/dependencies.tpl
setup/wizard/templates/installtype.tpl
setup/wizard/templates/license.tpl
setup/wizard/templates/registration.tpl
@@ -148,7 +148,6 @@ class migrateDatabase extends Step
 				$cmd = $exe.' -u"'.$dbAdminUser.'" -p"'.$dbAdminPass.'" --port="'.$port.'" '.' --socket="'.$socket.'" '.$dbName.' > '.$sqlFile;
 			else 
 				$cmd = $exe.' -u"'.$dbAdminUser.'" -p"'.$dbAdminPass.'" --port="'.$port.'" '.$dbName.' > '.$sqlFile;
-			echo $cmd;
 			$response = $this->util->pexec($cmd);
     	}
 		if(file_exists($sqlFile)) {
@@ -50,9 +50,7 @@
 		        <td><?php echo $server['file_system_root']['value']; ?></td>
 		    </tr>
 		</table>
-
 		<h3>Paths and Permissions</h3>
-
 		<table class="conf_paths">
 		<?php
 			if($errors || $warnings) {
-<!--<form id="license_dependencies_configuration" action="index.php?step_name=<?php //echo $step_name; ?>" method="post">-->
 <form id="installtype_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/> -->
+	The wizard will review your system to determine whether you have the right PHP components in place to run KnowledgeTree.
 	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-->
@@ -12,7 +11,6 @@
 				<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/>-->
 			<?php
 		}
 	?>
@@ -35,7 +33,7 @@
 		$iconFlag = "<span class='{$php}'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span>";
 		$checkHeading = "<h3 style='width:30%; float:left'>".$iconFlag."PHP Version Check</h3>";
 	?>
-<!--		PHP Version Check</h3>-->
+<!--PHP Version Check</h3>-->
 		<?php if($silent) { ?>
 			<?php if($versionSection) {
 				$details = 'Hide Details';
@@ -57,7 +55,6 @@
 			$phpVersionCheck .= "<p class='description dependencies'>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 $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) { ?>
 			<?php $phpVersionCheck .= "<a href='#' class='refresh' onclick='w.refresh('dependencies')'>Refresh</a>"; ?>
 <form id="license_installtype_dependencies" action="index.php?step_name=<?php echo $step_name; ?>" method="post">
 	<p class="title">Installation Type</p>
-
 	<div id="step_content" class="step">
 		Select an installation type
 		<br/><br/>
@@ -24,9 +23,4 @@
 	<input type="submit" name="Previous" value="Previous" class="button_previous"/>
 	<input type="submit" name="Next" value="Next" class="button_next" />
 </form>
-<script type="text/javascript">
-	function clear() {
-
-	}
-</script>
 <?php if (AJAX) { echo $html->js('form.js'); } ?>
 \ No newline at end of file
@@ -6,9 +6,8 @@
         }
     }?>
 <p class="description_1">
-Read and accept the license agreement below before continuing with the setup.
+	Read and accept the license agreement below before continuing with the setup.
 </p>
-
 <?php if(!empty($errors)) { ?>
 	<div class="license_agreement" tabindex="-1" style="height:270px;">
 <?php } else { ?>
@@ -3,20 +3,16 @@
 <?php } else { ?>
 <form id="registration" action="index.php?step_name=<?php echo $step_name; ?>" method="post" onsubmit="javascript:{ if(w.validateRegistration()) { w.sendRegistration() };return false;}">
 <?php } ?>
-
 	<p class="title">Registering KnowledgeTree</p>
-	<?php
-		//echo $sel_country;
-	?>
 	<p class="description">
-	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 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.
 	<?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 -->
+<!-- Hidden Fields -->
 	<input type="hidden" id="sendAll" name="" value="" />
 	<input type="hidden" id="state" name="" />
 	<p class='disclaimer'>
@@ -36,7 +32,6 @@
 		        <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>
@@ -59,7 +54,6 @@
 		                    	}
 		                    }
-
 		                    echo $str;
 		                ?>
 		            </select>
@@ -78,7 +72,6 @@
 		                        	$str .= "<option name='{$code}' value='{$industry}'>{$industry}</option>";
 		                    	}
 		                    }
-
 		                    echo $str;
 		                ?>
 		            </select>
@@ -104,11 +97,9 @@
 		        </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>