Story Id:1459843 : Updated CSS On Setup Wizards

Committed by: Jarrett Jordaan Reviewed by: Megan Watson

Story Id:1459843 : Updated CSS On Setup Wizards
Committed by: Jarrett Jordaan Reviewed by: Megan Watson
Jarrett Jordaan
1 parent 12586044
Showing 14 changed files with 191 additions and 55 deletions
setup/wizard/lib/validation/luceneValidation.php
setup/wizard/lib/validation/openofficeValidation.php
setup/wizard/lib/validation/schedulerValidation.php
setup/wizard/lib/validation/serviceValidation.php
setup/wizard/resources/css/ie6.css
setup/wizard/resources/css/migrate.css
setup/wizard/resources/css/wizard.css
setup/wizard/resources/graphics/img_fatlogo.jpg
setup/wizard/resources/js/wizard.js
setup/wizard/steps/registration.php
setup/wizard/templates/install.tpl
setup/wizard/templates/license.tpl
setup/wizard/templates/registration_confirm.tpl
setup/wizard/templates/welcome.tpl
 <?php
+/**
+* Lucene Service Validation.
+*
+* KnowledgeTree Community Edition
+* Document Management Made Simple
+* Copyright(C) 2008,2009 KnowledgeTree Inc.
+* Portions copyright The Jam Warehouse Software(Pty) Limited
+*
+* This program is free software; you can redistribute it and/or modify it under
+* the terms of the GNU General Public License version 3 as published by the
+* Free Software Foundation.
+*
+* This program is distributed in the hope that it will be useful, but WITHOUT
+* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+* FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+* details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*
+* You can contact KnowledgeTree Inc., PO Box 7775 #87847, San Francisco,
+* California 94120-7775, or email info@knowledgetree.com.
+*
+* The interactive user interfaces in modified source and object code versions
+* of this program must display Appropriate Legal Notices, as required under
+* Section 5 of the GNU General Public License version 3.
+*
+* In accordance with Section 7(b) of the GNU General Public License version 3,
+* these Appropriate Legal Notices must retain the display of the "Powered by
+* KnowledgeTree" logo and retain the original copyright notice. If the display of the
+* logo is not reasonably feasible for technical reasons, the Appropriate Legal Notices
+* must display the words "Powered by KnowledgeTree" and retain the original
+* copyright notice.
+*
+* @copyright 2008-2009, KnowledgeTree Inc.
+* @license GNU General Public License version 3
+* @author KnowledgeTree Team
+* @package Installer
+* @version Version 0.1
+*/
+
 class luceneValidation extends serviceValidation {
 	/**
 	* Path to java executable
 <?php
+/**
+* Open Office Service Validation.
+*
+* KnowledgeTree Community Edition
+* Document Management Made Simple
+* Copyright(C) 2008,2009 KnowledgeTree Inc.
+* Portions copyright The Jam Warehouse Software(Pty) Limited
+*
+* This program is free software; you can redistribute it and/or modify it under
+* the terms of the GNU General Public License version 3 as published by the
+* Free Software Foundation.
+*
+* This program is distributed in the hope that it will be useful, but WITHOUT
+* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+* FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+* details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*
+* You can contact KnowledgeTree Inc., PO Box 7775 #87847, San Francisco,
+* California 94120-7775, or email info@knowledgetree.com.
+*
+* The interactive user interfaces in modified source and object code versions
+* of this program must display Appropriate Legal Notices, as required under
+* Section 5 of the GNU General Public License version 3.
+*
+* In accordance with Section 7(b) of the GNU General Public License version 3,
+* these Appropriate Legal Notices must retain the display of the "Powered by
+* KnowledgeTree" logo and retain the original copyright notice. If the display of the
+* logo is not reasonably feasible for technical reasons, the Appropriate Legal Notices
+* must display the words "Powered by KnowledgeTree" and retain the original
+* copyright notice.
+*
+* @copyright 2008-2009, KnowledgeTree Inc.
+* @license GNU General Public License version 3
+* @author KnowledgeTree Team
+* @package Installer
+* @version Version 0.1
+*/
 class openofficeValidation extends serviceValidation {
 	/**
 	* Path to open office executable
 <?php
+/**
+* Scheduler Service Validation.
+*
+* KnowledgeTree Community Edition
+* Document Management Made Simple
+* Copyright(C) 2008,2009 KnowledgeTree Inc.
+* Portions copyright The Jam Warehouse Software(Pty) Limited
+*
+* This program is free software; you can redistribute it and/or modify it under
+* the terms of the GNU General Public License version 3 as published by the
+* Free Software Foundation.
+*
+* This program is distributed in the hope that it will be useful, but WITHOUT
+* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+* FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+* details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*
+* You can contact KnowledgeTree Inc., PO Box 7775 #87847, San Francisco,
+* California 94120-7775, or email info@knowledgetree.com.
+*
+* The interactive user interfaces in modified source and object code versions
+* of this program must display Appropriate Legal Notices, as required under
+* Section 5 of the GNU General Public License version 3.
+*
+* In accordance with Section 7(b) of the GNU General Public License version 3,
+* these Appropriate Legal Notices must retain the display of the "Powered by
+* KnowledgeTree" logo and retain the original copyright notice. If the display of the
+* logo is not reasonably feasible for technical reasons, the Appropriate Legal Notices
+* must display the words "Powered by KnowledgeTree" and retain the original
+* copyright notice.
+*
+* @copyright 2008-2009, KnowledgeTree Inc.
+* @license GNU General Public License version 3
+* @author KnowledgeTree Team
+* @package Installer
+* @version Version 0.1
+*/
 class schedulerValidation extends serviceValidation {
 	/**
 	* Path to php executable
 <?php
+/**
+* Service Validation.
+*
+* KnowledgeTree Community Edition
+* Document Management Made Simple
+* Copyright(C) 2008,2009 KnowledgeTree Inc.
+* Portions copyright The Jam Warehouse Software(Pty) Limited
+*
+* This program is free software; you can redistribute it and/or modify it under
+* the terms of the GNU General Public License version 3 as published by the
+* Free Software Foundation.
+*
+* This program is distributed in the hope that it will be useful, but WITHOUT
+* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+* FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+* details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*
+* You can contact KnowledgeTree Inc., PO Box 7775 #87847, San Francisco,
+* California 94120-7775, or email info@knowledgetree.com.
+*
+* The interactive user interfaces in modified source and object code versions
+* of this program must display Appropriate Legal Notices, as required under
+* Section 5 of the GNU General Public License version 3.
+*
+* In accordance with Section 7(b) of the GNU General Public License version 3,
+* these Appropriate Legal Notices must retain the display of the "Powered by
+* KnowledgeTree" logo and retain the original copyright notice. If the display of the
+* logo is not reasonably feasible for technical reasons, the Appropriate Legal Notices
+* must display the words "Powered by KnowledgeTree" and retain the original
+* copyright notice.
+*
+* @copyright 2008-2009, KnowledgeTree Inc.
+* @license GNU General Public License version 3
+* @author KnowledgeTree Team
+* @package Installer
+* @version Version 0.1
+*/
 class serviceValidation {
 	/**
 	* List of errors encountered
 #step_content_installation {
 	border: 1px solid rgb(207, 207, 207);
+	overflow: auto;
 	padding: 5px;
-	min-height:365px;
 	height:365px;
-	height:auto !important;
 }
 #step_content_services {
 	border: 1px solid rgb(207, 207, 207);
+	overflow: auto;
 	padding: 5px;
-	min-height:340px;
 	height:340px;
-	height:auto !important;
 }
 #step_content_database {
 	border: 1px solid rgb(207, 207, 207);
+	overflow: auto;
 	padding: 5px;
-	min-height:380px;
 	height:380px;
-	height:auto !important;
 }
 #step_content_complete {
 	border: 1px solid rgb(207, 207, 207);
+	overflow: auto;
 	padding: 5px;
-	min-height:360px;
 	height:360px;
-	height:auto !important;
 }
@@ -70,8 +70,7 @@ select {
 #outer-wrapper {
 	border:1px solid #B7B7B7;
 	margin-top:20px;
-	width:984px;
-	/*width:1024px;*/
+	width:1024px;
 }
 #header {
@@ -106,72 +105,54 @@ select {
 	padding: 5px;
 	overflow: auto;
 	min-height: 400px;
-	height: 400px;
-	height:auto !important;
 }
 #step_content_dependencies {
 	border: 1px solid rgb(207, 207, 207);
 	padding: 5px;
 	min-height:270px;
-	height:270px;
-	height:auto !important;
 }
 #step_content_configuration {
 	border: 1px solid rgb(207, 207, 207);
 	padding: 5px;
 	min-height:320px;
-	height:320px;
-	height:auto !important;
 }
 #step_content_registration {
 	border: 1px solid rgb(207, 207, 207);
 	padding: 5px;
 	min-height:320px;
-	height:320px;
-	height:auto !important;
 }
 #step_content_registration_confirm {
 	border: 1px solid rgb(207, 207, 207);
 	padding: 5px;
 	min-height:400px;
-	height:400px;
-	height:auto !important;
 }
 #step_content_install {
 	border: 1px solid rgb(207, 207, 207);
 	padding: 5px;
-	min-height:290px;
-	height:290px;
-	height:auto !important;
+	min-height:400px;
 }
 #step_content_database {
 	border: 1px solid rgb(207, 207, 207);
 	padding: 5px;
 	min-height:365px;
-	height:365px;
-	height:auto !important;
 }
 #step_content_database_confirm {
 	border: 1px solid rgb(207, 207, 207);
 	padding: 5px;
 	min-height:370px;
-	height:370px;
-	height:auto !important;
 }
 #step_content_complete {
 	border: 1px solid rgb(207, 207, 207);
 	padding: 5px;
-	min-height:355px;
-	height:355px;
-	height:auto !important;
+	min-height:340px;
 }
 .license_agreement {
@@ -217,15 +198,14 @@ select {
 #logo {
 	position:relative;
-	right:740px;
+	right:760px;
 	top:20px;
 }
 #install_details {
-	bottom:25%;
-	left:74%;
+	bottom:20px;
 	position:relative;
-	width:25%;
+	right:10px;
 }
 .indicator a {
@@ -56,31 +56,31 @@ wizard.prototype.validateRegistration = function() {
 }
 wizard.prototype.valRegHelper = function() {
-	var first = document.getElementById('first');
-	var last = document.getElementById('last');
-	var email = document.getElementById('email');
-	if(first.value.length < 1) {
-		document.getElementById("reg_error").innerHTML = "Please enter a First Name";
+	var first = $("#first");
+	var last = $("#last");
+	var email = $("#email");
+	if(first.attr('value').length < 1) {
+		$("#reg_error").html('Please enter a First Name');
 		w.focusElement(first);
 		return false;
 	}
-	if(!w.nameCheck(first.value)) {
-		document.getElementById("reg_error").innerHTML = "Please enter a valid First Name";
+	if(!w.nameCheck(first.attr('value'))) {
+		$("#reg_error").html('Please enter a valid First Name');
 		w.focusElement(first);
 		return false;
 	}
-	if(last.value.length < 1) {
-		document.getElementById("reg_error").innerHTML = "Please enter a Last Name";
+	if(last.attr('value').length < 1) {
+		$("#reg_error").html('Please enter a Last Name');
 		w.focusElement(last);
 		return false;
 	}
-	if(!w.nameCheck(last.value)) {
-		document.getElementById("reg_error").innerHTML = "Please enter a valid Last Name";
+	if(!w.nameCheck(last.attr('value'))) {
+		$("#reg_error").html('Please enter a valid Last Name');
 		w.focusElement(last);
 		return false;
 	}
-	if(!w.emailCheck(email.value)) {
-		document.getElementById("reg_error").innerHTML = "Please enter a valid email address";
+	if(!w.emailCheck(email.attr('value'))) {
+		$("#reg_error").html('Please enter a valid email address');
 		w.focusElement(email);
 		return false;
 	}
@@ -89,7 +89,8 @@ wizard.prototype.valRegHelper = function() {
 }
 wizard.prototype.nameCheck = function(str) {
-	var nameRegxp = /^([a-zA-Z]+)$/;
+	str = w.trim(str);
+	var nameRegxp = /^([a-z A-Z]+)$/;
 	if(str.match(nameRegxp)) {
 		return true;
 	} else {
@@ -132,7 +132,7 @@ class registration extends Step
 	    //$this->sendToHost($_POST);
 	    // Post the form using curl
-        $this->curlForm($_POST);
+//        $this->curlForm($_POST);
         // Prevent the form being reposted.
         $_POST['registered'] = 'yes';
@@ -3,12 +3,12 @@
 	<div id="step_content_<?php echo $step_name; ?>" class="step">
 		<p class="empty_space">	The wizard will now complete the installation and run a final check on your system.	</p>
 		<p class="empty_space">
-			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>
+			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="http://www.knowledgetree.com/about/legal" target="_blank">KnowledgeTree Privacy and Data Protection Agreements.</a>
 		</p>
 		<p class="empty_space"">
 			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.
 		</p>
-		<div class="demo"><?php echo $html->image('kt_browse.png'); ?></div>
+		<div class="demo"><?php echo $html->image('img_fatlogo.jpg'); ?></div>
 		<br/><br/>
 		<p><input type='checkbox' name='call_home' value='enable' checked /> Help to improve KnowledgeTree by providing anonymous usage statistics</p>
 	</div>
@@ -14,7 +14,7 @@ Please read and accept the license agreement below before continuing with the se
 </div>
 	<input id="accept" type="hidden" name="license" value=""/>
 	<input type="submit" name="Previous" value="Previous" class="button_previous"/>
-	<input type="submit" name="Next" value="I Agree" onclick="javascript:{document.getElementById('accept').value = 1;}" class="button_next"/>
-    <input type="submit" name="Next" value="I Disagree" onclick="javascript:{document.getElementById('accept').value = 0;}" class="button_next"/>
+	<input type="submit" name="Next" value="I Agree" onclick="javascript:{$('#accept').attr('value', '1');}" class="button_next"/>
+    <input type="submit" name="Next" value="I Disagree" onclick="javascript:{$('#accept').attr('value', '0');}" class="button_next"/>
 </form>
 <?php if (AJAX) { echo $html->js('form.js'); } ?>
 \ No newline at end of file
@@ -6,7 +6,6 @@
 		<p class="empty_space">
 			Thank you for signing up. You'll receive an email from us shortly with download instructions for the KnowledgeTree Drop Box software.
 		</p>
-		<div class="demo"><?php echo $html->image('kt_browse.png'); ?></div>
 	</div>
 	<input type="submit" name="Previous" value="Previous" class="button_previous"/>
 	<input type="submit" name="Confirm" value="Next" class="button_next"/>
@@ -4,7 +4,6 @@
 		<p class="empty_space"> This wizard will lead you through all the steps required to install and configure KnowledgeTree on your server.</p> 
 		<p class="empty_space">
 		Press <b>Next</b> to continue.</p>
-		<!-- <div class="demo"><?php echo $html->image('kt_browse.png'); ?> </div> -->
 	</div>
 	<input type="submit" name="Next" value="Next" class="button_next"/>
 <!--	<input type="submit" name="Migrate" value="Migrate" class="button_next"/>-->