Peter M. Groen / knowledgetree

Commit 769dd63436692fb2ca2dbb7c9c4e0894dc7d6a63

Authored by Jarrett Jordaan
1 parent c408a132

KTS-4438: Updated Services 

Committed by: Jarrett Jordaan

Reviewed by: Megan Watson
Inline Side-by-side
Showing 3 changed files with 6 additions and 13 deletions
setup/migrate/migrateWizard.php
  View file @769dd63
@@ -261,7 +261,7 @@ class MigrateWizard { @@ -261,7 +261,7 @@ class MigrateWizard {
261 } 261 }
262 } else { 262 } else {
263 // TODO: Die gracefully 263 // TODO: Die gracefully
264 - $this->util->error("System has been migrated <div class=\"buttons\"><a href='../../'>Goto Login</a></div>"); 264 + $this->util->error("System has been migrated <a href='../../login.php' class='back' style='width:80px;float:none'>Goto Login</a>");
265 } 265 }
266 } 266 }
267 } 267 }
setup/wizard/installWizard.php
  View file @769dd63
@@ -287,14 +287,7 @@ class InstallWizard { @@ -287,14 +287,7 @@ class InstallWizard {
287 $this->util->redirect('../migrate'); 287 $this->util->redirect('../migrate');
288 } elseif ($this->util->upgradeSpecified()) { 288 } elseif ($this->util->upgradeSpecified()) {
289 $this->util->redirect('../upgrade/index.php?action=installer'); 289 $this->util->redirect('../upgrade/index.php?action=installer');
290 - }/* elseif ($this->util->loginSpecified()) {  
291 - header("Cache-Control: no-cache");  
292 - $this->util->redirect('../../admin.php');  
293 - } elseif ($this->util->zendSpecified()) {  
294 - $zend = "http://".$_SERVER['HTTP_HOST'].":10081/ZendServer/Index";  
295 - header("Cache-Control: no-cache");  
296 - $this->util->redirect($zend);  
297 - }*/ 290 + }
298 $response = $this->systemChecks(); 291 $response = $this->systemChecks();
299 if($response === true) { 292 if($response === true) {
300 $this->displayInstaller(); 293 $this->displayInstaller();
@@ -303,7 +296,7 @@ class InstallWizard { @@ -303,7 +296,7 @@ class InstallWizard {
303 } 296 }
304 } else { 297 } else {
305 // TODO: Die gracefully 298 // TODO: Die gracefully
306 - $this->util->error("System has been installed <div class=\"buttons\"><a href='../../'>Goto Login</a></div>"); 299 + $this->util->error("System has been installed <a href='../../login.php' class='back' style='width:80px;float:none'>Goto Login</a>");
307 } 300 }
308 } 301 }
309 } 302 }
setup/wizard/templates/error.tpl
  View file @769dd63
@@ -9,7 +9,8 @@ @@ -9,7 +9,8 @@
9 </head> 9 </head>
10 10
11 <body onload=""> 11 <body onload="">
12 - <div id="outer-wrapper"> 12 + <div id="outer-outer-wrapper" align="center">
  13 + <div id="outer-wrapper" align="left">
13 <div id="header"> 14 <div id="header">
14 <div id="logo"><img src="resources/graphics/dame/installer-header_logo.png"/></div> 15 <div id="logo"><img src="resources/graphics/dame/installer-header_logo.png"/></div>
15 <div id="install_details"> 16 <div id="install_details">
@@ -53,12 +54,11 @@ @@ -53,12 +54,11 @@
53 </div> 54 </div>
54 <div class="clearing">&nbsp;</div> 55 <div class="clearing">&nbsp;</div>
55 </div> 56 </div>
56 -  
57 <div id="footer"> 57 <div id="footer">
58 -  
59 <img width="105" height="23" align="right" src="resources/graphics/dame/powered-by-kt.png" style="padding: 5px;"/> 58 <img width="105" height="23" align="right" src="resources/graphics/dame/powered-by-kt.png" style="padding: 5px;"/>
60 </div> 59 </div>
61 </div> 60 </div>
  61 + </div>
62 </body> 62 </body>
63 </html> 63 </html>
64 <script> 64 <script>