Peter M. Groen / knowledgetree

Commit 57d0d4f60e7134b3cedd57dfaff76531dd53a2ea

Authored by Jarrett Jordaan
1 parent ec8fc9ab

Story Id: 11821154 Daily Commit 

Committed by: Jarrett Jordaan

Reviewed by: Paul Barrett
Inline Side-by-side
Showing 17 changed files with 276 additions and 112 deletions
setup/wizard/lib/services/unixOpenOffice.php 0 → 100644
  View file @57d0d4f
  1 +<?php
  2 +/**
  3 +* Unix Agent Service Controller.
  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 +
  43 +class unixOpenOffice extends unixService {
  44 +
  45 + public function __construct() {
  46 + $this->name = "KTOpenOfficeTest";
  47 + }
  48 +
  49 +
  50 +}
  51 +?>
0 52 \ No newline at end of file
... ...
setup/wizard/lib/services/windowsOpenOffice.php 0 → 100644
  View file @57d0d4f
  1 +<?php
  2 +/**
  3 +* Windows Agent Service Controller.
  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 +
  43 +class windowsOpenOffice extends windowsService {
  44 +
  45 +
  46 + public function __construct() {
  47 + $this->name = "KTOpenOfficeTest";
  48 + }
  49 +
  50 +}
  51 +?>
0 52 \ No newline at end of file
... ...
setup/wizard/resources/wizard.css
  View file @57d0d4f
... ... @@ -70,6 +70,7 @@ select {
70 70  
71 71 #wrapper {
72 72 background: white url("graphics/background.gif") repeat-y left;
  73 + height:465px;
73 74 }
74 75  
75 76 #container {
... ... @@ -83,6 +84,7 @@ select {
83 84 margin-left: 200px;
84 85 padding: 10px;
85 86 padding-top: 0;
  87 + width:950px;
86 88 }
87 89  
88 90 #sidebar {
... ... @@ -291,7 +293,7 @@ refresh {
291 293 border:none;
292 294 background-color:#FFCCCC;
293 295 color:#A30000;
294   - width:550px;
  296 +/* width:550px; */
295 297 padding:0px;
296 298 }
297 299  
... ... @@ -302,4 +304,15 @@ refresh {
302 304 /*color:#339933;*/
303 305 width:550px;
304 306 padding:0px;
  307 +}
  308 +
  309 +.license_agreement {
  310 + overflow: scroll;
  311 + height: 255px;
  312 + width:800px;
  313 + overflow-x:hidden;
  314 +}
  315 +
  316 +.regSubmit {
  317 +
305 318 }
306 319 \ No newline at end of file
... ...
setup/wizard/resources/wizard.js
  View file @57d0d4f
... ... @@ -10,6 +10,9 @@ wizard.prototype.doFormCheck = function() {
10 10 // Toggle Advance Database options
11 11 wizard.prototype.toggleClass = function(el) {
12 12 var el = document.getElementsByClassName(el); //adv_options|php_details|php_ext_details|php_con_details
  13 + if (el == 'adv_options') {
  14 +
  15 + }
13 16 if(el[0].style.display == 'none')
14 17 el[0].style.display = 'block';
15 18 else
... ...
setup/wizard/steps/configuration.php
  View file @57d0d4f
... ... @@ -354,6 +354,7 @@ class configuration extends Step
354 354 if($class['class'] != 'tick') {
355 355 $this->temp_variables['paths_perms'] = $class['class'];
356 356 $this->done = false;
  357 + $this->error[] = "path error";
357 358 }
358 359 $dirs[$key] = array_merge($dirs[$key], $class);
359 360 }
... ...
setup/wizard/steps/services.php
  View file @57d0d4f
... ... @@ -60,7 +60,7 @@ class services extends Step
60 60 */
61 61 protected $runInstall = true;
62 62  
63   - private $services = array('Lucene', 'Scheduler');
  63 + private $services = array('Lucene', 'Scheduler', 'OpenOffice');
64 64  
65 65 protected $java;
66 66  
... ... @@ -68,7 +68,7 @@ class services extends Step
68 68  
69 69 protected $util;
70 70  
71   - private $javaVersion = '1.5';
  71 + private $javaVersion = '1.7';
72 72  
73 73 /**
74 74 * Java Installed
... ... @@ -342,12 +342,23 @@ class services extends Step
342 342 if($auto) {
343 343 return $auto;
344 344 } else {
345   - $this->specifyJava(); // Ask for settings
  345 + // Check if auto detected java works
  346 + $auto = $this->useDetected();
  347 + if($auto) {
  348 + $this->disableExtension = true; // Disable the use of the php bridge extension
  349 + return $auto;
  350 + } else {
  351 + $this->specifyJava(); // Ask for settings
  352 + }
346 353 }
347 354 return $auto;
348 355 }
349 356 }
350 357  
  358 + private function useDetected() {
  359 + return $this->detSettings();
  360 + }
  361 +
351 362 private function specifyJava() {
352 363 $this->javaExeError = true;
353 364 }
... ...
setup/wizard/templates/configuration.tpl
  View file @57d0d4f
... ... @@ -4,24 +4,37 @@
4 4 The wizard will review your system to determine whether KnowledgeTree is correctly configured. You&rsquo;ll see whether KnowledgeTree has the correct settings or whether changes are required.
5 5 </p>
6 6  
7   -<form action="index.php?step_name=configuration" method="post">
  7 +<div class="continue_message">
  8 +<?php
  9 + if(!$errors && !$warnings) {
  10 + ?>
  11 + &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;All configuration settings are correctly set. Please click next to continue.
  12 + <?php
  13 + }
  14 +?>
  15 +</div>
  16 +<div class="error_message">
  17 +<?php if($errors) { ?>
  18 + <span class='cross'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Your system is not quite ready to run KnowledgeTree. See the list below to determine which areas you need to address. <br/>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Once you&rsquo;ve fixed these items, return to this wizard and try again.</span><br/>
  19 +<?php } elseif ($warnings) {
  20 + ?>
  21 + <span class='cross_orange'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;KnowledgeTree Optional Dependencies not met, but you will be able to continue.</span><br/>
  22 + <?php
  23 +}?>
  24 +<?php
  25 + if($errors || $warnings) {
  26 + ?>
  27 + &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<a href="http://wiki.knowledgetree.com/Web_Based_Installer#System_Configuration" target="_blank">Click here for help on overcoming configuration issues</a>
  28 +<?php } ?>
  29 +</div>
8 30  
  31 +<form action="index.php?step_name=configuration" method="post">
9 32 <h3>Server Settings</h3>
10 33  
11 34 <p class="description">
12 35 The settings below have been drawn from the system information. The host and port should reflect the host and port that will be used to access KnowledgeTree. The Root Url is only needed if your installation is in a directory off the main web server root.
13 36 </p>
14 37  
15   -<div class="error">
16   - <?php
17   - if(isset($errors)) {
18   - foreach ($errors as $error){
19   - echo $error.'<br />';
20   - }
21   - }
22   - ?>
23   -</div>
24   -
25 38 <table>
26 39 <tr>
27 40 <td><label for='host'>Host: </label></td>
... ... @@ -48,7 +61,6 @@ The settings below have been drawn from the system information. The host and por
48 61 </tr>
49 62 </table>
50 63  
51   -<br />
52 64 <h3><?php echo "<span class='{$paths_perms}'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span>"; ?>Paths and Permissions</h3>
53 65 <?php if($silent) { ?>
54 66 <div id="options" class="onclick" onclick="javascript:{w.toggleClass('paths_perms');}">Show Details</div>
... ... @@ -60,15 +72,20 @@ The following folders must be writable for KnowledgeTree to be able to run. The
60 72 <table>
61 73 <?php
62 74 foreach ($paths as $key => $path){
63   - $row = '<tr>';
64   - $row .= "<td><div class='{$path['class']}'></div></td>\n";
65   - $row .= "<td><label for='{$path['setting']}'>{$path['name']}: </label></td>\n";
66   - $row .= "<td><input name='{$path['setting']}' id='{$path['setting']}' size='60' value='{$path['path']}' /></td>\n";
67   - $row .= '<td class="error">';
68   - $row .= (isset($path['msg'])) ? $path['msg'] : '';
69   - $row .= "</td>\n";
70   - $row .= "</tr>\n";
71   - echo $row;
  75 + ?>
  76 + <tr>
  77 + <td> <div class='<?php echo $path['class']; ?>'></div> </td>
  78 + <td> <label for='<?php echo $path['setting']; ?>'> <?php echo $path['name']; ?>: </label> </td>
  79 + <td><input name='<?php echo $path['setting']; ?>' id='<?php echo $path['setting']; ?>' size='60' value='<?php echo $path['path']; ?>' /></td>
  80 + <?php if(isset($path['msg'])) {
  81 + ?>
  82 + <td class="error"> <?php echo $path['msg']; ?> </td>
  83 + <td><a href="javascript:this.location.reload();" class="refresh">Refresh</a></td>
  84 + <?php
  85 + }
  86 + ?>
  87 + </tr>
  88 + <?php
72 89 }
73 90 ?>
74 91 </table>
... ... @@ -78,6 +95,5 @@ The following folders must be writable for KnowledgeTree to be able to run. The
78 95 <div class="buttons">
79 96 <input type="submit" name="Previous" value="Previous"/>
80 97 <input type="submit" name="Next" value="Next"/>
81   - <input type="submit" name="Refresh" value="Refresh"/>
82 98 </div>
83 99 </form>
84 100 \ No newline at end of file
... ...
setup/wizard/templates/configuration_confirm.tpl
  View file @57d0d4f
... ... @@ -4,42 +4,39 @@
4 4  
5 5 <table>
6 6 <tr>
7   - <td><b>Host: </b></td>
  7 + <td>Host: </td>
8 8 <td><?php echo $server['host']['value']; ?></td>
9 9 </tr>
10 10 <tr>
11   - <td><b>Port: </b></td>
  11 + <td>Port: </td>
12 12 <td><?php echo $server['port']['value']; ?></td>
13 13 </tr>
14 14 <tr>
15   - <td><b>Root Url: </b></td>
  15 + <td>Root Url: </td>
16 16 <td><?php echo $server['root_url']['value']; ?></td>
17 17 </tr>
18 18 <tr>
19   - <td><b>File System Root: </b></td>
  19 + <td>File System Root: </td>
20 20 <td><?php echo $server['file_system_root']['value']; ?></td>
21 21 </tr>
22 22 <tr>
23   - <td><b>SSL Enabled: </b></td>
  23 + <td>SSL Enabled: </td>
24 24 <td><?php echo $server['ssl_enabled']['value']; ?></td>
25 25 </tr>
26 26 </table>
27 27  
28   -<br />
29 28 <h3>Paths and Permissions</h3>
30 29  
31 30 <table>
32 31 <?php
33 32 foreach ($paths as $key => $path){
34   - $row = '<tr>';
35   -
36   - $row .= "<td><div class='{$path['class']}'></div></td>\n";
37   - $row .= "<td><b>{$path['name']}:</b></td>\n";
38   - $row .= "<td>{$path['path']}</td>\n";
39   -
40   - $row .= "</tr>\n";
41   -
42   - echo $row;
  33 +?>
  34 + <tr>
  35 + <td><div class='<?php echo $path['class']; ?>'></div></td>
  36 + <td><?php echo $path['name']; ?>:</td>
  37 + <td><?php echo $path['path']; ?></td>
  38 + </tr>
  39 +<?php
43 40 }
44 41 ?>
45 42 </table>
... ...
setup/wizard/templates/database.tpl
  View file @57d0d4f
1   -<h1>Database Configuration</h1>
  1 +<h1>Confirming Database Configurations</h1>
2 2 <!-- Check For immediate Errors -->
3 3 <span class="error"> <?php if($errors['con']) { echo $errors['con']; } ?> </span>
4 4 <form id="dbsettings" action="index.php?step_name=<?php echo $step_name; ?>" method="post" onsubmit="w.onSubmitValidate(<?php if ($silent) echo 'true'; else echo 'false'; ?>);return false;">
... ... @@ -66,11 +66,11 @@
66 66 </p>
67 67 </div>
68 68 <div class="buttons">
69   - <input type="submit" name="Previous" value="previous" />
  69 + <input type="submit" name="Previous" value="Previous" />
70 70 <?php if ($silent) { ?>
71   - <input type="submit" name="Next" value="next" />
  71 + <input type="submit" name="Next" value="Next" />
72 72 <?php } else { ?>
73   - <input type="button" name="Next" value="next" onclick="javascript:{w.showStep(1, 'n');}"/>
  73 + <input type="button" name="Next" value="Next" onclick="javascript:{w.showStep(1, 'n');}"/>
74 74 <?php } ?>
75 75 </div>
76 76 </div>
... ... @@ -100,8 +100,8 @@ An administrative user is required for creating tables within the database.
100 100 </table>
101 101  
102 102 <div class="buttons">
103   - <input type="button" name="Previous" value="previous" onclick="javascript:{w.showStep(2, 'p');}"/>
104   - <input type="button" name="Next" value="next" onclick="javascript:{w.showStep(2, 'n');}"/>
  103 + <input type="button" name="Previous" value="Previous" onclick="javascript:{w.showStep(2, 'p');}"/>
  104 + <input type="button" name="Next" value="Next" onclick="javascript:{w.showStep(2, 'n');}"/>
105 105 </div>
106 106 </div>
107 107  
... ...
setup/wizard/templates/database_confirm.tpl
  View file @57d0d4f
1   -<h1>Database Configuration Confirmation</h1>
  1 +<h1>Confirming Database Configurations</h1>
2 2  
3 3 <div class="description">
4   -Please confirm that your database settings have been entered correctly before proceeding with the installation.
  4 +Please confirm whether KnowledgeTree has correctly determined your database settings before proceeding.
5 5 </div>
6 6 <!--<div id="section">-->
7 7  
8 8 <form action="index.php?step_name=<?php echo $step_name; ?>" method="post">
9 9 <h3><b>Database Settings</b></h3>
10   -<table width="20%" class="dbconf">
  10 +<table width="33%" class="dbconf">
11 11 <?php
12 12 if($dtypes) {
13 13 $type = '';
... ... @@ -29,10 +29,6 @@ if($dtypes) {
29 29 <td><?php echo $duname; ?></td>
30 30 </tr>
31 31 <tr>
32   - <td>Root Username: </td>
33   - <td><?php echo $duname; ?></td>
34   - </tr>
35   - <tr>
36 32 <td>Root Password: </td>
37 33 <td><?php echo $dpassword; ?></td>
38 34 </tr>
... ... @@ -45,7 +41,7 @@ if($dtypes) {
45 41 <!--</div>-->
46 42 <h3><b>Advanced Settings</b></h3>
47 43  
48   -<table width="23%" class="dbconf">
  44 +<table width="35%" class="dbconf">
49 45 <tr>
50 46 <td>Host: </td>
51 47 <td><?php echo $dhost; ?></td>
... ... @@ -68,7 +64,7 @@ if($dtypes) {
68 64  
69 65 <h3><b>Database Users</b></h3>
70 66  
71   -<table width="23%" class="dbconf">
  67 +<table width="35%" class="dbconf">
72 68 <?php //if (!$silent) { ?>
73 69 <tr>
74 70 <td>DMS Admin Username: </td>
... ... @@ -91,7 +87,7 @@ if($dtypes) {
91 87 </tr>
92 88 </table>
93 89  
94   -<div class="buttons">
  90 +<div class="buttons" style="top:0px;">
95 91 <input type="submit" name="Edit" value="Edit"/>
96 92 <input type="submit" name="Confirm" value="Confirm"/>
97 93 </div>
... ...
setup/wizard/templates/dependencies.tpl
  View file @57d0d4f
... ... @@ -17,11 +17,11 @@ Once the scan is completed, you&amp;rsquo;ll see whether your system has met the req
17 17  
18 18 <div class="error_message">
19 19 <?php if($errors) { ?>
20   - <span class='cross'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Your system is not quite ready to run KnowledgeTree. See the list below to determine which areas you need to address. Once you&rsquo;ve fixed these items, return to this wizard and try again.</span><br/>
21   -<?php } ?>
22   -<?php if($warnings) {?>
  20 + <span class='cross'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Your system is not quite ready to run KnowledgeTree. See the list below to determine which areas you need to address. <br/>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Once you&rsquo;ve fixed these items, return to this wizard and try again.</span><br/>
  21 +<?php } elseif ($warnings) { ?>
23 22 <span class='cross_orange'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;KnowledgeTree Optional Dependencies not met, but you will be able to continue.</span><br/>
24 23 <?php } ?>
  24 +
25 25 <?php
26 26 if($errors || $warnings) {
27 27 ?>
... ... @@ -129,7 +129,7 @@ B = Bytes, K = Kilobytes, M = Megabytes, G = Gigabytes
129 129 </div>
130 130 <?php } ?>
131 131 <form action="index.php?step_name=dependencies" method="post">
132   -<div class="buttons">
  132 +<div class="buttons" style="top:14px;">
133 133 <input type="submit" name="Previous" value="Previous"/>
134 134 <input type="submit" name="Next" value="Next"/>
135 135 </div>
... ...
setup/wizard/templates/install.tpl
  View file @57d0d4f
1   -<h1>Installing System</h1>
  1 +<h1>Finalizing System Installation</h1>
  2 +
  3 +<p class="description">
  4 +The wizard will now complete the installation and run a final check on the system.
  5 +</p>
2 6  
3 7 <form action="index.php?step_name=install" method="post">
4   - <div class="buttons">
  8 + <div class="buttons" style="top:325px;">
5 9 <input type="submit" name="Previous" value="Previous"/>
6 10 <input type="submit" name="Install" value="Install"/>
7 11 </div>
... ...
setup/wizard/templates/license.tpl
  View file @57d0d4f
... ... @@ -13,7 +13,7 @@ Please read and accept the license agreement below before continuing with the se
13 13 </p>
14 14  
15 15 <form action="index.php?step_name=license" method="POST">
16   -<div style="overflow: scroll; height: 500px; width:800px; overflow-x:hidden;">
  16 +<div class="license_agreement">
17 17 <h2>KnowledgeTree On-premise Commercial End-User</h2>
18 18 <p>
19 19 License Agreement Version 2.3
... ... @@ -339,7 +339,7 @@ govern.
339 339 <br/>
340 340 <input type="radio" name="license" value="0"/>I do not accept the agreement
341 341 </div>
342   -<div class="buttons">
  342 +<div class="buttons" style="top:3px">
343 343 <input type="submit" name="Previous" value="Previous"/>
344 344 <input type="submit" name="Next" value="Next"/>
345 345 </div>
... ...
setup/wizard/templates/registration.tpl
  View file @57d0d4f
1   -<h1>Register your KnowledgeTree Installation</h1>
2   -
3   -<div class="error">
4   - <?php if(isset($errors)) {
5   - foreach($errors as $k=>$e) {
6   - echo $e;
7   - }
8   - }?>
9   -</div>
  1 +<form action="index.php?step_name=registration" method="post">
  2 +<h1>Registering KnowledgeTree</h1>
10 3  
11 4 <p>
12   -Register your KnowledgeTree Installation and receive the KnowledgeTree Drop Box for Windows software, a drag and drop tool that makes
13   -placing documents into KnowledgeTree even easier.
  5 +Register with KnowledgeTree to receive important product updates. We respect your privacy and will not share your information with third parties. For more information, please refer to our Privacy and Data Retention Policies.
  6 +<input type="submit" name="Confirm" value="Skip Registration" class="regSubmit"/>
14 7 </p>
15 8  
16 9 <p class='disclaimer'>
17 10 We will not share your information with 3rd-parties, nor will we send you information not directly related to KnowledgeTree's products
18 11 and services. Please see our <a href="http://www.knowledgetree.com/about/legal" target="_blank">Privacy and Data Retention policies</a> for more information.
19 12 </p>
20   -<form action="index.php?step_name=registration" method="post">
21   -<!--<form id="registration" action="index.php?step_name=<?php //echo $step_name; ?>" method="post" onsubmit="w.validateRegistration();return false;">-->
  13 +
22 14 <p>
23 15  
24 16 <table>
... ... @@ -70,7 +62,7 @@ and services. Please see our &lt;a href=&quot;http://www.knowledgetree.com/about/legal&quot;
70 62 </td>
71 63 </tr>
72 64 <tr>
73   - <td><label for='size'>Organisation Size</label></td>
  65 + <td><label for='size'>Organization Size</label></td>
74 66 <td>
75 67 <select id='size' name='submitted[organization_size]'>
76 68 <?php
... ... @@ -87,17 +79,6 @@ and services. Please see our &lt;a href=&quot;http://www.knowledgetree.com/about/legal&quot;
87 79 </table>
88 80 </p>
89 81  
90   -<?php
91   -/*
92   -<input type='hidden' name='submitted[telephone]' value='12345' />
93   -<input type='hidden' name='submitted[company]' value='empty' />
94   -<input type='hidden' name='submitted[contact]' value='12345' />
95   -<input type='hidden' name='submitted[partner]' value='empty' />
96   -<input type='hidden' name='submitted[hear_about_us]' value='empty' />
97   -<input type='hidden' name='submitted[installation_guid]' value='123456' />
98   -*/
99   -?>
100   -
101 82 <input type='hidden' name='form_id' value='webform_client_form_242' />
102 83 <input type='hidden' name='op' value='Submit' />
103 84  
... ... @@ -105,6 +86,6 @@ and services. Please see our &lt;a href=&quot;http://www.knowledgetree.com/about/legal&quot;
105 86 <div class="buttons">
106 87 <input type="submit" name="Previous" value="Previous"/>
107 88 <input type="submit" name="Next" value="Register"/>
108   - <input type="submit" name="Confirm" value="Skip Registration"/>
  89 + <!--<input type="submit" name="Confirm" value="Skip Registration"/>-->
109 90 </div>
110 91 </form>
111 92 \ No newline at end of file
... ...
setup/wizard/templates/registration_confirm.tpl
  View file @57d0d4f
1 1 <h1>Thank you for registering</h1>
2 2  
3   -<div class="error">
4   - <?php if(isset($errors)) {
5   - foreach($errors as $k=>$e) {
6   - echo $e;
7   - }
8   - }?>
9   -</div>
10   -
11 3 <p>
12 4 Thank you for signing up. You'll receive an email from us shortly with download instructions for the KnowledgeTree Drop Box software.
13 5 </p>
... ...
setup/wizard/templates/services.tpl
  View file @57d0d4f
... ... @@ -2,20 +2,26 @@
2 2 <h1>Checking Service Dependencies</h1>
3 3  
4 4 <p class="description">
5   -The wizard will review your system to determine whether you can run KnowledgeTree background services. Once the scan is completed, you’ll see whether your system has met the requirements or whether there are areas you need to address.
  5 +The wizard will review your system to determine whether you can run KnowledgeTree background services. <br/>Once the scan is completed, you&rsquo;ll see whether your system has met the requirements or whether there are areas you need to address.
6 6 </p>
7 7  
8 8 <div class="continue_message">
9 9 <?php
10   - if(!$errors && $warnings) {
  10 + if(!$errors && !$warnings) {
11 11 ?>
12   - &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;All services have been installed. Please press Next to continue.
  12 + &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;All service dependencies are met. Please click next to continue.
13 13 <?php
14 14 }
15 15 ?>
16 16 </div>
17   -
18 17 <div class="error_message">
  18 +<?php if($errors) { ?>
  19 + <span class='cross'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Your system is not quite ready to run KnowledgeTree. See the list below to determine which areas you need to address. <br/>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Once you&rsquo;ve fixed these items, return to this wizard and try again.</span><br/>
  20 +<?php } elseif ($warnings) {
  21 + ?>
  22 + <span class='cross_orange'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;KnowledgeTree Optional Dependencies not met, but you will be able to continue.</span><br/>
  23 + <?php
  24 +}?>
19 25 <?php
20 26 if($errors || $warnings) {
21 27 ?>
... ... @@ -54,9 +60,28 @@ The wizard will review your system to determine whether you can run KnowledgeTre
54 60 <p class="description">
55 61 The Java version must be higher than 1.5.
56 62 </p>
57   - <?php echo "<span class='{$step_vars['java']['class']}'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span>{$step_vars['java']['found']}"; ?>
58   - <br/>
59   - <?php echo "<span class='{$step_vars['version']['class']}'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span>{$step_vars['version']['found']}"; ?>
  63 + <table>
  64 + <tr>
  65 + <td> <span class='<?php echo $step_vars['java']['class']; ?>'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span> </td>
  66 + <td> <?php echo $step_vars['java']['found']; ?> </td>
  67 + <?php if ($step_vars['java']['class'] != 'tick') {
  68 + ?>
  69 + <td><a href="javascript:this.location.reload();" class="refresh">Refresh</a></td>
  70 + <?php
  71 + }
  72 + ?>
  73 + </tr>
  74 + <tr>
  75 + <td> <span class='<?php echo $step_vars['version']['class']; ?>'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span> </td>
  76 + <td> <?php echo $step_vars['version']['found']; ?> </td>
  77 + <?php if ($step_vars['version']['class'] != 'tick') {
  78 + ?>
  79 + <td><a href="javascript:this.location.reload();" class="refresh">Refresh</a></td>
  80 + <?php
  81 + }
  82 + ?>
  83 + </tr>
  84 + </table>
60 85 <?php if($silent) { ?>
61 86 </div>
62 87 <?php } ?>
... ... @@ -69,8 +94,20 @@ The wizard will review your system to determine whether you can run KnowledgeTre
69 94 <p class="description">
70 95 A PHP Java Bridge is required for KnowledgeTree to perform at an optimal level.
71 96 </p>
72   - <?php echo "<span class='{$step_vars['extensions']['class']}'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span>{$step_vars['extensions']['found']}"; ?>
73   - <br />
  97 + <table>
  98 + <tr>
  99 + <td> <span class='<?php echo $step_vars['extensions']['class']; ?>'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span> </td>
  100 + <td> <?php echo $step_vars['extensions']['found']; ?> </td>
  101 + <?php if ($step_vars['extensions']['class'] != 'tick') {
  102 + ?>
  103 + <td><a href="javascript:this.location.reload();" class="refresh">Refresh</a></td>
  104 + <?php
  105 + }
  106 + ?>
  107 + </tr>
  108 + </table>
  109 + <?php //echo "<span class='{$step_vars['extensions']['class']}'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span>{$step_vars['extensions']['found']}"; ?>
  110 +<!-- <br />-->
74 111 <?php if($silent) { ?>
75 112 </div>
76 113 <?php } ?>
... ... @@ -88,21 +125,32 @@ The wizard will review your system to determine whether you can run KnowledgeTre
88 125 <p class="description">
89 126 Preload Services if posibble.
90 127 </p>
  128 +<table>
91 129 <?php
92   -if($step_vars){
  130 +if($step_vars) {
93 131 if(isset($step_vars['services'])) {
94 132 foreach ($step_vars['services'] as $ser){
95   - echo "<span class='{$ser['class']}'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span>{$ser['msg']}<br/>";
  133 + ?>
  134 + <tr>
  135 + <td> <span class='<?php echo $ser['class']; ?>'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span> </td>
  136 + <td> <?php echo $ser['msg']; ?> </td>
  137 + <?php if ($ser['class'] != 'tick') {
  138 + ?>
  139 + <td><a href="javascript:this.location.reload();" class="refresh">Refresh</a></td>
  140 + <?php
  141 + } ?>
  142 + </tr>
  143 + <?php
96 144 }
97 145 }
98 146 }
99 147 ?>
  148 +</table>
100 149 <?php if($silent) { ?>
101 150 </div>
102 151 <?php } ?>
103 152 <div class="buttons">
104 153 <input type="submit" name="Previous" value="Previous"/>
105 154 <input type="submit" name="Next" value="Next"/>
106   - <input type="submit" name="Refresh" value="Refresh"/>
107 155 </div>
108 156 </form>
109 157 \ No newline at end of file
... ...
setup/wizard/templates/welcome.tpl
  View file @57d0d4f
... ... @@ -7,7 +7,7 @@ This wizard will lead you through the steps needed to install and configure Know
7 7 </div>
8 8  
9 9 <form action="index.php?step_name=welcome" method="post">
10   -<div class="buttons">
  10 +<div class="buttons" style="top:325px;">
11 11 <input type="submit" name="Next" value="Next"/>
12 12 </div>
13 13 </form>
14 14 \ No newline at end of file
... ...