KTC-245

"Login Page text update" Fixed. Updated login.php, login.smarty KTC-246 "Footer Text update" Fixed. Updated standard_page.smarty, kt3template.inc.php KTC-247 "About Page text update" Fixed. Updated about.php, about.smarty, knowledgeTree.pot, templates.c Committed By: Jalaloedien Abrahams Reviewed By: Kevin Fourie git-svn-id: https://kt-dms.svn.sourceforge.net/svnroot/kt-dms/trunk@7480 c91229c3-7414-0410-bfa2-8a42b809f60b

KTC-245
"Login Page text update" Fixed. Updated login.php, login.smarty KTC-246 "Footer Text update" Fixed. Updated standard_page.smarty, kt3template.inc.php KTC-247 "About Page text update" Fixed. Updated about.php, about.smarty, knowledgeTree.pot, templates.c Committed By: Jalaloedien Abrahams Reviewed By: Kevin Fourie git-svn-id: https://kt-dms.svn.sourceforge.net/svnroot/kt-dms/trunk@7480 c91229c3-7414-0410-bfa2-8a42b809f60b
Jalaloedien Abrahams
1 parent 7181862d
Showing 9 changed files with 65 additions and 18 deletions
about.php
config/config.ini
i18n/knowledgeTree.pot
i18n/templates.c
lib/templating/kt3template.inc.php
login.php
templates/kt3/standard_page.smarty
templates/ktcore/login.smarty
templates/ktcore/principals/about.smarty
@@ -68,6 +68,7 @@ class KTAbout extends KTStandardDispatcher {
               "context" => $this,
               "versionname" => $sVersionName,
 			  "versionnumber" => $sVersionNo,
+			  'smallVersion' => substr($default->versionName, 0, 3),
         );
         return $oTemplate->render($aTemplateData);    
     }
@@ -103,8 +103,6 @@ companyLogoTitle = ACME Corporation
 ;mainLogoWidth = 219px
 ; ALT text - for accessibility purposes.
 ;mainLogoTitle = ACME Knowledge Management Systems
-; enable/disable powered by kt logo
-;poweredByDisabled = 0
 ; powered by kt logo
 ;powerLogo = ${rootUrl}/resources/powered-by-kt.gif
 ; the logo's width in pixels
@@ -130,9 +130,27 @@ msgid &quot;%s is not an archived document. Aborting restore.&quot;
 msgstr ""
 #: i18n/templates.c:1427 i18n/templates.c:5345
-msgid "&copy; 2007 <a href=\"http://www.knowledgetree.com/\">The Jam Warehouse Software (Pty) Ltd.</a> All Rights Reserved"
+msgid "<a href="http://www.knowledgetree.com/">Document Management Software</a>"
 msgstr ""
+#: i18n/templates.c:1427 i18n/templates.c:5348
+msgid "&copy; 2007 <a href="http://www.knowledgetree.com/">The Jam Warehouse Software (Pty) Ltd.</a>"
+msgstr ""
+
+#: i18n/templates.c:5351 i18n/templates.c:5762
+msgid "This program is free software and published under the <a href=" http://www.gnu.org/licenses/">GNU General Public License version 3</a>"
+msgstr ""
+
+#: i18n/templates.c:5354 i18n/templates.c:5765
+msgid "All rights reserved."
+msgstr ""
+
+
+#: i18n/templates.c:5759
+msgid "Copyright &copy; 2004-2007 <a href=" http://www.knowledgetree.com/">The Jam Warehouse Software (Pty) Limited</a> <a href="http://www.knowledgetree.com/About/legal/license">View License Agreement</a>"
+msgstr ""
+
+
 #: plugins/ktcore/folder/BulkImport.php:63
 #: plugins/ktcore/folder/BulkUpload.php:70
 #: plugins/ktcore/folder/addDocument.php:105
@@ -5342,7 +5342,16 @@ gettext(&quot;login&quot;);
 gettext("#appname# Version");
 /* ./templates/ktcore/login.smarty */
-gettext("&copy; 2007 <a href=\"http://www.knowledgetree.com/\">The Jam Warehouse Software (Pty) Ltd.</a> All Rights Reserved");
+gettext("<a href="http://www.knowledgetree.com/">Document Management Software</a>");
+
+/* ./templates/ktcore/login.smarty */
+gettext("&copy; 2007 <a href="http://www.knowledgetree.com/">The Jam Warehouse Software (Pty) Ltd.</a>");
+
+/* ./templates/ktcore/login.smarty */
+gettext("This program is free software and published under the <a href=" http://www.gnu.org/licenses/">GNU General Public License version 3</a>");
+
+/* ./templates/ktcore/login.smarty */
+gettext("All rights reserved.");
 /* ./templates/ktcore/manage_permissions.smarty */
 gettext("Existing permissions");
@@ -5745,3 +5754,12 @@ gettext(&quot;#appname# RSS&quot;);
 /* ./templates/ktcore/principles/about.smarty */
 gettext("#appname# #versionname#");
+
+/* ./templates/ktcore/principles/about.smarty */
+gettext("Copyright &copy; 2004-2007 <a href=" http://www.knowledgetree.com/">The Jam Warehouse Software (Pty) Limited</a> <a href="http://www.knowledgetree.com/About/legal/license">View License Agreement</a>");
+
+/* ./templates/ktcore/principles/about.smarty */
+gettext("This program is free software and published under the <a href=" http://www.gnu.org/licenses/">GNU General Public License version 3</a>");
+
+/* ./templates/ktcore/principles/about.smarty */
+gettext("All rights reserved.");
 \ No newline at end of file
@@ -126,7 +126,6 @@ class KTPage {
 	$aJS[] = 'thirdpartyjs/MochiKit/DragAndDrop.js';
 	$aJS[] = 'thirdpartyjs/MochiKit/Sortable.js';
 	$aJS[] = 'thirdpartyjs/MochiKit/Style.js';
-	$aJS[] = 'thirdpartyjs/MochiKit/Signal.js';
         */
 		$aJS[] = 'thirdpartyjs/MochiKit/MochiKitPacked.js';
         $aJS[] = 'resources/js/kt-utility.js';
@@ -138,11 +137,6 @@ class KTPage {
-        //$aJS[] = 'thirdpartyjs/MochiKit/Iter.js';
-        //$aJS[] = 'thirdpartyjs/MochiKit/DOM.js';
-        //$aJS[] = 'thirdpartyjs/MochiKit/Logging.js';
-        //$aJS[] = 'thirdpartyjs/MochiKit/Async.js';
-        //$aJS[] = 'thirdpartyjs/MochiKit/Signal.js';
         //$aJS[] = 'thirdpartyjs/MochiKit/.js';
         //$aJS[] = 'resources/js/translate.js';
@@ -402,6 +396,7 @@ class KTPage {
         			"page" => $this,
 			       	"systemversion" => $default->systemVersion,
 			       	"versionname" => $default->versionName,
+					'smallVersion' => substr($default->versionName, 0, 3),
 			       	'savedSearches'=> $savedSearches);
         if ($oConfig->get("ui/automaticRefresh", false)) {
             $aTemplateData['refreshTimeout'] = (int)$oConfig->get("session/sessionTimeout") + 3;
@@ -173,7 +173,8 @@ class LoginPageDispatcher extends KTDispatcher {
               'versionName' => $default->versionName,
               'languages' => $aRegisteredLanguageNames,
               'selected_language' => $sLanguageSelect,
-	      'disclaimer' => $sDisclaimer,
+	      	  'disclaimer' => $sDisclaimer,
+			  'smallVersion' => substr($default->versionName, 0, 3),
         );
         return $oTemplate->render($aTemplateData);
     }
@@ -368,15 +368,18 @@
 		<table width="98%" align="center">
 			<tr>
 				<td align="left">
-					<span>{i18n}&copy; 2007 <a href="http://www.knowledgetree.com/">The Jam Warehouse Software (Pty) Ltd.</a> All Rights Reserved{/i18n}</span>
+					<span>{i18n}&copy; 2004-2007 <a href="http://www.knowledgetree.com/">The Jam Warehouse Software (Pty) Limited</a>{/i18n}</span><br>
+					{if ($smallVersion == 'OSS')}
+						{i18n}This program is free software and published under the <a href=" http://www.gnu.org/licenses/">GNU General Public License version 3</a>{/i18n}<br>
+					{else}
+						{i18n}All rights reserved.{/i18n}<br>
+					{/if}
 					<p>{$page->getDisclaimer()}</p>
 				</td>
 				<td align="right">
 					<span>{i18n arg_timing=$page->getReqTime()}Request created in #timing#s{/i18n}</span><br />
 					<span>{i18n arg_version="$versionname" arg_appname="$appname"}#appname# Version: #version#{/i18n}</span><br/>
-					{if $config->get("ui/poweredByDisabled") == '0'}
-						<a href="{$rootUrl}"><img src="{$config->get("ui/powerLogo")}" border="0" alt="{$config->get("ui/powerLogoTitle")}" title="{$config->get("ui/powerLogoTitle")}"/></a>
-					{/if}
+					<a href="{$rootUrl}"><img src="{$rootUrl}/resources/powered-by-kt.gif" border="0" alt="Powered by KnowledgeTree" title="Powered by KnowledgeTree"/></a>
 				</td>
 			</tr>
 		</table>
@@ -54,9 +54,17 @@
 			</div>
 			{/if}
 			<p class="descriptiveText version">
-				{i18n arg_appname="$appname"}#appname# Version{/i18n}<br />{$versionName}<br/>
-				{i18n}&copy; 2007 <a href="http://www.knowledgetree.com/">The Jam Warehouse Software (Pty) Ltd.</a> All Rights Reserved{/i18n}
+				{i18n arg_appname="$appname"}#appname# Version{/i18n} {$versionName}<br/>
+				{i18n}<a href="http://www.knowledgetree.com/">Document Management Software</a>{/i18n}<br>
+				{i18n}&copy; 2007 <a href="http://www.knowledgetree.com/">The Jam Warehouse Software (Pty) Ltd.</a>{/i18n}<br><br>
+				{if ($smallVersion == 'OSS')}
+					{i18n}This program is free software and published under the <a href=" http://www.gnu.org/licenses/">GNU General Public License version 3</a>{/i18n}<br>
+				{else}
+					{i18n}All rights reserved.{/i18n}<br>
+				{/if} 
 			</p>
+			
+			
 	        <div id="bottomspacer"></div>
 	        <div class="floatClear"></div>
 	    </div>
 <h2>{i18n arg_appname="$appname" arg_versionname="$versionname"}#appname# #versionname#{/i18n}</h2>
 <p><strong>{i18n arg_version="$versionnumber"}Version #version#{/i18n}</strong></p>
 <img src="{$rootUrl}/resources/graphics/ktlogo-topbar-right.png" border="0" />
-<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 />
+<p>{i18n}Copyright &copy; 2004-2007 <a href=" http://www.knowledgetree.com/">The Jam Warehouse Software (Pty) Limited</a> <a href="http://www.knowledgetree.com/About/legal/license">View License Agreement</a>{/i18n}<br />
+{if ($smallVersion == 'OSS')}
+	{i18n}This program is free software and published under the <a href=" http://www.gnu.org/licenses/">GNU General Public License version 3</a>{/i18n}<br>
+{else}
+	{i18n}All rights reserved.{/i18n}<br>
+{/if}
 KnowledgeTree&trade; is a <a href="http://www.knowledgetree.com/About/legal/trademark_usage_grant">trademark</a> of The Jam Warehouse Software (Pty) Ltd.
 </p>
 <p>