From 57d0d4f60e7134b3cedd57dfaff76531dd53a2ea Mon Sep 17 00:00:00 2001 From: Jarrett Jordaan Date: Wed, 2 Sep 2009 17:08:45 +0200 Subject: [PATCH] Story Id: 11821154 Daily Commit --- setup/wizard/lib/services/unixOpenOffice.php | 51 +++++++++++++++++++++++++++++++++++++++++++++++++++ setup/wizard/lib/services/windowsOpenOffice.php | 51 +++++++++++++++++++++++++++++++++++++++++++++++++++ setup/wizard/resources/wizard.css | 15 ++++++++++++++- setup/wizard/resources/wizard.js | 3 +++ setup/wizard/steps/configuration.php | 1 + setup/wizard/steps/services.php | 17 ++++++++++++++--- setup/wizard/templates/configuration.tpl | 60 ++++++++++++++++++++++++++++++++++++++---------------------- setup/wizard/templates/configuration_confirm.tpl | 27 ++++++++++++--------------- setup/wizard/templates/database.tpl | 12 ++++++------ setup/wizard/templates/database_confirm.tpl | 16 ++++++---------- setup/wizard/templates/dependencies.tpl | 8 ++++---- setup/wizard/templates/install.tpl | 8 ++++++-- setup/wizard/templates/license.tpl | 4 ++-- setup/wizard/templates/registration.tpl | 33 +++++++-------------------------- setup/wizard/templates/registration_confirm.tpl | 8 -------- setup/wizard/templates/services.tpl | 72 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++------------ setup/wizard/templates/welcome.tpl | 2 +- 17 files changed, 276 insertions(+), 112 deletions(-) create mode 100644 setup/wizard/lib/services/unixOpenOffice.php create mode 100644 setup/wizard/lib/services/windowsOpenOffice.php diff --git a/setup/wizard/lib/services/unixOpenOffice.php b/setup/wizard/lib/services/unixOpenOffice.php new file mode 100644 index 0000000..3f46ea6 --- /dev/null +++ b/setup/wizard/lib/services/unixOpenOffice.php @@ -0,0 +1,51 @@ +. +* +* 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 unixOpenOffice extends unixService { + + public function __construct() { + $this->name = "KTOpenOfficeTest"; + } + + +} +?> \ No newline at end of file diff --git a/setup/wizard/lib/services/windowsOpenOffice.php b/setup/wizard/lib/services/windowsOpenOffice.php new file mode 100644 index 0000000..b506978 --- /dev/null +++ b/setup/wizard/lib/services/windowsOpenOffice.php @@ -0,0 +1,51 @@ +. +* +* 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 windowsOpenOffice extends windowsService { + + + public function __construct() { + $this->name = "KTOpenOfficeTest"; + } + +} +?> \ No newline at end of file diff --git a/setup/wizard/resources/wizard.css b/setup/wizard/resources/wizard.css index 6ca6da5..0fd071e 100644 --- a/setup/wizard/resources/wizard.css +++ b/setup/wizard/resources/wizard.css @@ -70,6 +70,7 @@ select { #wrapper { background: white url("graphics/background.gif") repeat-y left; + height:465px; } #container { @@ -83,6 +84,7 @@ select { margin-left: 200px; padding: 10px; padding-top: 0; + width:950px; } #sidebar { @@ -291,7 +293,7 @@ refresh { border:none; background-color:#FFCCCC; color:#A30000; - width:550px; +/* width:550px; */ padding:0px; } @@ -302,4 +304,15 @@ refresh { /*color:#339933;*/ width:550px; padding:0px; +} + +.license_agreement { + overflow: scroll; + height: 255px; + width:800px; + overflow-x:hidden; +} + +.regSubmit { + } \ No newline at end of file diff --git a/setup/wizard/resources/wizard.js b/setup/wizard/resources/wizard.js index 9471155..8e18219 100644 --- a/setup/wizard/resources/wizard.js +++ b/setup/wizard/resources/wizard.js @@ -10,6 +10,9 @@ wizard.prototype.doFormCheck = function() { // Toggle Advance Database options wizard.prototype.toggleClass = function(el) { var el = document.getElementsByClassName(el); //adv_options|php_details|php_ext_details|php_con_details + if (el == 'adv_options') { + + } if(el[0].style.display == 'none') el[0].style.display = 'block'; else diff --git a/setup/wizard/steps/configuration.php b/setup/wizard/steps/configuration.php index f9caf3f..09c4373 100644 --- a/setup/wizard/steps/configuration.php +++ b/setup/wizard/steps/configuration.php @@ -354,6 +354,7 @@ class configuration extends Step if($class['class'] != 'tick') { $this->temp_variables['paths_perms'] = $class['class']; $this->done = false; + $this->error[] = "path error"; } $dirs[$key] = array_merge($dirs[$key], $class); } diff --git a/setup/wizard/steps/services.php b/setup/wizard/steps/services.php index ecb9b64..1dbda64 100644 --- a/setup/wizard/steps/services.php +++ b/setup/wizard/steps/services.php @@ -60,7 +60,7 @@ class services extends Step */ protected $runInstall = true; - private $services = array('Lucene', 'Scheduler'); + private $services = array('Lucene', 'Scheduler', 'OpenOffice'); protected $java; @@ -68,7 +68,7 @@ class services extends Step protected $util; - private $javaVersion = '1.5'; + private $javaVersion = '1.7'; /** * Java Installed @@ -342,12 +342,23 @@ class services extends Step if($auto) { return $auto; } else { - $this->specifyJava(); // Ask for settings + // Check if auto detected java works + $auto = $this->useDetected(); + if($auto) { + $this->disableExtension = true; // Disable the use of the php bridge extension + return $auto; + } else { + $this->specifyJava(); // Ask for settings + } } return $auto; } } + private function useDetected() { + return $this->detSettings(); + } + private function specifyJava() { $this->javaExeError = true; } diff --git a/setup/wizard/templates/configuration.tpl b/setup/wizard/templates/configuration.tpl index ebd99cf..12a0b49 100644 --- a/setup/wizard/templates/configuration.tpl +++ b/setup/wizard/templates/configuration.tpl @@ -4,24 +4,37 @@ The wizard will review your system to determine whether KnowledgeTree is correctly configured. You’ll see whether KnowledgeTree has the correct settings or whether changes are required.

-
+
+ +      All configuration settings are correctly set. Please click next to continue. + +
+
+ +      Your system is not quite ready to run KnowledgeTree. See the list below to determine which areas you need to address.
     Once you’ve fixed these items, return to this wizard and try again.
+ +      KnowledgeTree Optional Dependencies not met, but you will be able to continue.
+ + +      Click here for help on overcoming configuration issues + +
+

Server Settings

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.

-
- '; - } - } - ?> -
- @@ -48,7 +61,6 @@ The settings below have been drawn from the system information. The host and por
-

     "; ?>Paths and Permissions

Show Details
@@ -60,15 +72,20 @@ The following folders must be writable for KnowledgeTree to be able to run. The $path){ - $row = ''; - $row .= "\n"; - $row .= "\n"; - $row .= "\n"; - $row .= '\n"; - $row .= "\n"; - echo $row; + ?> + + + + + + + + + +
'; - $row .= (isset($path['msg'])) ? $path['msg'] : ''; - $row .= "
'>
 ' id='' size='60' value='' /> Refresh
@@ -78,6 +95,5 @@ The following folders must be writable for KnowledgeTree to be able to run. The
-
\ No newline at end of file diff --git a/setup/wizard/templates/configuration_confirm.tpl b/setup/wizard/templates/configuration_confirm.tpl index 3dfecf8..52a5fca 100644 --- a/setup/wizard/templates/configuration_confirm.tpl +++ b/setup/wizard/templates/configuration_confirm.tpl @@ -4,42 +4,39 @@ - + - + - + - + - +
Host: Host:
Port: Port:
Root Url: Root Url:
File System Root: File System Root:
SSL Enabled: SSL Enabled:
-

Paths and Permissions

$path){ - $row = ''; - - $row .= "\n"; - $row .= "\n"; - $row .= "\n"; - - $row .= "\n"; - - echo $row; +?> + + + + + +
{$path['name']}:{$path['path']}
'>
:
diff --git a/setup/wizard/templates/database.tpl b/setup/wizard/templates/database.tpl index 3200b81..4909afc 100644 --- a/setup/wizard/templates/database.tpl +++ b/setup/wizard/templates/database.tpl @@ -1,4 +1,4 @@ -

Database Configuration

+

Confirming Database Configurations

@@ -66,11 +66,11 @@

- + - + - +
@@ -100,8 +100,8 @@ An administrative user is required for creating tables within the database.
- - + +
diff --git a/setup/wizard/templates/database_confirm.tpl b/setup/wizard/templates/database_confirm.tpl index f3ccee8..afa19b8 100644 --- a/setup/wizard/templates/database_confirm.tpl +++ b/setup/wizard/templates/database_confirm.tpl @@ -1,13 +1,13 @@ -

Database Configuration Confirmation

+

Confirming Database Configurations

-Please confirm that your database settings have been entered correctly before proceeding with the installation. +Please confirm whether KnowledgeTree has correctly determined your database settings before proceeding.

Database Settings

- +
- - - - @@ -45,7 +41,7 @@ if($dtypes) {

Advanced Settings

-
Root Username:
Root Password:
+
@@ -68,7 +64,7 @@ if($dtypes) {

Database Users

-
Host:
+
@@ -91,7 +87,7 @@ if($dtypes) {
DMS Admin Username:
-
+
diff --git a/setup/wizard/templates/dependencies.tpl b/setup/wizard/templates/dependencies.tpl index e06274b..e5d3f35 100644 --- a/setup/wizard/templates/dependencies.tpl +++ b/setup/wizard/templates/dependencies.tpl @@ -17,11 +17,11 @@ Once the scan is completed, you’ll see whether your system has met the req
-      Your system is not quite ready to run KnowledgeTree. See the list below to determine which areas you need to address. Once you’ve fixed these items, return to this wizard and try again.
- - +      Your system is not quite ready to run KnowledgeTree. See the list below to determine which areas you need to address.
     Once you’ve fixed these items, return to this wizard and try again.
+      KnowledgeTree Optional Dependencies not met, but you will be able to continue.
+ @@ -129,7 +129,7 @@ B = Bytes, K = Kilobytes, M = Megabytes, G = Gigabytes
-
+
diff --git a/setup/wizard/templates/install.tpl b/setup/wizard/templates/install.tpl index d7d2d05..997e317 100644 --- a/setup/wizard/templates/install.tpl +++ b/setup/wizard/templates/install.tpl @@ -1,7 +1,11 @@ -

Installing System

+

Finalizing System Installation

+ +

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

-
+
diff --git a/setup/wizard/templates/license.tpl b/setup/wizard/templates/license.tpl index b67f240..6535f49 100644 --- a/setup/wizard/templates/license.tpl +++ b/setup/wizard/templates/license.tpl @@ -13,7 +13,7 @@ Please read and accept the license agreement below before continuing with the se

-
+

KnowledgeTree On-premise Commercial End-User

License Agreement Version 2.3 @@ -339,7 +339,7 @@ govern.
I do not accept the agreement

-
+
diff --git a/setup/wizard/templates/registration.tpl b/setup/wizard/templates/registration.tpl index b765455..3db5fc8 100644 --- a/setup/wizard/templates/registration.tpl +++ b/setup/wizard/templates/registration.tpl @@ -1,24 +1,16 @@ -

Register your KnowledgeTree Installation

- -
- $e) { - echo $e; - } - }?> -
+ +

Registering KnowledgeTree

-Register your KnowledgeTree Installation and receive the KnowledgeTree Drop Box for Windows software, a drag and drop tool that makes -placing documents into KnowledgeTree even easier. +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. +

We will not share your information with 3rd-parties, nor will we send you information not directly related to KnowledgeTree's products and services. Please see our Privacy and Data Retention policies for more information.

- - +

@@ -70,7 +62,7 @@ and services. Please see our - +
- - - - -*/ -?> - @@ -105,6 +86,6 @@ and services. Please see our - + \ No newline at end of file diff --git a/setup/wizard/templates/registration_confirm.tpl b/setup/wizard/templates/registration_confirm.tpl index 15a71e4..84f624f 100644 --- a/setup/wizard/templates/registration_confirm.tpl +++ b/setup/wizard/templates/registration_confirm.tpl @@ -1,13 +1,5 @@

Thank you for registering

-
- $e) { - echo $e; - } - }?> -
-

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

diff --git a/setup/wizard/templates/services.tpl b/setup/wizard/templates/services.tpl index 9a2013c..94348ea 100644 --- a/setup/wizard/templates/services.tpl +++ b/setup/wizard/templates/services.tpl @@ -2,20 +2,26 @@

Checking Service Dependencies

-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. +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.

-      All services have been installed. Please press Next to continue. +      All service dependencies are met. Please click next to continue.
-
+ +      Your system is not quite ready to run KnowledgeTree. See the list below to determine which areas you need to address.
     Once you’ve fixed these items, return to this wizard and try again.
+ +      KnowledgeTree Optional Dependencies not met, but you will be able to continue.
+ @@ -54,9 +60,28 @@ The wizard will review your system to determine whether you can run KnowledgeTre

The Java version must be higher than 1.5.

-      {$step_vars['java']['found']}"; ?> -
-      {$step_vars['version']['found']}"; ?> + + + + + + + + + + + + + + + +
'>      Refresh
'>      Refresh
@@ -69,8 +94,20 @@ The wizard will review your system to determine whether you can run KnowledgeTre

A PHP Java Bridge is required for KnowledgeTree to perform at an optimal level.

-      {$step_vars['extensions']['found']}"; ?> -
+ + + + + + + + +
'>      Refresh
+      {$step_vars['extensions']['found']}"; ?> + @@ -88,21 +125,32 @@ The wizard will review your system to determine whether you can run KnowledgeTre

Preload Services if posibble.

+     {$ser['msg']}
"; + ?> + + + + + + + + +
'>      Refresh
-
\ No newline at end of file diff --git a/setup/wizard/templates/welcome.tpl b/setup/wizard/templates/welcome.tpl index 1be52ae..072a1dd 100644 --- a/setup/wizard/templates/welcome.tpl +++ b/setup/wizard/templates/welcome.tpl @@ -7,7 +7,7 @@ This wizard will lead you through the steps needed to install and configure Know
-
+
\ No newline at end of file -- libgit2 0.21.4