From 13e8c40d70520ee6bee11fffbdc6a28bbee4c69e Mon Sep 17 00:00:00 2001 From: Jalaloedien Abrahams Date: Tue, 27 Mar 2007 15:07:30 +0000 Subject: [PATCH] KTS-1779 "Put an "About KnowledgeTree" between "Preferences" and "Logout" on the menu bar. " Made changes. --- about.php | 14 +++++++++++++- config/siteMap.inc | 2 +- i18n/knowledgeTree.pot | 12 ++++++++++++ i18n/templates.c | 5 ++++- lib/templating/kt3template.inc.php | 2 +- templates/ktcore/principals/about.smarty | 66 +++++++++++++++++++++++++++++------------------------------------- 6 files changed, 60 insertions(+), 41 deletions(-) diff --git a/about.php b/about.php index 6a623c8..4a866a9 100644 --- a/about.php +++ b/about.php @@ -36,14 +36,26 @@ class KTAbout extends KTStandardDispatcher { var $sSection = 'aboutkt'; function do_main() { - $this->aBreadcrumbs = array(array('action' => 'aboutkt', 'name' => sprintf(_kt("About %s"), APP_NAME))); + global $default; + $this->aBreadcrumbs = array(array('action' => 'aboutkt', 'name' => _kt("About"))); $oUser =& $this->oUser; $oTemplating =& KTTemplating::getSingleton(); $oTemplate = $oTemplating->loadTemplate("ktcore/principals/about"); + $aVersionInfo = explode(' ', $default->versionName); + foreach($aVersionInfo as $sVersionpiece){ + if(substr($sVersionpiece, 1, 1) == '.'){ + $sVersionNo = $sVersionpiece; + }else{ + $sVersionName .= " ".$sVersionpiece; + } + } + $aTemplateData = array( "context" => $this, + "versionname" => $sVersionName, + "versionnumber" => $sVersionNo, ); return $oTemplate->render($aTemplateData); } diff --git a/config/siteMap.inc b/config/siteMap.inc index dd87176..a608311 100644 --- a/config/siteMap.inc +++ b/config/siteMap.inc @@ -59,7 +59,7 @@ $default->siteMap->addSectionColour('Standard Search', 'th', 'A1571B'); $default->siteMap->addDefaultPage('preferences', '/preferences.php', 'Preferences', User, _kt('Preferences')); // pages for about section -$default->siteMap->addDefaultPage('aboutkt', '/about.php', 'About '.APP_NAME, User, sprintf(_kt("About %s"), APP_NAME)); +$default->siteMap->addDefaultPage('aboutkt', '/about.php', 'About', Guest, _kt('About')); // pages for Help section $default->siteMap->addDefaultPage('help', '/presentation/lookAndFeel/knowledgeTree/help.php', 'Help', Guest, _kt('Help')); diff --git a/i18n/knowledgeTree.pot b/i18n/knowledgeTree.pot index 1b58072..533bea3 100644 --- a/i18n/knowledgeTree.pot +++ b/i18n/knowledgeTree.pot @@ -10670,3 +10670,15 @@ msgstr "" #: templates/ktcore/document/viewlets/workflow.smarty:2 msgid "Available Transitions" msgstr "" + +#: about.php:39 +msgid "About" +msgstr "" + +#: lib/templating/kt3template.inc.php:356 +msgid "About" +msgstr "" + +#: i18n/templates.c:5747 +msgid "#appname# #versionname#" +msgstr "" \ No newline at end of file diff --git a/i18n/templates.c b/i18n/templates.c index 8f8302e..663ad9d 100644 --- a/i18n/templates.c +++ b/i18n/templates.c @@ -5741,4 +5741,7 @@ gettext("The action can be performed on the entire selection."); gettext("The action cannot be performed on any of the selected entities."); /* ./plugins/rssplugin/templates/RSSPlugin/dashlet.smarty */ -gettext("#appname# RSS"); \ No newline at end of file +gettext("#appname# RSS"); + +/* ./templates/ktcore/principles/about.smarty */ +gettext("#appname# #versionname#"); \ No newline at end of file diff --git a/lib/templating/kt3template.inc.php b/lib/templating/kt3template.inc.php index f47ede4..4be583a 100644 --- a/lib/templating/kt3template.inc.php +++ b/lib/templating/kt3template.inc.php @@ -353,7 +353,7 @@ class KTPage { $this->userMenu = array("logout" => $this->_actionHelper(array("name" => _kt("Logout"), "action" => "logout", "active" => 0)),); } else { $this->userMenu = array("preferences" => $this->_actionHelper(array("name" => _kt("Preferences"), "action" => "preferences", "active" => 0)), - "aboutkt" => $this->_actionhelper(array("name" => sprintf(_kt("About %s"), APP_NAME), "action" => "aboutkt", "active" => 0)), + "aboutkt" => $this->_actionhelper(array("name" => _kt("About"), "action" => "aboutkt", "active" => 0)), "logout" => $this->_actionHelper(array("name" => _kt("Logout"), "action" => "logout", "active" => 0)),); } } else { diff --git a/templates/ktcore/principals/about.smarty b/templates/ktcore/principals/about.smarty index 1e3d398..d7f8eb0 100644 --- a/templates/ktcore/principals/about.smarty +++ b/templates/ktcore/principals/about.smarty @@ -1,39 +1,31 @@ -

{i18n arg_appname="$appname"}About #appname#{/i18n}

-

Corporate Contact Details

- - - - - - - - - - - - - - - - - - - - - - - - - - -
 Corporate Address The Jam Warehouse Software (Pty) Ltd.
-Unit 1, Tramber Place
-Blake Street, Observatory, 7925
-Cape Town
-South Africa
-Tel: +27 21 4477440 [Reception open 9am-5pm GMT+2]
-Fax: +27 21 4477449
 Contact Sales 
  Email Sales: sales@knowledgetree.com
  Call Sales: +1 415 670-9759
   
-

Contributors

+

{i18n arg_appname="$appname" arg_versionname="$versionname"}#appname# #versionname#{/i18n}

+

{i18n arg_version="$versionnumber"}Version #version#{/i18n}

+

Copyright © 2004-2007 The Jam Warehouse Software (Pty) Ltd. All Rights Reserved. View License Agreement
+KnowledgeTree™ is trademarks of The Jam Warehouse Software (Pty) Ltd. +

+

+KnowledgeTree is a business unit of The Jam Warehouse Software (Pty) Ltd.
+Unit 1, Tramber Place, Blake Street, Observatory, Cape Town, 7925 South Africa, +27 21 4477440, http://www.knowledgetree.com
+

+

+KnowledgeTree Sales
+To purchase support and extended features for KnowledgeTree or to license KnowledgeTree for use in your own application, please contact our sales team: +

+

+Email Sales: sales@knowledgetree.com
+Call Sales: +1 415 670-9759 +

+

Join the KnowledgeTree Community +

+

+

+Thanks to the following developers for their contributions