Commit 13e8c40d70520ee6bee11fffbdc6a28bbee4c69e

Authored by Jalaloedien Abrahams
1 parent e7527069

KTS-1779

"Put an "About KnowledgeTree" between "Preferences" and "Logout" on the menu bar. "
Made changes.

Reviewed By: Kevin

git-svn-id: https://kt-dms.svn.sourceforge.net/svnroot/kt-dms/trunk@6425 c91229c3-7414-0410-bfa2-8a42b809f60b
about.php
@@ -36,14 +36,26 @@ class KTAbout extends KTStandardDispatcher { @@ -36,14 +36,26 @@ class KTAbout extends KTStandardDispatcher {
36 var $sSection = 'aboutkt'; 36 var $sSection = 'aboutkt';
37 37
38 function do_main() { 38 function do_main() {
39 - $this->aBreadcrumbs = array(array('action' => 'aboutkt', 'name' => sprintf(_kt("About %s"), APP_NAME))); 39 + global $default;
  40 + $this->aBreadcrumbs = array(array('action' => 'aboutkt', 'name' => _kt("About")));
40 $oUser =& $this->oUser; 41 $oUser =& $this->oUser;
41 42
42 $oTemplating =& KTTemplating::getSingleton(); 43 $oTemplating =& KTTemplating::getSingleton();
43 $oTemplate = $oTemplating->loadTemplate("ktcore/principals/about"); 44 $oTemplate = $oTemplating->loadTemplate("ktcore/principals/about");
44 45
  46 + $aVersionInfo = explode(' ', $default->versionName);
  47 + foreach($aVersionInfo as $sVersionpiece){
  48 + if(substr($sVersionpiece, 1, 1) == '.'){
  49 + $sVersionNo = $sVersionpiece;
  50 + }else{
  51 + $sVersionName .= " ".$sVersionpiece;
  52 + }
  53 + }
  54 +
45 $aTemplateData = array( 55 $aTemplateData = array(
46 "context" => $this, 56 "context" => $this,
  57 + "versionname" => $sVersionName,
  58 + "versionnumber" => $sVersionNo,
47 ); 59 );
48 return $oTemplate->render($aTemplateData); 60 return $oTemplate->render($aTemplateData);
49 } 61 }
config/siteMap.inc
@@ -59,7 +59,7 @@ $default->siteMap->addSectionColour('Standard Search', 'th', 'A1571B'); @@ -59,7 +59,7 @@ $default->siteMap->addSectionColour('Standard Search', 'th', 'A1571B');
59 $default->siteMap->addDefaultPage('preferences', '/preferences.php', 'Preferences', User, _kt('Preferences')); 59 $default->siteMap->addDefaultPage('preferences', '/preferences.php', 'Preferences', User, _kt('Preferences'));
60 60
61 // pages for about section 61 // pages for about section
62 -$default->siteMap->addDefaultPage('aboutkt', '/about.php', 'About '.APP_NAME, User, sprintf(_kt("About %s"), APP_NAME)); 62 +$default->siteMap->addDefaultPage('aboutkt', '/about.php', 'About', Guest, _kt('About'));
63 63
64 // pages for Help section 64 // pages for Help section
65 $default->siteMap->addDefaultPage('help', '/presentation/lookAndFeel/knowledgeTree/help.php', 'Help', Guest, _kt('Help')); 65 $default->siteMap->addDefaultPage('help', '/presentation/lookAndFeel/knowledgeTree/help.php', 'Help', Guest, _kt('Help'));
i18n/knowledgeTree.pot
@@ -10670,3 +10670,15 @@ msgstr "" @@ -10670,3 +10670,15 @@ msgstr ""
10670 #: templates/ktcore/document/viewlets/workflow.smarty:2 10670 #: templates/ktcore/document/viewlets/workflow.smarty:2
10671 msgid "Available Transitions" 10671 msgid "Available Transitions"
10672 msgstr "" 10672 msgstr ""
  10673 +
  10674 +#: about.php:39
  10675 +msgid "About"
  10676 +msgstr ""
  10677 +
  10678 +#: lib/templating/kt3template.inc.php:356
  10679 +msgid "About"
  10680 +msgstr ""
  10681 +
  10682 +#: i18n/templates.c:5747
  10683 +msgid "#appname# #versionname#"
  10684 +msgstr ""
10673 \ No newline at end of file 10685 \ No newline at end of file
i18n/templates.c
@@ -5741,4 +5741,7 @@ gettext("The action can be performed on the entire selection."); @@ -5741,4 +5741,7 @@ gettext("The action can be performed on the entire selection.");
5741 gettext("The action cannot be performed on any of the selected entities."); 5741 gettext("The action cannot be performed on any of the selected entities.");
5742 5742
5743 /* ./plugins/rssplugin/templates/RSSPlugin/dashlet.smarty */ 5743 /* ./plugins/rssplugin/templates/RSSPlugin/dashlet.smarty */
5744 -gettext("#appname# RSS");  
5745 \ No newline at end of file 5744 \ No newline at end of file
  5745 +gettext("#appname# RSS");
  5746 +
  5747 +/* ./templates/ktcore/principles/about.smarty */
  5748 +gettext("#appname# #versionname#");
5746 \ No newline at end of file 5749 \ No newline at end of file
lib/templating/kt3template.inc.php
@@ -353,7 +353,7 @@ class KTPage { @@ -353,7 +353,7 @@ class KTPage {
353 $this->userMenu = array("logout" => $this->_actionHelper(array("name" => _kt("Logout"), "action" => "logout", "active" => 0)),); 353 $this->userMenu = array("logout" => $this->_actionHelper(array("name" => _kt("Logout"), "action" => "logout", "active" => 0)),);
354 } else { 354 } else {
355 $this->userMenu = array("preferences" => $this->_actionHelper(array("name" => _kt("Preferences"), "action" => "preferences", "active" => 0)), 355 $this->userMenu = array("preferences" => $this->_actionHelper(array("name" => _kt("Preferences"), "action" => "preferences", "active" => 0)),
356 - "aboutkt" => $this->_actionhelper(array("name" => sprintf(_kt("About %s"), APP_NAME), "action" => "aboutkt", "active" => 0)), 356 + "aboutkt" => $this->_actionhelper(array("name" => _kt("About"), "action" => "aboutkt", "active" => 0)),
357 "logout" => $this->_actionHelper(array("name" => _kt("Logout"), "action" => "logout", "active" => 0)),); 357 "logout" => $this->_actionHelper(array("name" => _kt("Logout"), "action" => "logout", "active" => 0)),);
358 } 358 }
359 } else { 359 } else {
templates/ktcore/principals/about.smarty
1 -<h2>{i18n arg_appname="$appname"}About #appname#{/i18n}</h2>  
2 -<p><strong>Corporate Contact Details</strong></p>  
3 -<table width="50%" border="0">  
4 - <tr>  
5 - <td valign="top">&nbsp;</td>  
6 - <td valign="top"><strong>Corporate Address </strong></td>  
7 - <td><a href="http://www.jamwarehouse.com/">The Jam Warehouse Software (Pty) Ltd.</a><br />  
8 -Unit 1, Tramber Place <br />  
9 -Blake Street, Observatory, 7925 <br />  
10 -Cape Town <br />  
11 -South Africa<br />  
12 -Tel: +27 21 4477440 [Reception open 9am-5pm GMT+2]<br />  
13 -Fax: +27 21 4477449</td>  
14 - </tr>  
15 - <tr>  
16 - <td>&nbsp;</td>  
17 - <td><strong>Contact Sales</strong></td>  
18 - <td>&nbsp;</td>  
19 - </tr>  
20 - <tr>  
21 - <td>&nbsp;</td>  
22 - <td>&nbsp;</td>  
23 - <td>Email Sales: sales@knowledgetree.com</td>  
24 - </tr>  
25 - <tr>  
26 - <td>&nbsp;</td>  
27 - <td>&nbsp;</td>  
28 - <td>Call Sales: +1 415 670-9759</td>  
29 - </tr>  
30 - <tr>  
31 - <td>&nbsp;</td>  
32 - <td>&nbsp;</td>  
33 - <td>&nbsp;</td>  
34 - </tr>  
35 -</table>  
36 -<p><strong>Contributors</strong></p> 1 +<h2>{i18n arg_appname="$appname" arg_versionname="$versionname"}#appname# #versionname#{/i18n}</h2>
  2 +<p><strong>{i18n arg_version="$versionnumber"}Version #version#{/i18n}</strong></p>
  3 +<p>Copyright &copy; 2004-2007 <a href="http://www.jamwarehouse.com/">The Jam Warehouse Software (Pty) Ltd.</a> All Rights Reserved. <a href="http://www.knowledgetree.com/About/legal/license">View License Agreement</a><br />
  4 +KnowledgeTree&trade; is <a href="http://www.knowledgetree.com/About/legal/trademark_usage_grant">trademarks</a> of The Jam Warehouse Software (Pty) Ltd.
  5 +</p>
  6 +<p>
  7 +<strong>KnowledgeTree is a business unit of The Jam Warehouse Software (Pty) Ltd.</strong><br />
  8 +Unit 1, Tramber Place, Blake Street, Observatory, Cape Town, 7925 South Africa, +27 21 4477440, <a href="http://www.knowledgetree.com">http://www.knowledgetree.com</a><br />
  9 +</p>
  10 +<p>
  11 +<strong>KnowledgeTree Sales</strong><br />
  12 +To purchase support and extended features for KnowledgeTree or to license KnowledgeTree for use in your own application, please contact our sales team:
  13 +</p>
  14 +<p>
  15 +Email Sales: <a href="mailto:sales@knowledgetree.com">sales@knowledgetree.com</a><br />
  16 +Call Sales: +1 415 670-9759
  17 +</p>
  18 +<p><strong>Join the KnowledgeTree Community</strong>
  19 +<ul>
  20 + <li><a href="http://forge.knowledgetree.com/">KTForge</a>: Collaborate and develop KnowledgeTree extensions</li>
  21 + <li><a href="http://forums.knowledgetree.com/">Forums</a>: Discuss KnowledgeTree with expert community users and developers</li>
  22 + <li><a href="http://wiki.knowledgetree.com/">Wiki</a>: Search the knowledge base of user and developer topics</li>
  23 + <li><a href="http://issues.knowledgetree.com/">Issues</a>: Log a bug or suggest a new feature</li>
  24 + <li><a href="http://people.knowledgetree.com/">Blogs</a>: See what the KnowledgeTree team have to say</li>
  25 +</ul>
  26 +</p>
  27 +<p>
  28 +<strong>Thanks to the following developers for their contributions</strong></p>
37 <ul> 29 <ul>
38 <li> 30 <li>
39 Fu Bin 31 Fu Bin
@@ -79,7 +71,7 @@ Fax: +27 21 4477449&lt;/td&gt; @@ -79,7 +71,7 @@ Fax: +27 21 4477449&lt;/td&gt;
79 <p><strong>Third Party Software</strong></p> 71 <p><strong>Third Party Software</strong></p>
80 <table border="0"> 72 <table border="0">
81 <tr> 73 <tr>
82 - <td bgcolor="#339900"><img src="{$rootUrl}/resources/graphics/thirdparty/pear.gif"/></td> 74 + <td><div style="background-color:#339900; width:104px;"><img src="{$rootUrl}/resources/graphics/thirdparty/pear.gif"/></div></td>
83 <td>Pear</td> 75 <td>Pear</td>
84 </tr> 76 </tr>
85 <tr> 77 <tr>