Peter M. Groen / knowledgetree

Commit 9d39f22dcc13676ebfce5e3aa42f1efe73ce9378

Authored by Jonathan Byrne
1 parent 9523ef6f

KTC-458 

"Update On-premise Application Login, Footer, About and Community Licensing"
Fixed. Added Changes to displays.

Committed By: Jonathan Byrne
Reviewed By: Kevin Fourie

git-svn-id: https://kt-dms.svn.sourceforge.net/svnroot/kt-dms/trunk@8385 c91229c3-7414-0410-bfa2-8a42b809f60b
Inline Side-by-side
Showing 7 changed files with 86 additions and 56 deletions
about.php
  View file @9d39f22
@@ -68,7 +68,7 @@ class KTAbout extends KTStandardDispatcher { @@ -68,7 +68,7 @@ class KTAbout extends KTStandardDispatcher {
68 "context" => $this, 68 "context" => $this,
69 "versionname" => $sVersionName, 69 "versionname" => $sVersionName,
70 "versionnumber" => $sVersionNo, 70 "versionnumber" => $sVersionNo,
71 - 'smallVersion' => substr($default->versionName, 0, 3), 71 + 'smallVersion' => substr($default->versionName, -17),
72 ); 72 );
73 return $oTemplate->render($aTemplateData); 73 return $oTemplate->render($aTemplateData);
74 } 74 }
lib/templating/kt3template.inc.php
  View file @9d39f22
@@ -419,7 +419,7 @@ class KTPage { @@ -419,7 +419,7 @@ class KTPage {
419 "page" => $this, 419 "page" => $this,
420 "systemversion" => $default->systemVersion, 420 "systemversion" => $default->systemVersion,
421 "versionname" => $default->versionName, 421 "versionname" => $default->versionName,
422 - 'smallVersion' => substr($default->versionName, 0, 3), 422 + 'smallVersion' => substr($default->versionName, -17),
423 'savedSearches'=> $savedSearches); 423 'savedSearches'=> $savedSearches);
424 if ($oConfig->get("ui/automaticRefresh", false)) { 424 if ($oConfig->get("ui/automaticRefresh", false)) {
425 $aTemplateData['refreshTimeout'] = (int)$oConfig->get("session/sessionTimeout") + 3; 425 $aTemplateData['refreshTimeout'] = (int)$oConfig->get("session/sessionTimeout") + 3;
login.php
  View file @9d39f22
@@ -200,7 +200,7 @@ class LoginPageDispatcher extends KTDispatcher { @@ -200,7 +200,7 @@ class LoginPageDispatcher extends KTDispatcher {
200 'languages' => $aRegisteredLanguageNames, 200 'languages' => $aRegisteredLanguageNames,
201 'selected_language' => $sLanguageSelect, 201 'selected_language' => $sLanguageSelect,
202 'disclaimer' => $sDisclaimer, 202 'disclaimer' => $sDisclaimer,
203 - 'smallVersion' => substr($default->versionName, 0, 3), 203 + 'smallVersion' => substr($default->versionName,-17),
204 ); 204 );
205 return $oTemplate->render($aTemplateData); 205 return $oTemplate->render($aTemplateData);
206 } 206 }
resources/css/kt-login.css
  View file @9d39f22
@@ -148,3 +148,8 @@ @@ -148,3 +148,8 @@
148 margin: 0; border: 0; padding: 0; 148 margin: 0; border: 0; padding: 0;
149 width: 1px; 149 width: 1px;
150 } 150 }
  151 +
  152 +.communityLabel
  153 +{
  154 + color: #919192;
  155 +}
templates/kt3/standard_page.smarty
  View file @9d39f22
@@ -314,24 +314,59 @@ @@ -314,24 +314,59 @@
314 </div> 314 </div>
315 </div> 315 </div>
316 <div id="copyrightbarBorder"> 316 <div id="copyrightbarBorder">
317 - <table width="98%" align="center"> 317 + <table width="98%">
318 <tr> 318 <tr>
319 - <td align="left">  
320 - <span>{i18n}&copy; 2004-2008 <a href="http://www.knowledgetree.com/">The Jam Warehouse Software (Pty) Limited</a>{/i18n}</span><br>  
321 - {if ($smallVersion == 'OSS')}  
322 - {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>  
323 - {else}  
324 - {i18n}All rights reserved.{/i18n}<br>  
325 - {/if}  
326 - <p>{$page->getDisclaimer()}</p>  
327 - </td>  
328 - <td align="right">  
329 - <span>{i18n arg_timing=$page->getReqTime()}Request created in #timing#s{/i18n}</span><br />  
330 - <span>{i18n arg_version="$versionname" arg_appname="$appname"}#appname# Version: #version#{/i18n}</span><br/>  
331 - <a href="{$rootUrl}"><img src="{$rootUrl}/resources/powered-by-kt.png" border="0" alt="Powered by KnowledgeTree" title="Powered by KnowledgeTree"/></a>  
332 - </td> 319 + {if ($smallVersion == 'Community Edition')}
  320 + <td width="60%">
  321 + {else}
  322 + <td width="40%">
  323 + {/if}
  324 + <table >
  325 + <tr>
  326 + <td valign="top">
  327 + <a href="{$rootUrl}"><img src="{$rootUrl}/resources/powered-by-kt.png" border="0" alt="Powered by KnowledgeTree" title="Powered by KnowledgeTree"/></a>
  328 + </td>
  329 + <td valign="top">
  330 + {i18n arg_version="$versionname" arg_appname="$appname"}#appname# Version: #version#{/i18n}
  331 + {if ($smallVersion == 'Community Edition')}
  332 + {i18n}is licensed free of charge and supplied with
  333 + <a href="http://www.knowledgetree.com/commercial_support" target="_blank">no support</a>
  334 + , <a href="http://www.knowledgetree.com/commercial_support" target="_blank">no maintenance</a>
  335 + , and <a href="http://www.knowledgetree.com/commercial_support" target="_blank">no warranty</a>.
  336 + {/i18n}
  337 + {else}
  338 + <br>
  339 + {i18n arg_timing=$page->getReqTime()}Request created in #timing#s{/i18n}
  340 + {/if}
  341 + </td>
  342 + </tr>
  343 + </table>
  344 + </td>
  345 + <td width="1">
  346 + </td>
  347 + <td width="35%" valign="top" align="right">
  348 + <table >
  349 + <tr>
  350 + <td valign="top">
  351 + {i18n}&copy; 2008 <a href="http://www.knowledgetree.com/about/legal" target="_blank">KnowledgeTree Inc.</a>{/i18n}
  352 + {i18n}All rights reserved.{/i18n}
  353 + {if ($smallVersion == 'Community Edition')}
  354 + {i18n arg_timing=$page->getReqTime()}Request created in #timing#s{/i18n}
  355 + {/if}
  356 + </td>
  357 + <!--
  358 + {if ($smallVersion == 'Community Edition')}
  359 + <td valign="top">
  360 + <a href="http://sourceforge.net/projects/kt-dms"><img src="http://sflogo.sourceforge.net/sflogo.php?group_id=107851&amp;type=4" border="0" alt="SourceForge.net logo"/></a>
  361 + </td>
  362 + {/if}
  363 + -->
  364 + </tr>
  365 + </table>
  366 + </td>
333 </tr> 367 </tr>
334 - </table> 368 + </table>
  369 +
335 <div class="floatClear"></div> 370 <div class="floatClear"></div>
336 </div> 371 </div>
337 </div> 372 </div>
templates/ktcore/login.smarty
  View file @9d39f22
@@ -27,6 +27,9 @@ @@ -27,6 +27,9 @@
27 {else} 27 {else}
28 <img src="{$rootUrl}/resources/graphics/ktlogo-topbar-right.png" alt="{$appname}" class="logoimage" height="50" width="252"/><br /> 28 <img src="{$rootUrl}/resources/graphics/ktlogo-topbar-right.png" alt="{$appname}" class="logoimage" height="50" width="252"/><br />
29 {/if} 29 {/if}
  30 + {if $smallVersion == 'Community Edition'}
  31 + <span class="communityLabel"><h2>{i18n}Community Edition{i18n}</h2></span>
  32 + {/if}
30 {if ($errorMessage == null)} 33 {if ($errorMessage == null)}
31 <p class="descriptiveText">{i18n}Please enter your details below to login.{/i18n}</p> 34 <p class="descriptiveText">{i18n}Please enter your details below to login.{/i18n}</p>
32 {else} 35 {else}
@@ -60,10 +63,11 @@ @@ -60,10 +63,11 @@
60 </div> 63 </div>
61 {/if} 64 {/if}
62 <p class="descriptiveText version"> 65 <p class="descriptiveText version">
  66 + <br>
63 {i18n arg_appname="$appname"}#appname# Version{/i18n} {$versionName}<br/> 67 {i18n arg_appname="$appname"}#appname# Version{/i18n} {$versionName}<br/>
64 {i18n}<a href="http://www.knowledgetree.com/">Document Management Software</a>{/i18n}<br> 68 {i18n}<a href="http://www.knowledgetree.com/">Document Management Software</a>{/i18n}<br>
65 - {i18n}&copy; 2004-2008 <a href="http://www.knowledgetree.com/">The Jam Warehouse Software (Pty) Limited</a>{/i18n}<br><br>  
66 - {if ($smallVersion == 'OSS')} 69 + {i18n}&copy; 2008 <a href="http://www.knowledgetree.com/">KnowledgeTree Inc.</a>{/i18n}<br><br>
  70 + {if ($smallVersion == 'Community Edition')}
67 {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> 71 {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>
68 {else} 72 {else}
69 {i18n}All rights reserved.{/i18n}<br> 73 {i18n}All rights reserved.{/i18n}<br>
templates/ktcore/principals/about.smarty
  View file @9d39f22
1 <h2>{i18n arg_appname="$appname" arg_versionname="$versionname"}#appname# #versionname#{/i18n}</h2> 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> 2 <p><strong>{i18n arg_version="$versionnumber"}Version #version#{/i18n}</strong></p>
3 <img src="{$rootUrl}/resources/graphics/ktlogo-topbar-right.png" border="0" /> 3 <img src="{$rootUrl}/resources/graphics/ktlogo-topbar-right.png" border="0" />
4 -<p>{i18n}&copy; 2004-2008 <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} 4 +<p>{i18n}&copy; 2008 <a href=" http://www.knowledgetree.com/">KnowledgeTree Inc.</a>{/i18n} &nbsp &nbsp &nbsp <a href="http://www.knowledgetree.com">http://www.knowledgetree.com</a><br />
  5 +{if ($smallVersion !== 'Community Edition')}
8 {i18n}All rights reserved.{/i18n}<br> 6 {i18n}All rights reserved.{/i18n}<br>
9 {/if} 7 {/if}
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.  
11 -</p>  
12 -<p>  
13 -<strong>KnowledgeTree is a business unit of The Jam Warehouse Software (Pty) Ltd.</strong><br />  
14 -<a href="http://www.knowledgetree.com">http://www.knowledgetree.com</a><br />  
15 -</p>  
16 -<p>  
17 -<strong>KnowledgeTree Sales</strong><br />  
18 -To purchase support and extended features for KnowledgeTree or to license KnowledgeTree for use in your own application, please contact our sales team:  
19 -</p>  
20 -<p>  
21 -Email Sales: <a href="mailto:sales@knowledgetree.com">sales@knowledgetree.com</a><br />  
22 -Call Sales: +1 415 670-9759 8 +
  9 +{i18n}Portions copyright The Jam Warehouse Software (Pty) Limited.{/i18n}
  10 +<br>
  11 +{if ($smallVersion == 'Community Edition')}
  12 + {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><br>
  13 + {i18n}KnowledgeTree Community Edition is supplied with <a href="http://www.knowledgetree.com/commercial_support" target="_blank">no support</a>,
  14 + <a href="http://www.knowledgetree.com/commercial_support" target="_blank">no maintenance</a>,
  15 + and <a href="http://www.knowledgetree.com/commercial_support" target="_blank">no warranty</a>.{/i18n}<br>
  16 + {i18n}Please contact the <a href="mailto:sales@knowledgetree.com">KnowledgeTree Sales team</a> should you wish to learn more about commercially supported editions of KnowledgeTree.{/i18n}<br>
  17 +{else}
  18 + <br>
  19 + {i18n}This is a professionally supported edition of KnowledgeTree.{/i18n} <br>
  20 + {i18n}Please refer to the documentation provided to you at subscription to learn more about how to access KnowledgeTree's professional support team.{/i18n}<br>
  21 +
  22 +{/if}
23 </p> 23 </p>
  24 +<br>
24 <p><strong>Join the KnowledgeTree Community</strong> 25 <p><strong>Join the KnowledgeTree Community</strong>
25 <ul> 26 <ul>
26 <li><a href="http://forge.knowledgetree.com/">KTForge</a>: Collaborate and develop KnowledgeTree extensions</li> 27 <li><a href="http://forge.knowledgetree.com/">KTForge</a>: Collaborate and develop KnowledgeTree extensions</li>
@@ -152,21 +153,6 @@ Call Sales: +1 415 670-9759 @@ -152,21 +153,6 @@ Call Sales: +1 415 670-9759
152 153
153 <p><small>[If you feel you should be here too, please let us know at <a href="mailto:contributions@knowledgetree.com">contributions@knowledgetree.com</a>]</small></p> 154 <p><small>[If you feel you should be here too, please let us know at <a href="mailto:contributions@knowledgetree.com">contributions@knowledgetree.com</a>]</small></p>
154 155
155 -<p><strong>Third Party Software</strong></p>  
156 -<table border="0" cellpadding="10">  
157 - <tr align="center">  
158 - <td><a href="http://pear.php.net/"><div style="background-color:#339900; width:104px;"><img src="{$rootUrl}/resources/graphics/thirdparty/pear.gif" border="0"/></div></a></td>  
159 - <td><a href="http://phpmailer.sourceforge.net/"><img src="{$rootUrl}/resources/graphics/thirdparty/phpmailer.gif" border="0"/></a></td>  
160 - <td><a href="http://smarty.php.net/"><img src="{$rootUrl}/resources/graphics/thirdparty/smarty.gif" border="0"/></a></td>  
161 - </tr>  
162 - <tr align="center">  
163 - <td><a href="http://sourceforge.net/projects/jscalendar">JSCalendar</a></td>  
164 - <td><a href="http://mochikit.com/"><img src="{$rootUrl}/resources/graphics/thirdparty/mochikit.gif" border="0"/></a></td>  
165 - <td><a href="http://tinymce.moxiecode.com/"><img src="{$rootUrl}/resources/graphics/thirdparty/tinymce.gif" border="0"/></a></td>  
166 - </tr>  
167 - <tr align="center">  
168 - <td><a href="http://developer.yahoo.com/yui/"><img src="{$rootUrl}/resources/graphics/thirdparty/yui.gif" border="0"/></a></td>  
169 - <td></td>  
170 - <td></td>  
171 - </tr>  
172 -</table> 156 +
  157 +<p>This software utilizes third-party software from <a set="yes" linkindex="11" href="http://pear.php.net/">Pear</a>, <a set="yes" linkindex="12" href="http://phpmailer.sourceforge.net/">PHPMailer</a>, <a set="yes" linkindex="13" href="http://smarty.php.net/">Smarty Template Engine</a>, <a set="yes" linkindex="14" href="http://sourceforge.net/projects/jscalendar">JSCalendar</a>, <a set="yes" linkindex="15" href="http://mochikit.com/">Mochikit</a>, <a set="yes" linkindex="16" href="http://tinymce.moxiecode.com/">Moxiecode Systems</a>, <a set="yes" linkindex="17" href="http://developer.yahoo.com/yui/">Yahoo Developer Network</a>.</p>
  158 +