Commit 7bbaa40a0650e37462a96b720a146e3234a3c367

Authored by Mark Holtzhausen
2 parents 3cbeffe0 64ac6f46

Merge branch 'edge' of git@github.com:ktgit/knowledgetree into edge

setup/wizard/templates/configuration.tpl
@@ -17,7 +17,7 @@ @@ -17,7 +17,7 @@
17 <!--Warning and Error Messages--> 17 <!--Warning and Error Messages-->
18 <?php if($errors) { ?> 18 <?php if($errors) { ?>
19 <span class='cross'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span> 19 <span class='cross'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span>
20 - <span class='error_message'>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> 20 + <span class='error_message'>Your system is not quite ready to run KnowledgeTree. See the list below to determine which areas you need to address. </span>
21 <br/> 21 <br/>
22 <?php } elseif ($warnings) { 22 <?php } elseif ($warnings) {
23 ?> 23 ?>
@@ -98,7 +98,7 @@ @@ -98,7 +98,7 @@
98 <?php if(isset($path['msg'])) { 98 <?php if(isset($path['msg'])) {
99 ?> 99 ?>
100 <td class="error"> <?php echo $path['msg']; ?> </td> 100 <td class="error"> <?php echo $path['msg']; ?> </td>
101 - <td><a href="javascript:this.location.reload();" class="refresh">Refresh</a></td> 101 +<!-- <td><a href="javascript:this.location.reload();" class="refresh">Refresh</a></td>-->
102 <?php 102 <?php
103 } else { 103 } else {
104 ?> 104 ?>
setup/wizard/templates/configuration_confirm.tpl
@@ -11,7 +11,7 @@ @@ -11,7 +11,7 @@
11 <!--Warning and Error Messages--> 11 <!--Warning and Error Messages-->
12 <?php if($errors) { ?> 12 <?php if($errors) { ?>
13 <span class='cross'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span> 13 <span class='cross'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span>
14 - <span class='error_message'>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> 14 + <span class='error_message'>Your system is not quite ready to run KnowledgeTree. See the list below to determine which areas you need to address.</span>
15 <br/> 15 <br/>
16 <?php } elseif ($warnings) { 16 <?php } elseif ($warnings) {
17 ?> 17 ?>
setup/wizard/templates/dependencies.tpl
@@ -17,7 +17,7 @@ @@ -17,7 +17,7 @@
17 <!--Warning and Error Messages--> 17 <!--Warning and Error Messages-->
18 <?php if($errors) { ?> 18 <?php if($errors) { ?>
19 <span class='cross'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span> 19 <span class='cross'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span>
20 - <span class='error_message'>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> 20 + <span class='error_message'>Your system is not quite ready to run KnowledgeTree. See the list below to determine which areas you need to address. </span>
21 <br/> 21 <br/>
22 <?php } elseif ($warnings) { ?> 22 <?php } elseif ($warnings) { ?>
23 <span class='cross_orange'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span> 23 <span class='cross_orange'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span>
setup/wizard/templates/services.tpl
@@ -23,7 +23,7 @@ @@ -23,7 +23,7 @@
23 <!--Warning and Error Messages--> 23 <!--Warning and Error Messages-->
24 <?php if($errors) { ?> 24 <?php if($errors) { ?>
25 <span class='cross'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span> 25 <span class='cross'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span>
26 - <span class='error_message'>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> 26 + <span class='error_message'>Your system is not quite ready to run KnowledgeTree. See the list below to determine which areas you need to address.</span>
27 <br/> 27 <br/>
28 <?php } elseif ($warnings) { 28 <?php } elseif ($warnings) {
29 ?> 29 ?>