Peter M. Groen / knowledgetree

Commit f32f07249c9879016611389f2cc1752301f25bf5

Authored by kevin_fourie
1 parent 25c5be29

Merged in from DEV trunk... 

KTC-395
"Unable to compare content versions for a txt doc or an Open Office document"
Fixed. Changed the way it checks if open office is running.

Committed By: Megan Watson
Reviewed By: Conrad Vermeulen

KTS-3104
"Dashboard Info Dashlets displaying white blocks when rolled up."

Fixed. Added new pngs to be used when an info dashlet is rolled up and changed css accordingly.

Committed By: Jonathan Byrne
Reviewed By: Jalaloedien Abrahams

KTS-2885
"Positioning of where the notification icon appears on dashlets is incorrect. Currently vertically aligned middle and should be text-top."

Fixed. Changed the positioning of the error and info dashlet notifictation icons to top.

Committed By: Jonathan Byrne
Reviewed By: Jalaloedien Abrahams

KTS-3106
"On the log-in/logout dialog and the footer of the KTDMS web browser interface there is no version description added to the version."
Fixed. If the wintools plugin is not enabled, Community Edition is appended to the version name.

Committed by: Megan Watson
Reviewed by: Jonathan Byrne

KTS-2695
"The character Ñ is replaced by ? when used in a document filename in the DMS"

Fixed. Changed smarty wordwrap to make a new line on the end of a word to stop question marks from displaying.

Committed By: Jonathan Byrne
Reviewed By: Conrad Vermeulen


git-svn-id: https://kt-dms.svn.sourceforge.net/svnroot/kt-dms/STABLE/trunk@8194 c91229c3-7414-0410-bfa2-8a42b809f60b
Inline Side-by-side
Showing 5 changed files with 14 additions and 3 deletions
config/dmsDefaults.php
  View file @f32f072
... ... @@ -719,6 +719,8 @@ if ($checkup !== true) {
719 719 if ($name) {
720 720 $default->versionName = sprintf('%s %s', $default->versionName, $name);
721 721 }
  722 + }else{
  723 + $default->versionName = $default->versionName.' '._kt('(Community Edition)');
722 724 }
723 725 }
724 726  
... ...
resources/css/kt-framing.css
  View file @f32f072
... ... @@ -1028,7 +1028,7 @@ a.main_nav_item {
1028 1028  
1029 1029 .ktError p {
1030 1030 padding-left: 25px;
1031   - background: #ffdd80 url(../../thirdparty/icon-theme/16x16/status/dialog-warning.png) center left no-repeat;
  1031 + background: #ffdd80 url(../../thirdparty/icon-theme/16x16/status/dialog-warning.png) top left no-repeat;
1032 1032 margin-top: 20px;
1033 1033 }
1034 1034  
... ... @@ -1040,7 +1040,7 @@ a.main_nav_item {
1040 1040  
1041 1041 .ktInfo p {
1042 1042 padding-left: 25px;
1043   - background: #DEDEDE url(../../thirdparty/icon-theme/16x16/status/dialog-information.png) center left no-repeat;
  1043 + background: #DEDEDE url(../../thirdparty/icon-theme/16x16/status/dialog-information.png) top left no-repeat;
1044 1044 margin-top: 20px;
1045 1045 }
1046 1046  
... ... @@ -1738,6 +1738,15 @@ The text will be hidden for screen view. The generic fahrner-ish approach comes
1738 1738 display: none;
1739 1739 }
1740 1740  
  1741 +.dashboard_block.rolled-up .info_dashlet_bottomleft
  1742 +{
  1743 + background: url(../graphics/info_bottomleft_rolledup.png) bottom left no-repeat;
  1744 +}
  1745 +
  1746 +.dashboard_block.rolled-up .info_dashlet_bottomright
  1747 +{
  1748 + background: url(../graphics/info_bottomright_rolledup.png) bottom right no-repeat;
  1749 +}
1741 1750  
1742 1751 #copyrightbarBorder {
1743 1752 margin-top: 40px;
... ...
resources/graphics/info_bottomleft_rolledup.png 0 → 100644
View file @f32f072

273 Bytes
resources/graphics/info_bottomright_rolledup.png 0 → 100644
View file @f32f072

359 Bytes
templates/kt3/fieldsets/generic.smarty
  View file @f32f072
... ... @@ -8,7 +8,7 @@
8 8 <table class="metadatatable" cellspacing="0" cellpadding="5">
9 9 <tr class="even first">
10 10 <th>{i18n}Document Filename{/i18n}</th>
11   - <td>{$filename|wordwrap:40:"\n":true|sanitize} ({$context->_sizeHelper($document->getSize())})</td>
  11 + <td>{$filename|wordwrap:40:"\n":false|sanitize} ({$context->_sizeHelper($document->getSize())})</td>
12 12 </tr>
13 13  
14 14 <tr class="odd">
... ...