Peter M. Groen / knowledgetree

Commit bac123054b61223916bf22f9ec1bb062796a591b

Authored by kevin_fourie
1 parent dbc46967

Merged in from DEV trunk... 

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

KTS-2558
"Update OSS to GPLv3"
Updated. More header updates.

Committed By: Kevin Fourie
Reviewed By: Conrad Vermeulen

KTS-2450
"Add "Candy Stripe" to indicate activity to all pages that keep the user waiting."
Fixed.

Committed By: Yusuf Davids
Reviewed By: Jalaloedien Abrahams

git-svn-id: https://kt-dms.svn.sourceforge.net/svnroot/kt-dms/STABLE/trunk@7484 c91229c3-7414-0410-bfa2-8a42b809f60b
Inline Side-by-side
Showing 12 changed files with 96 additions and 19 deletions
about.php
  View file @bac1230
... ... @@ -68,6 +68,7 @@ class KTAbout extends KTStandardDispatcher {
68 68 "context" => $this,
69 69 "versionname" => $sVersionName,
70 70 "versionnumber" => $sVersionNo,
  71 + 'smallVersion' => substr($default->versionName, 0, 3),
71 72 );
72 73 return $oTemplate->render($aTemplateData);
73 74 }
... ...
config/config.ini
  View file @bac1230
... ... @@ -103,8 +103,6 @@ companyLogoTitle = ACME Corporation
103 103 ;mainLogoWidth = 219px
104 104 ; ALT text - for accessibility purposes.
105 105 ;mainLogoTitle = ACME Knowledge Management Systems
106   -; enable/disable powered by kt logo
107   -;poweredByDisabled = 0
108 106 ; powered by kt logo
109 107 ;powerLogo = ${rootUrl}/resources/powered-by-kt.gif
110 108 ; the logo's width in pixels
... ...
i18n/knowledgeTree.pot
  View file @bac1230
... ... @@ -130,9 +130,27 @@ msgid "%s is not an archived document. Aborting restore."
130 130 msgstr ""
131 131  
132 132 #: i18n/templates.c:1427 i18n/templates.c:5345
133   -msgid "&copy; 2007 <a href=\"http://www.knowledgetree.com/\">The Jam Warehouse Software (Pty) Ltd.</a> All Rights Reserved"
  133 +msgid "<a href="http://www.knowledgetree.com/">Document Management Software</a>"
134 134 msgstr ""
135 135  
  136 +#: i18n/templates.c:1427 i18n/templates.c:5348
  137 +msgid "&copy; 2007 <a href="http://www.knowledgetree.com/">The Jam Warehouse Software (Pty) Ltd.</a>"
  138 +msgstr ""
  139 +
  140 +#: i18n/templates.c:5351 i18n/templates.c:5762
  141 +msgid "This program is free software and published under the <a href=" http://www.gnu.org/licenses/">GNU General Public License version 3</a>"
  142 +msgstr ""
  143 +
  144 +#: i18n/templates.c:5354 i18n/templates.c:5765
  145 +msgid "All rights reserved."
  146 +msgstr ""
  147 +
  148 +
  149 +#: i18n/templates.c:5759
  150 +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>"
  151 +msgstr ""
  152 +
  153 +
136 154 #: plugins/ktcore/folder/BulkImport.php:63
137 155 #: plugins/ktcore/folder/BulkUpload.php:70
138 156 #: plugins/ktcore/folder/addDocument.php:105
... ...
i18n/templates.c
  View file @bac1230
... ... @@ -5342,7 +5342,16 @@ gettext(&quot;login&quot;);
5342 5342 gettext("#appname# Version");
5343 5343  
5344 5344 /* ./templates/ktcore/login.smarty */
5345   -gettext("&copy; 2007 <a href=\"http://www.knowledgetree.com/\">The Jam Warehouse Software (Pty) Ltd.</a> All Rights Reserved");
  5345 +gettext("<a href="http://www.knowledgetree.com/">Document Management Software</a>");
  5346 +
  5347 +/* ./templates/ktcore/login.smarty */
  5348 +gettext("&copy; 2007 <a href="http://www.knowledgetree.com/">The Jam Warehouse Software (Pty) Ltd.</a>");
  5349 +
  5350 +/* ./templates/ktcore/login.smarty */
  5351 +gettext("This program is free software and published under the <a href=" http://www.gnu.org/licenses/">GNU General Public License version 3</a>");
  5352 +
  5353 +/* ./templates/ktcore/login.smarty */
  5354 +gettext("All rights reserved.");
5346 5355  
5347 5356 /* ./templates/ktcore/manage_permissions.smarty */
5348 5357 gettext("Existing permissions");
... ... @@ -5745,3 +5754,12 @@ gettext(&quot;#appname# RSS&quot;);
5745 5754  
5746 5755 /* ./templates/ktcore/principles/about.smarty */
5747 5756 gettext("#appname# #versionname#");
  5757 +
  5758 +/* ./templates/ktcore/principles/about.smarty */
  5759 +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>");
  5760 +
  5761 +/* ./templates/ktcore/principles/about.smarty */
  5762 +gettext("This program is free software and published under the <a href=" http://www.gnu.org/licenses/">GNU General Public License version 3</a>");
  5763 +
  5764 +/* ./templates/ktcore/principles/about.smarty */
  5765 +gettext("All rights reserved.");
5748 5766 \ No newline at end of file
... ...
lib/templating/kt3template.inc.php
  View file @bac1230
... ... @@ -126,7 +126,6 @@ class KTPage {
126 126 $aJS[] = 'thirdpartyjs/MochiKit/DragAndDrop.js';
127 127 $aJS[] = 'thirdpartyjs/MochiKit/Sortable.js';
128 128 $aJS[] = 'thirdpartyjs/MochiKit/Style.js';
129   - $aJS[] = 'thirdpartyjs/MochiKit/Signal.js';
130 129 */
131 130 $aJS[] = 'thirdpartyjs/MochiKit/MochiKitPacked.js';
132 131 $aJS[] = 'resources/js/kt-utility.js';
... ... @@ -138,11 +137,6 @@ class KTPage {
138 137  
139 138  
140 139  
141   - //$aJS[] = 'thirdpartyjs/MochiKit/Iter.js';
142   - //$aJS[] = 'thirdpartyjs/MochiKit/DOM.js';
143   - //$aJS[] = 'thirdpartyjs/MochiKit/Logging.js';
144   - //$aJS[] = 'thirdpartyjs/MochiKit/Async.js';
145   - //$aJS[] = 'thirdpartyjs/MochiKit/Signal.js';
146 140 //$aJS[] = 'thirdpartyjs/MochiKit/.js';
147 141 //$aJS[] = 'resources/js/translate.js';
148 142  
... ... @@ -402,6 +396,7 @@ class KTPage {
402 396 "page" => $this,
403 397 "systemversion" => $default->systemVersion,
404 398 "versionname" => $default->versionName,
  399 + 'smallVersion' => substr($default->versionName, 0, 3),
405 400 'savedSearches'=> $savedSearches);
406 401 if ($oConfig->get("ui/automaticRefresh", false)) {
407 402 $aTemplateData['refreshTimeout'] = (int)$oConfig->get("session/sessionTimeout") + 3;
... ...
login.php
  View file @bac1230
... ... @@ -173,7 +173,8 @@ class LoginPageDispatcher extends KTDispatcher {
173 173 'versionName' => $default->versionName,
174 174 'languages' => $aRegisteredLanguageNames,
175 175 'selected_language' => $sLanguageSelect,
176   - 'disclaimer' => $sDisclaimer,
  176 + 'disclaimer' => $sDisclaimer,
  177 + 'smallVersion' => substr($default->versionName, 0, 3),
177 178 );
178 179 return $oTemplate->render($aTemplateData);
179 180 }
... ...
resources/css/kt-framing.css
  View file @bac1230
... ... @@ -2053,4 +2053,18 @@ body #content #add_dashlet
2053 2053 font-weight: normal;
2054 2054 float: right;
2055 2055 margin-right: 3em;
  2056 +}
  2057 +
  2058 +.modalDiv{
  2059 + filter:alpha(opacity=80);
  2060 + -moz-opacity:0.8;
  2061 + padding-left: 30px;
  2062 + padding-top: 5px;
  2063 + width: 260px;
  2064 + height: 50px;
  2065 + background-color: #CCCCCC;
  2066 + position: absolute;
  2067 + top: 400px;
  2068 + left: 500px;
  2069 + display: block;
2056 2070 }
2057 2071 \ No newline at end of file
... ...
resources/graphics/thirdparty/loader.gif 0 → 100644
View file @bac1230

10.6 KB
resources/js/loader.js
  View file @bac1230
... ... @@ -26,4 +26,15 @@ window.onload = function()
26 26 var footerBlock = new curvyCorners(settings, footer);
27 27 footerBlock.applyCornersToAll();
28 28 }
29   - }
30 29 \ No newline at end of file
  30 + Loader();
  31 + }
  32 +
  33 + window.onsubmit = function(){
  34 + var myElem = document.getElementById("modalDiv");
  35 + myElem.style.display = "block";
  36 + }
  37 + function Loader()
  38 +{
  39 + var myElem = document.getElementById("modalDiv");
  40 + myElem.style.display = "none";
  41 +}
31 42 \ No newline at end of file
... ...
templates/kt3/standard_page.smarty
  View file @bac1230
... ... @@ -312,6 +312,11 @@
312 312 {/if}
313 313 {/foreach}
314 314 </div>
  315 + <div class="modalDiv" id="modalDiv">
  316 + <img src="{$rootUrl}/resources/graphics/thirdparty/loader.gif" border="0"/><br>
  317 + <div style="width: 60px; padding-left: 80px;"> Loading... </div>
  318 +
  319 + </div>
315 320 </td>
316 321 <td valign="top" width="100%">
317 322 <div id="content" {if $page->content_class}class="{$page->content_class}"{/if}>
... ... @@ -368,15 +373,18 @@
368 373 <table width="98%" align="center">
369 374 <tr>
370 375 <td align="left">
371   - <span>{i18n}&copy; 2007 <a href="http://www.knowledgetree.com/">The Jam Warehouse Software (Pty) Ltd.</a> All Rights Reserved{/i18n}</span>
  376 + <span>{i18n}&copy; 2004-2007 <a href="http://www.knowledgetree.com/">The Jam Warehouse Software (Pty) Limited</a>{/i18n}</span><br>
  377 + {if ($smallVersion == 'OSS')}
  378 + {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>
  379 + {else}
  380 + {i18n}All rights reserved.{/i18n}<br>
  381 + {/if}
372 382 <p>{$page->getDisclaimer()}</p>
373 383 </td>
374 384 <td align="right">
375 385 <span>{i18n arg_timing=$page->getReqTime()}Request created in #timing#s{/i18n}</span><br />
376 386 <span>{i18n arg_version="$versionname" arg_appname="$appname"}#appname# Version: #version#{/i18n}</span><br/>
377   - {if $config->get("ui/poweredByDisabled") == '0'}
378   - <a href="{$rootUrl}"><img src="{$config->get("ui/powerLogo")}" border="0" alt="{$config->get("ui/powerLogoTitle")}" title="{$config->get("ui/powerLogoTitle")}"/></a>
379   - {/if}
  387 + <a href="{$rootUrl}"><img src="{$rootUrl}/resources/powered-by-kt.gif" border="0" alt="Powered by KnowledgeTree" title="Powered by KnowledgeTree"/></a>
380 388 </td>
381 389 </tr>
382 390 </table>
... ...
templates/ktcore/login.smarty
  View file @bac1230
... ... @@ -54,9 +54,17 @@
54 54 </div>
55 55 {/if}
56 56 <p class="descriptiveText version">
57   - {i18n arg_appname="$appname"}#appname# Version{/i18n}<br />{$versionName}<br/>
58   - {i18n}&copy; 2007 <a href="http://www.knowledgetree.com/">The Jam Warehouse Software (Pty) Ltd.</a> All Rights Reserved{/i18n}
  57 + {i18n arg_appname="$appname"}#appname# Version{/i18n} {$versionName}<br/>
  58 + {i18n}<a href="http://www.knowledgetree.com/">Document Management Software</a>{/i18n}<br>
  59 + {i18n}&copy; 2007 <a href="http://www.knowledgetree.com/">The Jam Warehouse Software (Pty) Ltd.</a>{/i18n}<br><br>
  60 + {if ($smallVersion == 'OSS')}
  61 + {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>
  62 + {else}
  63 + {i18n}All rights reserved.{/i18n}<br>
  64 + {/if}
59 65 </p>
  66 +
  67 +
60 68 <div id="bottomspacer"></div>
61 69 <div class="floatClear"></div>
62 70 </div>
... ...
templates/ktcore/principals/about.smarty
  View file @bac1230
1 1 <h2>{i18n arg_appname="$appname" arg_versionname="$versionname"}#appname# #versionname#{/i18n}</h2>
2 2 <p><strong>{i18n arg_version="$versionnumber"}Version #version#{/i18n}</strong></p>
3 3 <img src="{$rootUrl}/resources/graphics/ktlogo-topbar-right.png" border="0" />
4   -<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 +<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 />
  5 +{if ($smallVersion == 'OSS')}
  6 + {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>
  7 +{else}
  8 + {i18n}All rights reserved.{/i18n}<br>
  9 +{/if}
5 10 KnowledgeTree&trade; is a <a href="http://www.knowledgetree.com/About/legal/trademark_usage_grant">trademark</a> of The Jam Warehouse Software (Pty) Ltd.
6 11 </p>
7 12 <p>
... ...