Story ID:1459843: Updated Text and CSS On Setup Wizards

Committed by: Jarrett Jordaan Reviewed by: Megan Watson

Story ID:1459843: Updated Text and CSS On Setup Wizards
Committed by: Jarrett Jordaan Reviewed by: Megan Watson
Jarrett Jordaan
1 parent 9840f69e
Showing 11 changed files with 47 additions and 46 deletions
setup/migrate/templates/database.tpl
setup/migrate/templates/installation.tpl
setup/migrate/templates/installation_confirm.tpl
setup/migrate/templates/services.tpl
setup/upgrade/templates/backup.tpl
setup/upgrade/templates/restore.tpl
setup/wizard/resources/css/wizard.css
setup/wizard/templates/dependencies.tpl
setup/wizard/templates/install.tpl
setup/wizard/templates/installtype.tpl
setup/wizard/templates/welcome.tpl
@@ -7,9 +7,15 @@
 <!--		user on the database server are required in order to be able to configure and migrate the database.-->
 		</div>
 		<div id="step_content_<?php echo $step_name; ?>" class="step">
-			<br/>
-			<span class="error">!!NB!! You are advised to backup your database before proceeding. !!NB!!</span>
-			<br/><br/>
+<p class="empty_space">The Setup Wizard will now migrate your existing database to the new Zend Server stack. This process may take
+                        several minutes to complete.</p><br />
+                        <span class="error">Please ensure that your database is backed up before proceeding. If you need assistance with backing up see the <a class="description_click" target="_blank" href="http://wiki.knowledgetree.com/Web_Based_Migrater#Database_Migration">database migration section on our wiki</a>
+</span>
+                        <br /><br />
+                        <p class="empty_space">Click <b>Next</b> to continue.</p>
+<!--			<br/>-->
+<!--			<span class="error">!!NB!! You are advised to backup your database before proceeding. !!NB!!</span>-->
+<!--			<br/><br/>-->
 			<?php if(isset($errors)) { ?>
 				<?php
 					foreach ($errors as $error) {
@@ -5,7 +5,7 @@
 		if(!$errors && !$warnings) {
 			?>
 				<span class='big_ok'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span>
-				Installation has been detected. Please click next to continue.
+					KnowledgeTree installation has been detected. Please click <b>Next</b> to continue.
 				<br/><br/>
 			<?php
 		}
@@ -13,7 +13,7 @@
 <!--Warning and Error Messages-->
 	<?php if($errors) { ?>
 		<span class='cross'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span>
-		<span class='error_message'>Your system is not quite ready to migrate KnowledgeTree. See the list below to determine which areas you need to address.</span>
+		<span class='error_message'>The Setup Wizard will not continue until the issues below have been addressed</span>
 		<br/>
 	<?php } elseif ($warnings) {
 		?>
@@ -22,13 +22,15 @@
 	<?php
 		if($errors || $warnings) {
 			?>
-		    	&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<a href="http://wiki.knowledgetree.com/Web_Based_Migrater#Current_Installation" target="_blank">Click here for help on overcoming installation detection issues</a>
+		    	&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<a href="http://wiki.knowledgetree.com/Web_Based_Migrater#Current_Installation" target="_blank">Click here for help on overcoming upgrade issues  </a>
 	<?php } ?>
 	<div id="step_content_<?php echo $step_name; ?>" class="step">
 		<p class="empty_space">
-			Please verify the location of your current installation.
+			Enter the full path of the installation you wish to upgrade: 
+		</p>
+		<p class="empty_space">
+			<small>The default is <b>'C:\Program Files\ktdms'</b> on Windows and <b>'/opt/ktdms'</b> or <b>'/home/<i>username</i>/ktdms/'</b> on other operating systems.</small>
 		</p>
-		
 		<input id="location" name="location" type="text" style="width:430px; float:left" value="<?php if($location) echo $location; ?>">
 		<br/><br/>
 		<?php
@@ -68,7 +68,7 @@
 		</table>
 	</div>
-    <input type="submit" name="Edit" value="Back"  class="button_previous"/>
+    <input type="submit" name="Edit" value="Edit"  class="button_previous"/>
     <input type="submit" name="Confirm" value="Confirm" class="button_next"/>
 </form>
 <?php if (AJAX) { echo $html->js('form.js'); } ?>
 \ No newline at end of file
@@ -2,7 +2,7 @@
 	<p class="title">Deactivate Services</p>
 	<p class="description">
-	Services need to be deactivated before the migration takes place.
+	All KnowledgeTree services need to be deactivated before the migration takes place.
 	</p>
 <!--Continue Message-->
 	<?php
@@ -77,7 +77,7 @@
 			</div>
 		<?php } ?>
 	</div>
-    <input type="submit" name="Previous" value="Back" class="button_previous"/>
+    <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'); } ?>
 \ No newline at end of file
@@ -48,7 +48,7 @@ You can continue to do the backup manually using the following process:
     </div>
     <?php include 'templates/loading.tpl'; ?>
 	<div id="buttonBar">
-    <input type="submit" name="Previous" value="Back" class="button_previous">
+    <input type="submit" name="Previous" value="Previous" class="button_previous">
     <?php
 if ($dir != '')
 {
@@ -94,7 +94,7 @@ Press &lt;i&gt;Next&lt;/i&gt; to attempt the command(s) above.
     </div>
 	<?php include 'templates/loading.tpl'; ?>
 	<div id="buttonBar">
-    <input type="submit" name="Previous" value="Back" class="button_previous">
+    <input type="submit" name="Previous" value="Previous" class="button_previous">
     <?php if (($dir != '') && ($selected)) { ?>
     <input type="button" name="RunRestore" value="Next" class="button_next" onclick="doSubmit(this);">
     <?php }
@@ -155,8 +155,16 @@ select {
 	min-height:355px;
 }
+.license_agreement {
+	overflow: scroll;
+	/*width:765px;*/
+	height:370px;
+	overflow-x:hidden;
+	border:1px solid #CFCFCF;
+}
+
 #sidebar {
-	font-size: 90%;
+	font-size: 85%;
 	color: grey; 
 	font-family: sans-serif; 
 	margin-top: 0px;
@@ -166,7 +174,6 @@ select {
 	line-height:3;
 	padding-left:20px;
 	text-align:left;
-	/*background-image:url("../graphics/left.png");*/
 }
 #footer {
@@ -361,7 +368,6 @@ select {
 .description {
     color:#898989;
     line-height:150%;
-    /*margin-bottom:0.75em;*/
     font-size:90%;
 }
@@ -445,7 +451,6 @@ td.dir_description {
 .php_con_details table {
 	width:745px;
-	/*border:1px solid;*/
 }
 .error_message {
@@ -483,15 +488,6 @@ td.dir_description {
 	padding:4px;
 }
-.license_agreement {
-	overflow: scroll;
-	height: 255px;
-	width:765px;
-	height:370px;
-	overflow-x:hidden;
-	border:1px solid #CFCFCF;
-}
-
 .db_adv_options {
 	height:200px;
 	width:720px;
@@ -9,7 +9,7 @@
 		if(!$errors && $warnings) {
 			?>
 				<span class='big_ok'>&nbsp;&nbsp;&nbsp;</span>
-				<span class='description'>Congratulations! Your system is ready to run KnowledgeTree. Click Next to continue.</span>
+				<span class='description'>Congratulations! Your system is ready to run KnowledgeTree. Click <b>Next</b> to continue.</span>
 				<br/><br/>
 			<?php
 		}
 <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">
-		<br/>
-		<br/>
+		<p class="empty_space">	The wizard will now complete the installation and run a final check on your system.	</p>
 		<p class="empty_space">
-			The wizard will now complete the installation and run a final check on the system.
+			We would greatly appreciate it if you would allow us to collect anonymous usage statistics to help us provide a better quality product. 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="www.knowledgetree.com/about/legal" target="_blank">KnowledgeTree Privacy and Data Protection Agreements.</a>
 		</p>
-		<div class="demo"><?php echo $html->image('kt_browse.png'); ?></div>
-		<br/>
-		<br/>
-		<p>
-            <input type='checkbox' name='call_home' value='enable' checked /> Enable the monitoring system
+		<p class="empty_space"">
+			KnowledgeTree, in partnership with <a href="http://www.trees.co.za/" target="_blank">Food & Trees for Africa</a>, and as a contributor to the National Tree Distribution Program, will also commit to planting one tree in Africa for every 1000 vertified installations of the product.
 		</p>
+		<div class="demo"><?php echo $html->image('kt_browse.png'); ?></div>
+		<br/><br/>
+		<p><input type='checkbox' name='call_home' value='enable' checked /> Help to improve KnowledgeTree by providing anonymous usage statistics</p>
 	</div>
 	<input type="submit" name="Previous" value="Previous" class="button_previous"/>
 	<input type="submit" name="Install" value="Install" class="button_next"/>
@@ -2,21 +2,20 @@
 	<p class="title">Installation Type</p>
 	<div id="step_content" class="step">
-		<br/>
-		The wizard will require you choose an installation type.
+		Select an installation type
 		<br/><br/>
 		<table>
 			<tr>
 				<td> <input type="radio" name="installtype" value="Clean Install" checked id="clean" /> </td>
-				<td> <label for="clean"><b>Clean Install</b> - New Installation of KnowledgeTree</label> </td>
+				<td> <label for="clean"><b>Default Install</b> <br/>Install a new copy of KnowledgeTree</label> </td>
 			</tr>
 			<tr>
 				<td> <input type="radio" name="installtype" value="Upgrade Installation" id="migrate" /> </td>
-				<td> <label for="migrate"><b>Upgrade Installation</b> - Upgrade an existing Installation of KnowledgeTree</label> </td>
+				<td> <label for="migrate"><b>Upgrade - KnowledgeTree Stack</b> <br/> Upgrade from a previous version of the KnowledgeTree Stack</label></td>
 			</tr>
 			<tr>
 				<td> <input type="radio" name="installtype" value="Upgrade Only" id="upgrade" /> </td>
-				<td> <label for="upgrade"><b>Source Only Upgrade</b> - Manually Update Source and Upgrade Database only</label> </td>
+				<td> <label for="upgrade"><b>Upgrade - Source Only</b> <br/> Upgrade from a Source Only Installation of KnowledgeTree</label></td>
 			</tr>
 		</table>
 	</div>
 <form id="welcome_license" action="index.php?step_name=<?php echo $step_name; ?>" method="post">
-	<p class="title">Welcome to KnowledgeTree</p>
+	<p class="title">Welcome to the KnowledgeTree Setup Wizard</p>
 	<div id="step_content" class="step">
-		<br/>
-		<br/>
-		<p class="empty_space"> This wizard will lead you through the steps needed to install and configure KnowledgeTree on your server. </p>
-		<div class="demo"><?php echo $html->image('kt_browse.png'); ?> </div>
+		<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"/>
 <!--	<input type="submit" name="Migrate" value="Migrate" class="button_next"/>-->