Peter M. Groen / knowledgetree

Commit d5a3322bf2f09e8d24ae8d82a37f15572168bd87

Authored by Jarrett Jordaan
1 parent 12586044

Story Id:1459843 : Updated CSS On Setup Wizards 

Committed by: Jarrett Jordaan

Reviewed by: Megan Watson
Inline Side-by-side
Showing 14 changed files with 191 additions and 55 deletions
setup/wizard/lib/validation/luceneValidation.php
  View file @d5a3322
1 1 <?php
  2 +/**
  3 +* Lucene Service Validation.
  4 +*
  5 +* KnowledgeTree Community Edition
  6 +* Document Management Made Simple
  7 +* Copyright(C) 2008,2009 KnowledgeTree Inc.
  8 +* Portions copyright The Jam Warehouse Software(Pty) Limited
  9 +*
  10 +* This program is free software; you can redistribute it and/or modify it under
  11 +* the terms of the GNU General Public License version 3 as published by the
  12 +* Free Software Foundation.
  13 +*
  14 +* This program is distributed in the hope that it will be useful, but WITHOUT
  15 +* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
  16 +* FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
  17 +* details.
  18 +*
  19 +* You should have received a copy of the GNU General Public License
  20 +* along with this program. If not, see <http://www.gnu.org/licenses/>.
  21 +*
  22 +* You can contact KnowledgeTree Inc., PO Box 7775 #87847, San Francisco,
  23 +* California 94120-7775, or email info@knowledgetree.com.
  24 +*
  25 +* The interactive user interfaces in modified source and object code versions
  26 +* of this program must display Appropriate Legal Notices, as required under
  27 +* Section 5 of the GNU General Public License version 3.
  28 +*
  29 +* In accordance with Section 7(b) of the GNU General Public License version 3,
  30 +* these Appropriate Legal Notices must retain the display of the "Powered by
  31 +* KnowledgeTree" logo and retain the original copyright notice. If the display of the
  32 +* logo is not reasonably feasible for technical reasons, the Appropriate Legal Notices
  33 +* must display the words "Powered by KnowledgeTree" and retain the original
  34 +* copyright notice.
  35 +*
  36 +* @copyright 2008-2009, KnowledgeTree Inc.
  37 +* @license GNU General Public License version 3
  38 +* @author KnowledgeTree Team
  39 +* @package Installer
  40 +* @version Version 0.1
  41 +*/
  42 +
2 43 class luceneValidation extends serviceValidation {
3 44 /**
4 45 * Path to java executable
... ...
setup/wizard/lib/validation/openofficeValidation.php
  View file @d5a3322
1 1 <?php
  2 +/**
  3 +* Open Office Service Validation.
  4 +*
  5 +* KnowledgeTree Community Edition
  6 +* Document Management Made Simple
  7 +* Copyright(C) 2008,2009 KnowledgeTree Inc.
  8 +* Portions copyright The Jam Warehouse Software(Pty) Limited
  9 +*
  10 +* This program is free software; you can redistribute it and/or modify it under
  11 +* the terms of the GNU General Public License version 3 as published by the
  12 +* Free Software Foundation.
  13 +*
  14 +* This program is distributed in the hope that it will be useful, but WITHOUT
  15 +* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
  16 +* FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
  17 +* details.
  18 +*
  19 +* You should have received a copy of the GNU General Public License
  20 +* along with this program. If not, see <http://www.gnu.org/licenses/>.
  21 +*
  22 +* You can contact KnowledgeTree Inc., PO Box 7775 #87847, San Francisco,
  23 +* California 94120-7775, or email info@knowledgetree.com.
  24 +*
  25 +* The interactive user interfaces in modified source and object code versions
  26 +* of this program must display Appropriate Legal Notices, as required under
  27 +* Section 5 of the GNU General Public License version 3.
  28 +*
  29 +* In accordance with Section 7(b) of the GNU General Public License version 3,
  30 +* these Appropriate Legal Notices must retain the display of the "Powered by
  31 +* KnowledgeTree" logo and retain the original copyright notice. If the display of the
  32 +* logo is not reasonably feasible for technical reasons, the Appropriate Legal Notices
  33 +* must display the words "Powered by KnowledgeTree" and retain the original
  34 +* copyright notice.
  35 +*
  36 +* @copyright 2008-2009, KnowledgeTree Inc.
  37 +* @license GNU General Public License version 3
  38 +* @author KnowledgeTree Team
  39 +* @package Installer
  40 +* @version Version 0.1
  41 +*/
2 42 class openofficeValidation extends serviceValidation {
3 43 /**
4 44 * Path to open office executable
... ...
setup/wizard/lib/validation/schedulerValidation.php
  View file @d5a3322
1 1 <?php
  2 +/**
  3 +* Scheduler Service Validation.
  4 +*
  5 +* KnowledgeTree Community Edition
  6 +* Document Management Made Simple
  7 +* Copyright(C) 2008,2009 KnowledgeTree Inc.
  8 +* Portions copyright The Jam Warehouse Software(Pty) Limited
  9 +*
  10 +* This program is free software; you can redistribute it and/or modify it under
  11 +* the terms of the GNU General Public License version 3 as published by the
  12 +* Free Software Foundation.
  13 +*
  14 +* This program is distributed in the hope that it will be useful, but WITHOUT
  15 +* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
  16 +* FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
  17 +* details.
  18 +*
  19 +* You should have received a copy of the GNU General Public License
  20 +* along with this program. If not, see <http://www.gnu.org/licenses/>.
  21 +*
  22 +* You can contact KnowledgeTree Inc., PO Box 7775 #87847, San Francisco,
  23 +* California 94120-7775, or email info@knowledgetree.com.
  24 +*
  25 +* The interactive user interfaces in modified source and object code versions
  26 +* of this program must display Appropriate Legal Notices, as required under
  27 +* Section 5 of the GNU General Public License version 3.
  28 +*
  29 +* In accordance with Section 7(b) of the GNU General Public License version 3,
  30 +* these Appropriate Legal Notices must retain the display of the "Powered by
  31 +* KnowledgeTree" logo and retain the original copyright notice. If the display of the
  32 +* logo is not reasonably feasible for technical reasons, the Appropriate Legal Notices
  33 +* must display the words "Powered by KnowledgeTree" and retain the original
  34 +* copyright notice.
  35 +*
  36 +* @copyright 2008-2009, KnowledgeTree Inc.
  37 +* @license GNU General Public License version 3
  38 +* @author KnowledgeTree Team
  39 +* @package Installer
  40 +* @version Version 0.1
  41 +*/
2 42 class schedulerValidation extends serviceValidation {
3 43 /**
4 44 * Path to php executable
... ...
setup/wizard/lib/validation/serviceValidation.php
  View file @d5a3322
1 1 <?php
  2 +/**
  3 +* Service Validation.
  4 +*
  5 +* KnowledgeTree Community Edition
  6 +* Document Management Made Simple
  7 +* Copyright(C) 2008,2009 KnowledgeTree Inc.
  8 +* Portions copyright The Jam Warehouse Software(Pty) Limited
  9 +*
  10 +* This program is free software; you can redistribute it and/or modify it under
  11 +* the terms of the GNU General Public License version 3 as published by the
  12 +* Free Software Foundation.
  13 +*
  14 +* This program is distributed in the hope that it will be useful, but WITHOUT
  15 +* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
  16 +* FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
  17 +* details.
  18 +*
  19 +* You should have received a copy of the GNU General Public License
  20 +* along with this program. If not, see <http://www.gnu.org/licenses/>.
  21 +*
  22 +* You can contact KnowledgeTree Inc., PO Box 7775 #87847, San Francisco,
  23 +* California 94120-7775, or email info@knowledgetree.com.
  24 +*
  25 +* The interactive user interfaces in modified source and object code versions
  26 +* of this program must display Appropriate Legal Notices, as required under
  27 +* Section 5 of the GNU General Public License version 3.
  28 +*
  29 +* In accordance with Section 7(b) of the GNU General Public License version 3,
  30 +* these Appropriate Legal Notices must retain the display of the "Powered by
  31 +* KnowledgeTree" logo and retain the original copyright notice. If the display of the
  32 +* logo is not reasonably feasible for technical reasons, the Appropriate Legal Notices
  33 +* must display the words "Powered by KnowledgeTree" and retain the original
  34 +* copyright notice.
  35 +*
  36 +* @copyright 2008-2009, KnowledgeTree Inc.
  37 +* @license GNU General Public License version 3
  38 +* @author KnowledgeTree Team
  39 +* @package Installer
  40 +* @version Version 0.1
  41 +*/
2 42 class serviceValidation {
3 43 /**
4 44 * List of errors encountered
... ...
setup/wizard/resources/css/ie6.css 0 → 100644
  View file @d5a3322
setup/wizard/resources/css/migrate.css
  View file @d5a3322
1 1 #step_content_installation {
2 2 border: 1px solid rgb(207, 207, 207);
  3 + overflow: auto;
3 4 padding: 5px;
4   - min-height:365px;
5 5 height:365px;
6   - height:auto !important;
7 6 }
8 7  
9 8 #step_content_services {
10 9 border: 1px solid rgb(207, 207, 207);
  10 + overflow: auto;
11 11 padding: 5px;
12   - min-height:340px;
13 12 height:340px;
14   - height:auto !important;
15 13 }
16 14  
17 15 #step_content_database {
18 16 border: 1px solid rgb(207, 207, 207);
  17 + overflow: auto;
19 18 padding: 5px;
20   - min-height:380px;
21 19 height:380px;
22   - height:auto !important;
23 20 }
24 21  
25 22 #step_content_complete {
26 23 border: 1px solid rgb(207, 207, 207);
  24 + overflow: auto;
27 25 padding: 5px;
28   - min-height:360px;
29 26 height:360px;
30   - height:auto !important;
31 27 }
... ...
setup/wizard/resources/css/wizard.css
  View file @d5a3322
... ... @@ -70,8 +70,7 @@ select {
70 70 #outer-wrapper {
71 71 border:1px solid #B7B7B7;
72 72 margin-top:20px;
73   - width:984px;
74   - /*width:1024px;*/
  73 + width:1024px;
75 74 }
76 75  
77 76 #header {
... ... @@ -106,72 +105,54 @@ select {
106 105 padding: 5px;
107 106 overflow: auto;
108 107 min-height: 400px;
109   - height: 400px;
110   - height:auto !important;
111 108 }
112 109  
113 110 #step_content_dependencies {
114 111 border: 1px solid rgb(207, 207, 207);
115 112 padding: 5px;
116 113 min-height:270px;
117   - height:270px;
118   - height:auto !important;
119 114 }
120 115  
121 116 #step_content_configuration {
122 117 border: 1px solid rgb(207, 207, 207);
123 118 padding: 5px;
124 119 min-height:320px;
125   - height:320px;
126   - height:auto !important;
127 120 }
128 121  
129 122 #step_content_registration {
130 123 border: 1px solid rgb(207, 207, 207);
131 124 padding: 5px;
132 125 min-height:320px;
133   - height:320px;
134   - height:auto !important;
135 126 }
136 127  
137 128 #step_content_registration_confirm {
138 129 border: 1px solid rgb(207, 207, 207);
139 130 padding: 5px;
140 131 min-height:400px;
141   - height:400px;
142   - height:auto !important;
143 132 }
144 133  
145 134 #step_content_install {
146 135 border: 1px solid rgb(207, 207, 207);
147 136 padding: 5px;
148   - min-height:290px;
149   - height:290px;
150   - height:auto !important;
  137 + min-height:400px;
151 138 }
152 139  
153 140 #step_content_database {
154 141 border: 1px solid rgb(207, 207, 207);
155 142 padding: 5px;
156 143 min-height:365px;
157   - height:365px;
158   - height:auto !important;
159 144 }
160 145  
161 146 #step_content_database_confirm {
162 147 border: 1px solid rgb(207, 207, 207);
163 148 padding: 5px;
164 149 min-height:370px;
165   - height:370px;
166   - height:auto !important;
167 150 }
168 151  
169 152 #step_content_complete {
170 153 border: 1px solid rgb(207, 207, 207);
171 154 padding: 5px;
172   - min-height:355px;
173   - height:355px;
174   - height:auto !important;
  155 + min-height:340px;
175 156 }
176 157  
177 158 .license_agreement {
... ... @@ -217,15 +198,14 @@ select {
217 198  
218 199 #logo {
219 200 position:relative;
220   - right:740px;
  201 + right:760px;
221 202 top:20px;
222 203 }
223 204  
224 205 #install_details {
225   - bottom:25%;
226   - left:74%;
  206 + bottom:20px;
227 207 position:relative;
228   - width:25%;
  208 + right:10px;
229 209 }
230 210  
231 211 .indicator a {
... ...
setup/wizard/resources/graphics/img_fatlogo.jpg 0 → 100644
View file @d5a3322

15.6 KB
setup/wizard/resources/js/wizard.js
  View file @d5a3322
... ... @@ -56,31 +56,31 @@ wizard.prototype.validateRegistration = function() {
56 56 }
57 57  
58 58 wizard.prototype.valRegHelper = function() {
59   - var first = document.getElementById('first');
60   - var last = document.getElementById('last');
61   - var email = document.getElementById('email');
62   - if(first.value.length < 1) {
63   - document.getElementById("reg_error").innerHTML = "Please enter a First Name";
  59 + var first = $("#first");
  60 + var last = $("#last");
  61 + var email = $("#email");
  62 + if(first.attr('value').length < 1) {
  63 + $("#reg_error").html('Please enter a First Name');
64 64 w.focusElement(first);
65 65 return false;
66 66 }
67   - if(!w.nameCheck(first.value)) {
68   - document.getElementById("reg_error").innerHTML = "Please enter a valid First Name";
  67 + if(!w.nameCheck(first.attr('value'))) {
  68 + $("#reg_error").html('Please enter a valid First Name');
69 69 w.focusElement(first);
70 70 return false;
71 71 }
72   - if(last.value.length < 1) {
73   - document.getElementById("reg_error").innerHTML = "Please enter a Last Name";
  72 + if(last.attr('value').length < 1) {
  73 + $("#reg_error").html('Please enter a Last Name');
74 74 w.focusElement(last);
75 75 return false;
76 76 }
77   - if(!w.nameCheck(last.value)) {
78   - document.getElementById("reg_error").innerHTML = "Please enter a valid Last Name";
  77 + if(!w.nameCheck(last.attr('value'))) {
  78 + $("#reg_error").html('Please enter a valid Last Name');
79 79 w.focusElement(last);
80 80 return false;
81 81 }
82   - if(!w.emailCheck(email.value)) {
83   - document.getElementById("reg_error").innerHTML = "Please enter a valid email address";
  82 + if(!w.emailCheck(email.attr('value'))) {
  83 + $("#reg_error").html('Please enter a valid email address');
84 84 w.focusElement(email);
85 85 return false;
86 86 }
... ... @@ -89,7 +89,8 @@ wizard.prototype.valRegHelper = function() {
89 89 }
90 90  
91 91 wizard.prototype.nameCheck = function(str) {
92   - var nameRegxp = /^([a-zA-Z]+)$/;
  92 + str = w.trim(str);
  93 + var nameRegxp = /^([a-z A-Z]+)$/;
93 94 if(str.match(nameRegxp)) {
94 95 return true;
95 96 } else {
... ...
setup/wizard/steps/registration.php
  View file @d5a3322
... ... @@ -132,7 +132,7 @@ class registration extends Step
132 132 //$this->sendToHost($_POST);
133 133  
134 134 // Post the form using curl
135   - $this->curlForm($_POST);
  135 +// $this->curlForm($_POST);
136 136  
137 137 // Prevent the form being reposted.
138 138 $_POST['registered'] = 'yes';
... ...
setup/wizard/templates/install.tpl
  View file @d5a3322
... ... @@ -3,12 +3,12 @@
3 3 <div id="step_content_<?php echo $step_name; ?>" class="step">
4 4 <p class="empty_space"> The wizard will now complete the installation and run a final check on your system. </p>
5 5 <p class="empty_space">
6   - 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>
  6 + 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>
7 7 </p>
8 8 <p class="empty_space"">
9 9 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.
10 10 </p>
11   - <div class="demo"><?php echo $html->image('kt_browse.png'); ?></div>
  11 + <div class="demo"><?php echo $html->image('img_fatlogo.jpg'); ?></div>
12 12 <br/><br/>
13 13 <p><input type='checkbox' name='call_home' value='enable' checked /> Help to improve KnowledgeTree by providing anonymous usage statistics</p>
14 14 </div>
... ...
setup/wizard/templates/license.tpl
  View file @d5a3322
... ... @@ -14,7 +14,7 @@ Please read and accept the license agreement below before continuing with the se
14 14 </div>
15 15 <input id="accept" type="hidden" name="license" value=""/>
16 16 <input type="submit" name="Previous" value="Previous" class="button_previous"/>
17   - <input type="submit" name="Next" value="I Agree" onclick="javascript:{document.getElementById('accept').value = 1;}" class="button_next"/>
18   - <input type="submit" name="Next" value="I Disagree" onclick="javascript:{document.getElementById('accept').value = 0;}" class="button_next"/>
  17 + <input type="submit" name="Next" value="I Agree" onclick="javascript:{$('#accept').attr('value', '1');}" class="button_next"/>
  18 + <input type="submit" name="Next" value="I Disagree" onclick="javascript:{$('#accept').attr('value', '0');}" class="button_next"/>
19 19 </form>
20 20 <?php if (AJAX) { echo $html->js('form.js'); } ?>
21 21 \ No newline at end of file
... ...
setup/wizard/templates/registration_confirm.tpl
  View file @d5a3322
... ... @@ -6,7 +6,6 @@
6 6 <p class="empty_space">
7 7 Thank you for signing up. You'll receive an email from us shortly with download instructions for the KnowledgeTree Drop Box software.
8 8 </p>
9   - <div class="demo"><?php echo $html->image('kt_browse.png'); ?></div>
10 9 </div>
11 10 <input type="submit" name="Previous" value="Previous" class="button_previous"/>
12 11 <input type="submit" name="Confirm" value="Next" class="button_next"/>
... ...
setup/wizard/templates/welcome.tpl
  View file @d5a3322
... ... @@ -4,7 +4,6 @@
4 4 <p class="empty_space"> This wizard will lead you through all the steps required to install and configure KnowledgeTree on your server.</p>
5 5 <p class="empty_space">
6 6 Press <b>Next</b> to continue.</p>
7   - <!-- <div class="demo"><?php echo $html->image('kt_browse.png'); ?> </div> -->
8 7 </div>
9 8 <input type="submit" name="Next" value="Next" class="button_next"/>
10 9 <!-- <input type="submit" name="Migrate" value="Migrate" class="button_next"/>-->
... ...