diff --git a/lib/widgets/portlet.inc.php b/lib/widgets/portlet.inc.php index 2fecf6a..3b7c618 100644 --- a/lib/widgets/portlet.inc.php +++ b/lib/widgets/portlet.inc.php @@ -5,7 +5,7 @@ * KnowledgeTree Community Edition * Document Management Made Simple * Copyright (C) 2008, 2009 KnowledgeTree Inc. - * + * * * 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 @@ -153,13 +153,12 @@ class KTActionPortlet extends KTPortlet { // Create button html $button = "
- +
{$text}
-
-
+
"; diff --git a/resources/css/kt-framing.css b/resources/css/kt-framing.css index 4a31a8a..47544f0 100644 --- a/resources/css/kt-framing.css +++ b/resources/css/kt-framing.css @@ -1218,20 +1218,6 @@ The text will be hidden for screen view. The generic fahrner-ish approach comes text-decoration: none; } -.portlet_button a .arrow_download { - background: transparent url(../../resources/graphics/download_arrow.gif) center right no-repeat; - width: 20px; - height: 47px; - float: right; -} - -.portlet_button a .arrow_upload { - background: transparent url(../../resources/graphics/upload_arrow.gif) center right no-repeat; - width: 20px; - height: 47px; - float: right; -} - .portlet_button a .big_btn_left { background: transparent url(../../resources/graphics/btn_left.gif) top left no-repeat; width: 10px; @@ -1246,16 +1232,23 @@ The text will be hidden for screen view. The generic fahrner-ish approach comes text-align: center; vertical-align: middle; align: center; - width: 89%; + width: 80%; } .portlet_button a .big_btn_right { - background: transparent url(../../resources/graphics/btn_right.gif) top right no-repeat; float: left; - width: 10px; + width: 25px; height: 47px; } +.portlet_button a .arrow_upload{ + background: transparent url(../../resources/graphics/btn_right_up.gif) top right no-repeat; +} + +.portlet_button a .arrow_download{ + background: transparent url(../../resources/graphics/btn_right_down.gif) top right no-repeat; +} + .portlet_button a:hover .big_btn_left { background: transparent url(../../resources/graphics/btn_left_ro.gif) top left no-repeat; } @@ -1264,8 +1257,12 @@ The text will be hidden for screen view. The generic fahrner-ish approach comes background: transparent url(../../resources/graphics/btn_middle_ro.gif) repeat-x; } -.portlet_button a:hover .big_btn_right { - background: transparent url(../../resources/graphics/btn_right_ro.gif) top right no-repeat; +.portlet_button a:hover .arrow_upload { + background: transparent url(../../resources/graphics/btn_right_ro_up.gif) top right no-repeat; +} + +.portlet_button a:hover .arrow_download { + background: transparent url(../../resources/graphics/btn_right_ro_down.gif) top right no-repeat; } diff --git a/resources/graphics/btn_right_down.gif b/resources/graphics/btn_right_down.gif new file mode 100644 index 0000000..abf8217 --- /dev/null +++ b/resources/graphics/btn_right_down.gif diff --git a/resources/graphics/btn_right_ro_down.gif b/resources/graphics/btn_right_ro_down.gif new file mode 100644 index 0000000..17704f8 --- /dev/null +++ b/resources/graphics/btn_right_ro_down.gif diff --git a/resources/graphics/btn_right_ro_up.gif b/resources/graphics/btn_right_ro_up.gif new file mode 100644 index 0000000..585ea2e --- /dev/null +++ b/resources/graphics/btn_right_ro_up.gif diff --git a/resources/graphics/btn_right_up.gif b/resources/graphics/btn_right_up.gif new file mode 100644 index 0000000..5db07ce --- /dev/null +++ b/resources/graphics/btn_right_up.gif diff --git a/setup/migrate/steps/migrateComplete.php b/setup/migrate/steps/migrateComplete.php index c70a228..8f38df0 100644 --- a/setup/migrate/steps/migrateComplete.php +++ b/setup/migrate/steps/migrateComplete.php @@ -86,7 +86,6 @@ class migrateComplete extends Step { } if($this->next()) { $this->checkZendMysql(); - //if($this->checkMysql()) { if($this->checkZendMysql()) { return 'binstall'; } else { @@ -134,8 +133,17 @@ class migrateComplete extends Step { if($response['out']) { $state = preg_replace('/^STATE *\: *\d */', '', trim($response['out'][3])); // Status store in third key } - if($state == "STARTED") + if($state == "STARTED") { $running = true; + } else { + $installation = $this->getDataFromSession("database"); // Get installation directory + $dbConf = $installation; +// $this->util->dbUtilities->load($this->dhost, $this->dport, $this->duname, $this->dpassword, $this->dname); +// $res = @mysql_connect(null, 'root', ''); +// if($res) { +// $running = true; +// } + } } else { $installation = $this->getDataFromSession("installation"); // Get installation directory $mysqlPid = $installation['location'].DS."mysql".DS."data".DS."mysqld.pid"; diff --git a/setup/migrate/steps/migrateServices.php b/setup/migrate/steps/migrateServices.php index de04b16..a595ee7 100644 --- a/setup/migrate/steps/migrateServices.php +++ b/setup/migrate/steps/migrateServices.php @@ -156,6 +156,8 @@ class migrateServices extends Step * @return boolean */ private function doRun() { + $installation = $this->getDataFromSession("installation"); // Get installation directory + $this->conf = $installation['location']; if(!$this->alreadyUninstalled()) { // Pre-check if services are uninstalled $this->uninstallServices(); } diff --git a/setup/upgrade/steps/upgradeComplete.php b/setup/upgrade/steps/upgradeComplete.php index eaa399d..6047718 100644 --- a/setup/upgrade/steps/upgradeComplete.php +++ b/setup/upgrade/steps/upgradeComplete.php @@ -49,6 +49,10 @@ class upgradeComplete extends Step { public function doStep() { $this->temp_variables = array("step_name"=>"complete", "silent"=>$this->silent); + $this->temp_variables['isCE'] = false; + $type = $this->util->getVersionType(); + if($type == "community") + $this->temp_variables['isCE'] = true; $this->doRun(); $this->storeSilent(); return 'landing'; @@ -86,7 +90,7 @@ class upgradeComplete extends Step { */ protected function storeSilent() { $v = $this->getDataFromSession('upgradeProperties'); - $this->temp_variables['sysVersion'] = $v['upgrade_version']; + $this->temp_variables['sysVersion'] = $this->util->readVersion(); $this->temp_variables['migrateCheck'] = $this->migrateCheck; $this->temp_variables['servicesCheck'] = $this->servicesCheck; } diff --git a/setup/upgrade/templates/complete.tpl b/setup/upgrade/templates/complete.tpl index 64254d9..d782900 100644 --- a/setup/upgrade/templates/complete.tpl +++ b/setup/upgrade/templates/complete.tpl @@ -1,38 +1,55 @@ -

Database Upgrade Completed

-
-

Your database has been upgraded to
-

-

Services

- The KnowledgeTree services need to be started to allow for optimal functioning of the search, indexing and pdf generation. - - To start the services, execute the dmsctl.sh shell script in the KnowledgeTree directory from a terminal. +
+

Services

+ The KnowledgeTree services need to be started to allow for optimal functioning of the search, indexing and pdf generation. + + To start the services, execute the dmsctl.sh shell script in the KnowledgeTree directory from a terminal. +
+
+ + To start the services, execute the dmsctl.bat batch file in the KnowledgeTree directory from a command prompt, run as administrator. +
+
+ +

+ + [START MENU] => [Programs] => [KnowledgeTree]
+ Click [Start Services]
- - To start the services, execute the dmsctl.bat batch file in the KnowledgeTree directory from a command prompt, run as administrator.
+ Alternatively:
- -

- - cd
- dmsctl.bat install
- dmsctl.bat start - + Open a command prompt and enter the following: +
+ cd
+ dmsctl.bat install
+ dmsctl.bat start + + cd /usr/share/knowledgetree-ce
- sudo ./dmsctl.sh start + + cd /usr/share/knowledgetree
-

-
+ sudo ./dmsctl.sh start +

+
+ +
+ +
+ + Click Here for help on overcoming post install issues + +
Finish
\ No newline at end of file diff --git a/setup/upgrade/templates/database.tpl b/setup/upgrade/templates/database.tpl index a9716ef..6c56a5f 100644 --- a/setup/upgrade/templates/database.tpl +++ b/setup/upgrade/templates/database.tpl @@ -50,10 +50,12 @@ - + diff --git a/setup/wizard/resources/css/wizard.css b/setup/wizard/resources/css/wizard.css index 4c30e23..54e1a35 100644 --- a/setup/wizard/resources/css/wizard.css +++ b/setup/wizard/resources/css/wizard.css @@ -601,4 +601,12 @@ td.dir_description { font-size:100%; line-height:150%; font-family:sans-serif; +} + +.twitter { + +} + +.facebook { + } \ No newline at end of file diff --git a/setup/wizard/resources/graphics/facebookbutton.png b/setup/wizard/resources/graphics/facebookbutton.png new file mode 100644 index 0000000..8d98e0c --- /dev/null +++ b/setup/wizard/resources/graphics/facebookbutton.png diff --git a/setup/wizard/resources/graphics/twitterbutton.png b/setup/wizard/resources/graphics/twitterbutton.png new file mode 100644 index 0000000..06edb56 --- /dev/null +++ b/setup/wizard/resources/graphics/twitterbutton.png diff --git a/setup/wizard/steps/database.php b/setup/wizard/steps/database.php index 0acd43e..caff7a2 100644 --- a/setup/wizard/steps/database.php +++ b/setup/wizard/steps/database.php @@ -309,11 +309,7 @@ class database extends Step $this->error['dmsuserpassword'] = "Passwords do not match: " . $this->dmsuserpassword." ". $this->getPassword2(); return false; } -// if($this->dport == '') { -// $this->util->dbUtilities->load($this->dhost, $this->duname, $this->dpassword, $this->dname); -// } else { - $this->util->dbUtilities->load($this->dhost, $this->dport, $this->duname, $this->dpassword, $this->dname); -// } + $this->util->dbUtilities->load($this->dhost, $this->dport, $this->duname, $this->dpassword, $this->dname); if (!$this->util->dbUtilities->getDatabaseLink()) { $this->error['con'] = "Could not connect to the database, please check username and password"; return false; diff --git a/setup/wizard/templates/complete.tpl b/setup/wizard/templates/complete.tpl index 6273ccc..2eaec93 100644 --- a/setup/wizard/templates/complete.tpl +++ b/setup/wizard/templates/complete.tpl @@ -4,9 +4,7 @@

This step allows you to check that your KnowledgeTree configuration is set up correctly. - Click Finish to browse to the KnowledgeTree Web Interface. Default login credentials are username: admin and password: admin. -

@@ -15,6 +13,16 @@

+
+ +
+
+ +

Services

@@ -29,11 +37,20 @@

- - cd
- dmsctl.bat install
- dmsctl.bat start - + + [START MENU] => [Programs] => [KnowledgeTree] +
+ Click [Start Services] +
+
+ Alternatively: +
+ Open a command prompt and enter the following: +
+ cd
+ dmsctl.bat install
+ dmsctl.bat start + cd /usr/share/knowledgetree-ce
@@ -50,7 +67,6 @@ $iconFlag = "     "; $checkHeading = "

".$iconFlag."Paths and Permissions

"; ?> - - - - - - "; @@ -71,7 +82,6 @@ echo $pathsCheck; ?> -' . $varDirectory . ''; ?> ' . $documentRoot . ''; ?> @@ -84,10 +94,8 @@ -

-     "; @@ -100,10 +108,7 @@ $details = 'Hide Details'; $display = 'block'; }?> - - -"; @@ -133,10 +138,7 @@ $details = 'Hide Details'; $display = 'block'; }?> - - -"; @@ -152,7 +154,6 @@ -
@@ -164,46 +165,18 @@
Show Details
- - - - - - - - -
     "; ?> Lucene Service Could not be started Started - - - - - -
     "; ?> Scheduler Service Could not be started Started - - - - - -
     "; ?> OpenOffice Service Could not be started Started - - - - - -
@@ -218,8 +191,6 @@ $file_system_root = $_SERVER['DOCUMENT_ROOT']; $host = $_SERVER['SERVER_NAME']; $port = $_SERVER['SERVER_PORT']; - //$ssl_enabled = isset($_SERVER['HTTPS']) ? (strtolower($_SERVER['HTTPS']) === 'on' ? 'yes' : 'no') : 'no'; - $pos = strpos($script, '/setup/wizard/'); $root_url = substr($script, 0, $pos); if($port == '')