StoryId 778896:Updated Styles

Committed by: Jarrett Jordaan Reviewed by: Megan Watson

StoryId 778896:Updated Styles
Committed by: Jarrett Jordaan Reviewed by: Megan Watson
Jarrett Jordaan
1 parent a60df623
Showing 6 changed files with 25 additions and 18 deletions
setup/wizard/index.php
setup/wizard/installer.php
setup/wizard/resources/wizard.css
setup/wizard/templates/database_confirm.tpl
setup/wizard/templates/license.tpl
setup/wizard/templates/welcome.tpl
@@ -44,7 +44,10 @@
 	// Bypass
 	if(isset($_GET['bypass'])) {
 		if($_GET['bypass'])
-			touch("install");
+			@touch("install");
+		else {
+			@unlink("install");
+		}
 	}
  
 	if(!$ui->isSystemInstalled()) {
@@ -452,7 +452,7 @@ class Installer {
     }
  
     private function completeInstall() {
-    	unlink("install");
+    	@unlink("install");
     }
  
 	/**
@@ -171,6 +171,7 @@ td {
 }
  
 .error {
+	font-weight: bold;
     color: #9F0000;
 }
  
@@ -247,4 +248,8 @@ input#dname {
  
 .adv_options {
 	padding: 5px 8px;
+}
+
+#section {
+	/*border:1px solid;*/
 }
 \ No newline at end of file
@@ -3,11 +3,12 @@
 <div class="description">
 Please confirm that your database settings have been entered correctly before proceeding with the installation.
 </div>
-
+<div id="section">
 <h3>Database Settings</h3>
  
 <form action="index.php?step_name=<?php echo $step_name; ?>" method="post">
-<table width="100%">
+
+<table width="20%" class="dbconf">
 <?php
 if($dtypes) {
         $type = '';
@@ -16,14 +17,14 @@ if($dtypes) {
         }
         ?>
     <tr>
-        <td width="40%"><b>Database type: </b></td>
+        <td><b>Database type: </b></td>
         <td><?php echo $type; ?></td>
     </tr>
     <?php
 }
 ?>
     <tr>
-        <td width="40%"><b>Name: </b></td>
+        <td><b>Name: </b></td>
         <td><?php echo $dname; ?></td>
     </tr>
     <tr>
@@ -44,12 +45,12 @@ if($dtypes) {
     </tr>
     <?php } ?>
 </table>
-
+</div>
 <h3>Advanced Settings</h3>
  
-<table width="100%">
+<table width="46%" class="dbconf">
     <tr>
-        <td width="40%"><b>Host: </b></td>
+        <td><b>Host: </b></td>
         <td><?php echo $dhost; ?></td>
     </tr>
     <tr>
@@ -68,9 +69,9 @@ if($dtypes) {
  
 <h3>Database Users</h3>
  
-<table width="100%">
+<table width="16%" class="dbconf">
     <tr>
-        <td width="40%"><b>DMS Admin Username: </b></td>
+        <td><b>DMS Admin Username: </b></td>
         <td><?php echo $dmsname; ?></td>
     </tr>
     <tr>
@@ -87,7 +88,6 @@ if($dtypes) {
     </tr>
 </table>
  
-
 <div class="buttons">
     <input type="submit" name="Edit" value="Edit"/>
     <input type="submit" name="Confirm" value="Confirm"/>
@@ -13,7 +13,7 @@ Please read and accept the license agreement below before continuing with the se
 </p>
  
 <form action="index.php?step_name=license" method="POST">
-<div style="overflow: scroll; height: 500px; width:800px;">
+<div style="overflow: scroll; height: 500px; width:800px; overflow-x:hidden;">
 <h2>KnowledgeTree On-premise Commercial End-User</h2>
 <p>
 License Agreement Version 2.3
@@ -330,13 +330,12 @@ Software. If any provision of this Agreement is deemed invalid or unenforceable 
 government agency having jurisdiction, that particular provision will be deemed modified to the extent
 necessary to make the provision valid and enforceable, and the remaining provisions will remain in full
 force and effect. The original of this Agreement has been written in English, and that version will
-govern. Les parties aux prŽsentes confirment leur volontŽ que cette convention, de mme que tous les
-documents, y compris tout avis, qui s?y rattachent, soient rŽdigŽs en langue anglaise.
+govern.
 </p>
 </div>
-
+<br/>
 <div class="agree">
-    <input type="radio" name="license" value="1" checked="checked"/>I accept the agreement
+    <input type="radio" name="license" value="1""/>I accept the agreement
     <br/>
     <input type="radio" name="license" value="0"/>I do not accept the agreement
 </div>
@@ -2,7 +2,7 @@
  
 <div style='width:800px;'>
 <p>
-KnowledgeTreeTM is document management made simple - easily share, track, secure, and manage the documents and records your organization depends on.
+KnowledgeTree<sup>TM</sup> is document management made simple - easily share, track, secure, and manage the documents and records your organization depends on.
 </p>
 <p>
 KnowledgeTree provides an easy-to-use, production-ready, enterprise document management solution for use by corporations, government institutions, medium