diff --git a/setup/wizard/lib/validation/luceneValidation.php b/setup/wizard/lib/validation/luceneValidation.php index 859f035..b35c72d 100644 --- a/setup/wizard/lib/validation/luceneValidation.php +++ b/setup/wizard/lib/validation/luceneValidation.php @@ -1,4 +1,45 @@ . +* +* 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 diff --git a/setup/wizard/lib/validation/openofficeValidation.php b/setup/wizard/lib/validation/openofficeValidation.php index d193743..f2d1b2b 100644 --- a/setup/wizard/lib/validation/openofficeValidation.php +++ b/setup/wizard/lib/validation/openofficeValidation.php @@ -1,4 +1,44 @@ . +* +* 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 diff --git a/setup/wizard/lib/validation/schedulerValidation.php b/setup/wizard/lib/validation/schedulerValidation.php index 5150a12..b39b9ad 100644 --- a/setup/wizard/lib/validation/schedulerValidation.php +++ b/setup/wizard/lib/validation/schedulerValidation.php @@ -1,4 +1,44 @@ . +* +* 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 diff --git a/setup/wizard/lib/validation/serviceValidation.php b/setup/wizard/lib/validation/serviceValidation.php index 92b9ddb..ba77226 100644 --- a/setup/wizard/lib/validation/serviceValidation.php +++ b/setup/wizard/lib/validation/serviceValidation.php @@ -1,4 +1,44 @@ . +* +* 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 diff --git a/setup/wizard/resources/css/ie6.css b/setup/wizard/resources/css/ie6.css new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/setup/wizard/resources/css/ie6.css diff --git a/setup/wizard/resources/css/migrate.css b/setup/wizard/resources/css/migrate.css index 98620cc..fa69e42 100644 --- a/setup/wizard/resources/css/migrate.css +++ b/setup/wizard/resources/css/migrate.css @@ -1,31 +1,27 @@ #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; } diff --git a/setup/wizard/resources/css/wizard.css b/setup/wizard/resources/css/wizard.css index 6c9252d..1add021 100644 --- a/setup/wizard/resources/css/wizard.css +++ b/setup/wizard/resources/css/wizard.css @@ -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 { diff --git a/setup/wizard/resources/graphics/img_fatlogo.jpg b/setup/wizard/resources/graphics/img_fatlogo.jpg new file mode 100644 index 0000000..c9e2e79 --- /dev/null +++ b/setup/wizard/resources/graphics/img_fatlogo.jpg diff --git a/setup/wizard/resources/js/wizard.js b/setup/wizard/resources/js/wizard.js index c7bf49e..3809f30 100644 --- a/setup/wizard/resources/js/wizard.js +++ b/setup/wizard/resources/js/wizard.js @@ -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 { diff --git a/setup/wizard/steps/registration.php b/setup/wizard/steps/registration.php index 47b7085..dd883e9 100644 --- a/setup/wizard/steps/registration.php +++ b/setup/wizard/steps/registration.php @@ -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'; diff --git a/setup/wizard/templates/install.tpl b/setup/wizard/templates/install.tpl index 2bcc87d..b61c652 100644 --- a/setup/wizard/templates/install.tpl +++ b/setup/wizard/templates/install.tpl @@ -3,12 +3,12 @@

The wizard will now complete the installation and run a final check on your system.

- 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 KnowledgeTree Privacy and Data Protection Agreements. + 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 KnowledgeTree Privacy and Data Protection Agreements.

KnowledgeTree, in partnership with Food & Trees for Africa, 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.

-
image('kt_browse.png'); ?>
+
image('img_fatlogo.jpg'); ?>


Help to improve KnowledgeTree by providing anonymous usage statistics

diff --git a/setup/wizard/templates/license.tpl b/setup/wizard/templates/license.tpl index ccca626..5c9d6ff 100644 --- a/setup/wizard/templates/license.tpl +++ b/setup/wizard/templates/license.tpl @@ -14,7 +14,7 @@ Please read and accept the license agreement below before continuing with the se - - + + js('form.js'); } ?> \ No newline at end of file diff --git a/setup/wizard/templates/registration_confirm.tpl b/setup/wizard/templates/registration_confirm.tpl index 8b3f615..1cd09b4 100644 --- a/setup/wizard/templates/registration_confirm.tpl +++ b/setup/wizard/templates/registration_confirm.tpl @@ -6,7 +6,6 @@

Thank you for signing up. You'll receive an email from us shortly with download instructions for the KnowledgeTree Drop Box software.

-
image('kt_browse.png'); ?>
diff --git a/setup/wizard/templates/welcome.tpl b/setup/wizard/templates/welcome.tpl index d60464e..652c790 100644 --- a/setup/wizard/templates/welcome.tpl +++ b/setup/wizard/templates/welcome.tpl @@ -4,7 +4,6 @@

This wizard will lead you through all the steps required to install and configure KnowledgeTree on your server.

Press Next to continue.

-