Peter M. Groen / knowledgetree

Commit 80f6fb9da1d4b9117cb1f5b692a54a913b77a866

Authored by Jarrett Jordaan
1 parent 9840f69e

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

Committed by: Jarrett Jordaan

Reviewed by: Megan Watson
Inline Side-by-side
Showing 11 changed files with 47 additions and 46 deletions
setup/migrate/templates/database.tpl
  View file @80f6fb9
... ... @@ -7,9 +7,15 @@
7 7 <!-- user on the database server are required in order to be able to configure and migrate the database.-->
8 8 </div>
9 9 <div id="step_content_<?php echo $step_name; ?>" class="step">
10   - <br/>
11   - <span class="error">!!NB!! You are advised to backup your database before proceeding. !!NB!!</span>
12   - <br/><br/>
  10 +<p class="empty_space">The Setup Wizard will now migrate your existing database to the new Zend Server stack. This process may take
  11 + several minutes to complete.</p><br />
  12 + <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>
  13 +</span>
  14 + <br /><br />
  15 + <p class="empty_space">Click <b>Next</b> to continue.</p>
  16 +<!-- <br/>-->
  17 +<!-- <span class="error">!!NB!! You are advised to backup your database before proceeding. !!NB!!</span>-->
  18 +<!-- <br/><br/>-->
13 19 <?php if(isset($errors)) { ?>
14 20 <?php
15 21 foreach ($errors as $error) {
... ...
setup/migrate/templates/installation.tpl
  View file @80f6fb9
... ... @@ -5,7 +5,7 @@
5 5 if(!$errors && !$warnings) {
6 6 ?>
7 7 <span class='big_ok'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span>
8   - Installation has been detected. Please click next to continue.
  8 + KnowledgeTree installation has been detected. Please click <b>Next</b> to continue.
9 9 <br/><br/>
10 10 <?php
11 11 }
... ... @@ -13,7 +13,7 @@
13 13 <!--Warning and Error Messages-->
14 14 <?php if($errors) { ?>
15 15 <span class='cross'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span>
16   - <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>
  16 + <span class='error_message'>The Setup Wizard will not continue until the issues below have been addressed</span>
17 17 <br/>
18 18 <?php } elseif ($warnings) {
19 19 ?>
... ... @@ -22,13 +22,15 @@
22 22 <?php
23 23 if($errors || $warnings) {
24 24 ?>
25   - &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>
  25 + &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>
26 26 <?php } ?>
27 27 <div id="step_content_<?php echo $step_name; ?>" class="step">
28 28 <p class="empty_space">
29   - Please verify the location of your current installation.
  29 + Enter the full path of the installation you wish to upgrade:
  30 + </p>
  31 + <p class="empty_space">
  32 + <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>
30 33 </p>
31   -
32 34 <input id="location" name="location" type="text" style="width:430px; float:left" value="<?php if($location) echo $location; ?>">
33 35 <br/><br/>
34 36 <?php
... ...
setup/migrate/templates/installation_confirm.tpl
  View file @80f6fb9
... ... @@ -68,7 +68,7 @@
68 68 </table>
69 69  
70 70 </div>
71   - <input type="submit" name="Edit" value="Back" class="button_previous"/>
  71 + <input type="submit" name="Edit" value="Edit" class="button_previous"/>
72 72 <input type="submit" name="Confirm" value="Confirm" class="button_next"/>
73 73 </form>
74 74 <?php if (AJAX) { echo $html->js('form.js'); } ?>
75 75 \ No newline at end of file
... ...
setup/migrate/templates/services.tpl
  View file @80f6fb9
... ... @@ -2,7 +2,7 @@
2 2 <p class="title">Deactivate Services</p>
3 3  
4 4 <p class="description">
5   - Services need to be deactivated before the migration takes place.
  5 + All KnowledgeTree services need to be deactivated before the migration takes place.
6 6 </p>
7 7 <!--Continue Message-->
8 8 <?php
... ... @@ -77,7 +77,7 @@
77 77 </div>
78 78 <?php } ?>
79 79 </div>
80   - <input type="submit" name="Previous" value="Back" class="button_previous"/>
  80 + <input type="submit" name="Previous" value="Previous" class="button_previous"/>
81 81 <input type="submit" name="Next" value="Next" class="button_next"/>
82 82 </form>
83 83 <?php if (AJAX) { echo $html->js('form.js'); } ?>
84 84 \ No newline at end of file
... ...
setup/upgrade/templates/backup.tpl
  View file @80f6fb9
... ... @@ -48,7 +48,7 @@ You can continue to do the backup manually using the following process:
48 48 </div>
49 49 <?php include 'templates/loading.tpl'; ?>
50 50 <div id="buttonBar">
51   - <input type="submit" name="Previous" value="Back" class="button_previous">
  51 + <input type="submit" name="Previous" value="Previous" class="button_previous">
52 52 <?php
53 53 if ($dir != '')
54 54 {
... ...
setup/upgrade/templates/restore.tpl
  View file @80f6fb9
... ... @@ -94,7 +94,7 @@ Press &lt;i&gt;Next&lt;/i&gt; to attempt the command(s) above.
94 94 </div>
95 95 <?php include 'templates/loading.tpl'; ?>
96 96 <div id="buttonBar">
97   - <input type="submit" name="Previous" value="Back" class="button_previous">
  97 + <input type="submit" name="Previous" value="Previous" class="button_previous">
98 98 <?php if (($dir != '') && ($selected)) { ?>
99 99 <input type="button" name="RunRestore" value="Next" class="button_next" onclick="doSubmit(this);">
100 100 <?php }
... ...
setup/wizard/resources/css/wizard.css
  View file @80f6fb9
... ... @@ -155,8 +155,16 @@ select {
155 155 min-height:355px;
156 156 }
157 157  
  158 +.license_agreement {
  159 + overflow: scroll;
  160 + /*width:765px;*/
  161 + height:370px;
  162 + overflow-x:hidden;
  163 + border:1px solid #CFCFCF;
  164 +}
  165 +
158 166 #sidebar {
159   - font-size: 90%;
  167 + font-size: 85%;
160 168 color: grey;
161 169 font-family: sans-serif;
162 170 margin-top: 0px;
... ... @@ -166,7 +174,6 @@ select {
166 174 line-height:3;
167 175 padding-left:20px;
168 176 text-align:left;
169   - /*background-image:url("../graphics/left.png");*/
170 177 }
171 178  
172 179 #footer {
... ... @@ -361,7 +368,6 @@ select {
361 368 .description {
362 369 color:#898989;
363 370 line-height:150%;
364   - /*margin-bottom:0.75em;*/
365 371 font-size:90%;
366 372 }
367 373  
... ... @@ -445,7 +451,6 @@ td.dir_description {
445 451  
446 452 .php_con_details table {
447 453 width:745px;
448   - /*border:1px solid;*/
449 454 }
450 455  
451 456 .error_message {
... ... @@ -483,15 +488,6 @@ td.dir_description {
483 488 padding:4px;
484 489 }
485 490  
486   -.license_agreement {
487   - overflow: scroll;
488   - height: 255px;
489   - width:765px;
490   - height:370px;
491   - overflow-x:hidden;
492   - border:1px solid #CFCFCF;
493   -}
494   -
495 491 .db_adv_options {
496 492 height:200px;
497 493 width:720px;
... ...
setup/wizard/templates/dependencies.tpl
  View file @80f6fb9
... ... @@ -9,7 +9,7 @@
9 9 if(!$errors && $warnings) {
10 10 ?>
11 11 <span class='big_ok'>&nbsp;&nbsp;&nbsp;</span>
12   - <span class='description'>Congratulations! Your system is ready to run KnowledgeTree. Click Next to continue.</span>
  12 + <span class='description'>Congratulations! Your system is ready to run KnowledgeTree. Click <b>Next</b> to continue.</span>
13 13 <br/><br/>
14 14 <?php
15 15 }
... ...
setup/wizard/templates/install.tpl
  View file @80f6fb9
1 1 <form id="registration_install_complete" action="index.php?step_name=<?php echo $step_name; ?>" method="post">
2 2 <p class="title">Finalizing System Installation</p>
3   -
4 3 <div id="step_content_<?php echo $step_name; ?>" class="step">
5   - <br/>
6   - <br/>
  4 + <p class="empty_space"> The wizard will now complete the installation and run a final check on your system. </p>
7 5 <p class="empty_space">
8   - The wizard will now complete the installation and run a final check on the system.
  6 + 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>
9 7 </p>
10   - <div class="demo"><?php echo $html->image('kt_browse.png'); ?></div>
11   - <br/>
12   - <br/>
13   - <p>
14   - <input type='checkbox' name='call_home' value='enable' checked /> Enable the monitoring system
  8 + <p class="empty_space"">
  9 + 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.
15 10 </p>
  11 + <div class="demo"><?php echo $html->image('kt_browse.png'); ?></div>
  12 + <br/><br/>
  13 + <p><input type='checkbox' name='call_home' value='enable' checked /> Help to improve KnowledgeTree by providing anonymous usage statistics</p>
16 14 </div>
17 15 <input type="submit" name="Previous" value="Previous" class="button_previous"/>
18 16 <input type="submit" name="Install" value="Install" class="button_next"/>
... ...
setup/wizard/templates/installtype.tpl
  View file @80f6fb9
... ... @@ -2,21 +2,20 @@
2 2 <p class="title">Installation Type</p>
3 3  
4 4 <div id="step_content" class="step">
5   - <br/>
6   - The wizard will require you choose an installation type.
  5 + Select an installation type
7 6 <br/><br/>
8 7 <table>
9 8 <tr>
10 9 <td> <input type="radio" name="installtype" value="Clean Install" checked id="clean" /> </td>
11   - <td> <label for="clean"><b>Clean Install</b> - New Installation of KnowledgeTree</label> </td>
  10 + <td> <label for="clean"><b>Default Install</b> <br/>Install a new copy of KnowledgeTree</label> </td>
12 11 </tr>
13 12 <tr>
14 13 <td> <input type="radio" name="installtype" value="Upgrade Installation" id="migrate" /> </td>
15   - <td> <label for="migrate"><b>Upgrade Installation</b> - Upgrade an existing Installation of KnowledgeTree</label> </td>
  14 + <td> <label for="migrate"><b>Upgrade - KnowledgeTree Stack</b> <br/> Upgrade from a previous version of the KnowledgeTree Stack</label></td>
16 15 </tr>
17 16 <tr>
18 17 <td> <input type="radio" name="installtype" value="Upgrade Only" id="upgrade" /> </td>
19   - <td> <label for="upgrade"><b>Source Only Upgrade</b> - Manually Update Source and Upgrade Database only</label> </td>
  18 + <td> <label for="upgrade"><b>Upgrade - Source Only</b> <br/> Upgrade from a Source Only Installation of KnowledgeTree</label></td>
20 19 </tr>
21 20 </table>
22 21 </div>
... ...
setup/wizard/templates/welcome.tpl
  View file @80f6fb9
1 1 <form id="welcome_license" action="index.php?step_name=<?php echo $step_name; ?>" method="post">
2   - <p class="title">Welcome to KnowledgeTree</p>
  2 + <p class="title">Welcome to the KnowledgeTree Setup Wizard</p>
3 3 <div id="step_content" class="step">
4   - <br/>
5   - <br/>
6   - <p class="empty_space"> This wizard will lead you through the steps needed to install and configure KnowledgeTree on your server. </p>
7   - <div class="demo"><?php echo $html->image('kt_browse.png'); ?> </div>
  4 + <p class="empty_space"> This wizard will lead you through all the steps required to install and configure KnowledgeTree on your server.</p>
  5 + <p class="empty_space">
  6 + Press <b>Next</b> to continue.</p>
  7 + <!-- <div class="demo"><?php echo $html->image('kt_browse.png'); ?> </div> -->
8 8 </div>
9 9 <input type="submit" name="Next" value="Next" class="button_next"/>
10 10 <!-- <input type="submit" name="Migrate" value="Migrate" class="button_next"/>-->
... ...