Revert "Merge Conflicts"

This reverts commit b6322f6e961632c89beee586609636b5b6405397.

Revert "Merge Conflicts"
This reverts commit b6322f6e961632c89beee586609636b5b6405397.
Jarrett Jordaan
1 parent b6322f6e
Showing 169 changed files with 5 additions and 5 deletions
setup/migrate/config/config.xml
setup/migrate/index.php
setup/migrate/migrateUtil.php
setup/migrate/migrateWizard.php
setup/migrate/migrater.php
setup/migrate/session.php
setup/migrate/step.php
setup/migrate/stepAction.php
setup/migrate/steps/migrateComplete.php
setup/migrate/steps/migrateDatabase.php
setup/migrate/steps/migrateErrors.php
setup/migrate/steps/migrateInstallation.php
setup/migrate/steps/migrateServices.php
setup/migrate/templates/complete.tpl
setup/migrate/templates/database.tpl
setup/migrate/templates/error.tpl
setup/migrate/templates/errors.tpl
setup/migrate/templates/installation.tpl
setup/migrate/templates/installation_confirm.tpl
setup/migrate/templates/services.tpl
@@ -261,7 +261,7 @@ class MigrateWizard {
 			}
 		} else {
 			// TODO: Die gracefully
-			$this->util->error("System has been migrated <a href='../../login.php' class='back' style='width:90px;float:none' back button_next>Goto Login</a>");
+			$this->util->error("System has been migrated <a href='../../login.php' class='back' style='width:80px;float:none' back button_next>Goto Login</a>");
 		}
 	}
 }
@@ -9,5 +9,5 @@
 	    Your database has been upgraded to <?php echo $default->systemVersion; ?>
 	</div>
 	</div>
-	<a href="../../" class="back button_next" style="width:90px;" onclick="javascript:{w.clearSessions();}">Goto Login</a>
+	<a href="../../" class="back button_next" style="width:80px;" onclick="javascript:{w.clearSessions();}">Goto Login</a>
 </form>
 \ No newline at end of file
@@ -296,7 +296,7 @@ class InstallWizard {
 			}
 		} else {
 			// TODO: Die gracefully
-			$this->util->error("System has been installed  <a href='../../login.php' class='back' style='width:90px;float:none' class='back button_next'>Goto Login</a>");
+			$this->util->error("System has been installed  <a href='../../login.php' class='back' style='width:80px;float:none' class='back button_next'>Goto Login</a>");
 		}
 	}
 }
@@ -361,7 +361,7 @@ select {
 .onclick {
      cursor: pointer;
      color: #EC7725;
-     width: 150px;
+     width: 130px;
 }
  
 .description {
@@ -136,7 +136,7 @@
 	<?php if($migrate_check) { ?>
 		<a href="../upgrade" class="back button_next" style="width:190px;" onclick="javascript:{w.clearSessions();}">Goto Database Upgrade</a>
     <?php } else { ?>
-    	<a href="../../login.php?redirect=<?php echo $redirect; ?>" class="back button_next" style="width:90px;" onclick="javascript:{w.clearSessions();}">Goto Login</a>
+    	<a href="../../login.php?redirect=<?php echo $redirect; ?>" class="back button_next" style="width:80px;" onclick="javascript:{w.clearSessions();}">Goto Login</a>
     <?php } ?>
     <?php
         if ($install_environment == 'Zend') {