diff --git a/about.php b/about.php index 573e88b..1c073b1 100644 --- a/about.php +++ b/about.php @@ -68,7 +68,7 @@ class KTAbout extends KTStandardDispatcher { "context" => $this, "versionname" => $sVersionName, "versionnumber" => $sVersionNo, - 'smallVersion' => substr($default->versionName, 0, 3), + 'smallVersion' => substr($default->versionName, -17), ); return $oTemplate->render($aTemplateData); } diff --git a/lib/templating/kt3template.inc.php b/lib/templating/kt3template.inc.php index dcb6302..426ad44 100644 --- a/lib/templating/kt3template.inc.php +++ b/lib/templating/kt3template.inc.php @@ -419,7 +419,7 @@ class KTPage { "page" => $this, "systemversion" => $default->systemVersion, "versionname" => $default->versionName, - 'smallVersion' => substr($default->versionName, 0, 3), + 'smallVersion' => substr($default->versionName, -17), 'savedSearches'=> $savedSearches); if ($oConfig->get("ui/automaticRefresh", false)) { $aTemplateData['refreshTimeout'] = (int)$oConfig->get("session/sessionTimeout") + 3; diff --git a/login.php b/login.php index 2cf450d..ab16003 100644 --- a/login.php +++ b/login.php @@ -200,7 +200,7 @@ class LoginPageDispatcher extends KTDispatcher { 'languages' => $aRegisteredLanguageNames, 'selected_language' => $sLanguageSelect, 'disclaimer' => $sDisclaimer, - 'smallVersion' => substr($default->versionName, 0, 3), + 'smallVersion' => substr($default->versionName,-17), ); return $oTemplate->render($aTemplateData); } diff --git a/resources/css/kt-login.css b/resources/css/kt-login.css index e45106d..7856693 100644 --- a/resources/css/kt-login.css +++ b/resources/css/kt-login.css @@ -148,3 +148,8 @@ margin: 0; border: 0; padding: 0; width: 1px; } + +.communityLabel +{ + color: #919192; +} diff --git a/templates/kt3/standard_page.smarty b/templates/kt3/standard_page.smarty index d6a9d5e..cf0a7b2 100644 --- a/templates/kt3/standard_page.smarty +++ b/templates/kt3/standard_page.smarty @@ -314,24 +314,59 @@
- +
- - + {if ($smallVersion == 'Community Edition')} + + + -
- {i18n}© 2004-2008 The Jam Warehouse Software (Pty) Limited{/i18n}
- {if ($smallVersion == 'OSS')} - {i18n}This program is free software and published under the GNU General Public License version 3{/i18n}
- {else} - {i18n}All rights reserved.{/i18n}
- {/if} -

{$page->getDisclaimer()}

-
- {i18n arg_timing=$page->getReqTime()}Request created in #timing#s{/i18n}
- {i18n arg_version="$versionname" arg_appname="$appname"}#appname# Version: #version#{/i18n}
- Powered by KnowledgeTree -
+ {else} + + {/if} + + + + + +
+ Powered by KnowledgeTree + + {i18n arg_version="$versionname" arg_appname="$appname"}#appname# Version: #version#{/i18n} + {if ($smallVersion == 'Community Edition')} + {i18n}is licensed free of charge and supplied with + no support + , no maintenance + , and no warranty. + {/i18n} + {else} +
+ {i18n arg_timing=$page->getReqTime()}Request created in #timing#s{/i18n} + {/if} +
+
+ + + + + + +
+ {i18n}© 2008 KnowledgeTree Inc.{/i18n} + {i18n}All rights reserved.{/i18n} + {if ($smallVersion == 'Community Edition')} + {i18n arg_timing=$page->getReqTime()}Request created in #timing#s{/i18n} + {/if} +
+
+ +
diff --git a/templates/ktcore/login.smarty b/templates/ktcore/login.smarty index a2049ed..83f807e 100644 --- a/templates/ktcore/login.smarty +++ b/templates/ktcore/login.smarty @@ -27,6 +27,9 @@ {else} {$appname}
{/if} + {if $smallVersion == 'Community Edition'} +

{i18n}Community Edition{i18n}

+ {/if} {if ($errorMessage == null)}

{i18n}Please enter your details below to login.{/i18n}

{else} @@ -60,10 +63,11 @@ {/if}

+
{i18n arg_appname="$appname"}#appname# Version{/i18n} {$versionName}
{i18n}Document Management Software{/i18n}
- {i18n}© 2004-2008 The Jam Warehouse Software (Pty) Limited{/i18n}

- {if ($smallVersion == 'OSS')} + {i18n}© 2008 KnowledgeTree Inc.{/i18n}

+ {if ($smallVersion == 'Community Edition')} {i18n}This program is free software and published under the GNU General Public License version 3{/i18n}
{else} {i18n}All rights reserved.{/i18n}
diff --git a/templates/ktcore/principals/about.smarty b/templates/ktcore/principals/about.smarty index 3e64254..c4b0148 100644 --- a/templates/ktcore/principals/about.smarty +++ b/templates/ktcore/principals/about.smarty @@ -1,26 +1,27 @@

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

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

-

{i18n}© 2004-2008 The Jam Warehouse Software (Pty) Limited View License Agreement{/i18n}
-{if ($smallVersion == 'OSS')} - {i18n}This program is free software and published under the GNU General Public License version 3{/i18n}
-{else} +

{i18n}© 2008 KnowledgeTree Inc.{/i18n}       http://www.knowledgetree.com
+{if ($smallVersion !== 'Community Edition')} {i18n}All rights reserved.{/i18n}
{/if} -KnowledgeTree™ is a trademark of The Jam Warehouse Software (Pty) Ltd. -

-

-KnowledgeTree is a business unit of The Jam Warehouse Software (Pty) Ltd.
-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 + +{i18n}Portions copyright The Jam Warehouse Software (Pty) Limited.{/i18n} +
+{if ($smallVersion == 'Community Edition')} + {i18n}This program is free software and published under the GNU General Public License version 3{/i18n}

+ {i18n}KnowledgeTree Community Edition is supplied with no support, + no maintenance, + and no warranty.{/i18n}
+ {i18n}Please contact the KnowledgeTree Sales team should you wish to learn more about commercially supported editions of KnowledgeTree.{/i18n}
+{else} +
+ {i18n}This is a professionally supported edition of KnowledgeTree.{/i18n}
+ {i18n}Please refer to the documentation provided to you at subscription to learn more about how to access KnowledgeTree's professional support team.{/i18n}
+ +{/if}

+

Join the KnowledgeTree Community