Commit dcaca6e8b3d64355577061743fc6a42ec958ac8c

Authored by kevin_fourie
1 parent 4b68c25e

Merged in from DEV trunk...

KTC-96
"UI defects. "
Fixed.

Reviewed By: Kevin

KTC-1920
"Update the About page. "
Fixed.

Reviewed By: Kevin

git-svn-id: https://kt-dms.svn.sourceforge.net/svnroot/kt-dms/STABLE/trunk@6739 c91229c3-7414-0410-bfa2-8a42b809f60b
plugins/tagcloud/TagCloudPlugin.php
@@ -223,11 +223,17 @@ class KTAddDocumentTrigger { @@ -223,11 +223,17 @@ class KTAddDocumentTrigger {
223 $tagString = ''; 223 $tagString = '';
224 // add tags 224 // add tags
225 if ($sTags) { 225 if ($sTags) {
226 - foreach($aMeta['metadata'] as $aMetaData){ 226 + if (count($aMeta['metadata']) > 0)
  227 + {
  228 + foreach($aMeta['metadata'] as $aMetaData)
  229 + {
  230 +
227 $oProxy = $aMetaData[0]; 231 $oProxy = $aMetaData[0];
228 - if($oProxy->iId == $sTags){ 232 + if($oProxy->iId == $sTags)
  233 + {
229 $tagString = $aMetaData[1]; 234 $tagString = $aMetaData[1];
230 } 235 }
  236 + }
231 } 237 }
232 if($tagString != ''){ 238 if($tagString != ''){
233 $words_table = KTUtil::getTableName('tag_words'); 239 $words_table = KTUtil::getTableName('tag_words');
@@ -333,12 +339,18 @@ class KTEditDocumentTrigger { @@ -333,12 +339,18 @@ class KTEditDocumentTrigger {
333 } 339 }
334 $tagString = ''; 340 $tagString = '';
335 if ($sTags) { 341 if ($sTags) {
336 - foreach($aMeta as $aMetaData){  
337 - $oProxy = $aMetaData[0];  
338 - if($oProxy->iId == $sTags){  
339 - $tagString = $aMetaData[1];  
340 - break;  
341 - } 342 + // it is actually correct using $aMeta. It is different to the add trigger above...
  343 + if (count($aMeta) > 0)
  344 + {
  345 + foreach($aMeta as $aMetaData)
  346 + {
  347 + $oProxy = $aMetaData[0];
  348 + if($oProxy->iId == $sTags)
  349 + {
  350 + $tagString = $aMetaData[1];
  351 + break;
  352 + }
  353 + }
342 } 354 }
343 if($tagString != ''){ 355 if($tagString != ''){
344 $words_table = KTUtil::getTableName('tag_words'); 356 $words_table = KTUtil::getTableName('tag_words');
resources/css/kt-framing.css
@@ -339,6 +339,8 @@ a.main_nav_item { @@ -339,6 +339,8 @@ a.main_nav_item {
339 z-index: 1; 339 z-index: 1;
340 width:auto; 340 width:auto;
341 padding: 0 2em 1em 0; 341 padding: 0 2em 1em 0;
  342 + overflow: auto;
  343 + min-height: 600px;
342 } 344 }
343 345
344 #content.view.withviewlets { 346 #content.view.withviewlets {
resources/css/kt-ie-icons.css
@@ -5,6 +5,33 @@ @@ -5,6 +5,33 @@
5 margin: 20px auto; 5 margin: 20px auto;
6 } 6 }
7 7
  8 +/* block level. */
  9 +.ktError {
  10 + background: #ffdd80 url(../../resources/graphics/error_toprepeat.gif) top left repeat-x;
  11 + border: 1px solid #FFC21E;
  12 + margin: 20px auto;
  13 +}
  14 +
  15 +.ktError p {
  16 + margin-left: 20px;
  17 + padding-left: 25px;
  18 + background: transparent url(../../thirdparty/icon-theme/16x16/status/dialog-warning.gif) center left no-repeat;
  19 +}
  20 +
  21 +.ktError span {
  22 + margin-left: 20px;
  23 + padding-left: 25px;
  24 + background: transparent url(../../thirdparty/icon-theme/16x16/status/dialog-warning.gif) center left no-repeat;
  25 +}
  26 +
  27 +.ktError .dashboard_block_body
  28 +{
  29 + z-index:99;
  30 + margin-top: -8px;
  31 + background-color: #ffdd80;
  32 + overflow: auto;
  33 +}
  34 +
8 .ktActionLink.ktDelete, .ktAction.ktDelete { background-image: url(../../resources/graphics/delete.gif); } 35 .ktActionLink.ktDelete, .ktAction.ktDelete { background-image: url(../../resources/graphics/delete.gif); }
9 .ktActionLink.ktEdit, .ktAction.ktEdit { background-image: url(../../thirdparty/icon-theme/16x16/actions/document-properties.gif); } 36 .ktActionLink.ktEdit, .ktAction.ktEdit { background-image: url(../../thirdparty/icon-theme/16x16/actions/document-properties.gif); }
10 .ktActionLink.ktAddUser, .ktAction.ktAddUser { background-image: url(../../thirdparty/icon-theme/16x16/actions/contact-new.gif); } 37 .ktActionLink.ktAddUser, .ktAction.ktAddUser { background-image: url(../../thirdparty/icon-theme/16x16/actions/contact-new.gif); }
@@ -60,32 +87,6 @@ @@ -60,32 +87,6 @@
60 background: url(../../resources/graphics/portlet_corner_topleft.gif) top left no-repeat; 87 background: url(../../resources/graphics/portlet_corner_topleft.gif) top left no-repeat;
61 } 88 }
62 89
63 -#portletbar .portlet .portletTopRight {  
64 - background: url(../../resources/graphics/portlet_corner_topright_collapsed.gif) top right no-repeat;  
65 -}  
66 -  
67 -#portletbar .portlet.expanded .portletTopRight {  
68 - background: url(../../resources/graphics/portlet_corner_topright.gif) top right no-repeat;  
69 -}  
70 -  
71 -#portletbar .portlet .portletbodyBottomLeft {  
72 - background: url(../../resources/graphics/portlet_corner_bottomleft.gif) bottom left no-repeat;  
73 -}  
74 -  
75 -#portletbar .portlet .portletbodyBottomRight {  
76 - background: url(../../resources/graphics/portlet_corner_bottomright.gif) bottom right no-repeat;  
77 -}  
78 -  
79 -#portletbar .portlet .portletTopRepeat {  
80 - background: url(../../resources/graphics/portlet_bg_collapsed.gif) top left repeat-x;  
81 - width: 65%;  
82 -}  
83 -  
84 -#portletbar .portlet.expanded .portletTopRepeat {  
85 - background: url(../../resources/graphics/portlet_bg.gif) top left repeat-x;  
86 - width: 65%;  
87 -}  
88 -  
89 #menu_divider { 90 #menu_divider {
90 background: url(../../resources/graphics/menu_divider.gif) top left no-repeat; 91 background: url(../../resources/graphics/menu_divider.gif) top left no-repeat;
91 } 92 }
@@ -131,83 +132,8 @@ @@ -131,83 +132,8 @@
131 display: none; 132 display: none;
132 } 133 }
133 134
134 -  
135 -.dashboard_block_topleft {  
136 - background: white url(../graphics/dashlet_toprepeat.gif) top left repeat-x;  
137 -}  
138 -  
139 -.dashboard_block_toprepeat {  
140 - width: 95%;  
141 - background: white url(../graphics/dashlet_toprepeat.gif) top left repeat-x;  
142 -}  
143 -  
144 -.dashboard_block_topright {  
145 - background: white url(../graphics/dashlet_toprepeat.gif) top left repeat-x;  
146 -}  
147 -  
148 -.dashboard_block_leftrepeat_top {  
149 - display: none;  
150 -}  
151 -  
152 -.dashboard_block_leftrepeat_bottom {  
153 - display: none;  
154 -}  
155 -  
156 -.dashboard_block_bottomleft {  
157 - display: none;  
158 -}  
159 -  
160 -.dashboard_block_bottomrepeat {  
161 - display: none;  
162 -}  
163 -  
164 -.dashboard_block_bottomright {  
165 - display: none;  
166 -}  
167 -  
168 -.dashboard_block_rightrepeat_top {  
169 - display: none;  
170 -}  
171 -  
172 -.dashboard_block_rightrepeat_bottom {  
173 - display: none;  
174 -}  
175 -  
176 .ktBlock .dashboard_block_body 135 .ktBlock .dashboard_block_body
177 { 136 {
178 margin: 8px 0 10px 1em; 137 margin: 8px 0 10px 1em;
179 -}  
180 -  
181 -#loginbox.hasDisclaimer #loginboxTopMiddle {  
182 - position: absolute;  
183 - background: url(../graphics/login_border_repeat.png) top left repeat-x;  
184 - top:0;  
185 - left:35px;  
186 - width: 520px;  
187 - height: 3px;  
188 -}  
189 -  
190 -#loginbox.hasDisclaimer #loginboxBottomMiddle {  
191 - position: absolute;  
192 - background: url(../graphics/login_border_bottom.png) bottom left repeat-x;  
193 - bottom: 0;  
194 - left: 35px;  
195 - width: 520px;  
196 - height: 3px;  
197 -}  
198 -  
199 -#loginbox.hasDisclaimer #loginboxLeftTop {  
200 - height: 260px;  
201 -}  
202 -  
203 -#loginbox.hasDisclaimer #loginboxLeftBottom {  
204 - height: 260px;  
205 -}  
206 -  
207 -#loginbox.hasDisclaimer #loginboxRightTop {  
208 - height: 260px;  
209 -}  
210 -  
211 -#loginbox.hasDisclaimer #loginboxRightBottom {  
212 - height: 260px; 138 + overflow: scroll;
213 } 139 }
resources/graphics/dashlet_toprepeat.gif

842 Bytes | W: | H:

841 Bytes | W: | H:

  • 2-up
  • Swipe
  • Onion skin
resources/graphics/error_toprepeat.gif 0 โ†’ 100644

845 Bytes

resources/graphics/info.gif 0 โ†’ 100644

1000 Bytes

resources/graphics/info_toprepeat.gif 0 โ†’ 100644

845 Bytes

resources/js/loader.js
@@ -50,9 +50,6 @@ window.onload = function() @@ -50,9 +50,6 @@ window.onload = function()
50 var infoMessage = new curvyCorners(settings_dashlets, "ktInfoMessage"); 50 var infoMessage = new curvyCorners(settings_dashlets, "ktInfoMessage");
51 infoMessage.applyCornersToAll(); 51 infoMessage.applyCornersToAll();
52 var infoMessages = getElementsByClass("ktInfoMessage"); 52 var infoMessages = getElementsByClass("ktInfoMessage");
53 - for(var s = 0; s < infoMessages.length; s++){  
54 - infoMessages[s].style.margin="0 0 26px 0";  
55 - }  
56 53
57 //error message dashlets 54 //error message dashlets
58 var errorBlock = new curvyCorners(settings_dashlets, "ktError"); 55 var errorBlock = new curvyCorners(settings_dashlets, "ktError");
@@ -66,9 +63,6 @@ window.onload = function() @@ -66,9 +63,6 @@ window.onload = function()
66 var errorMessage = new curvyCorners(settings_dashlets, "ktErrorMessage"); 63 var errorMessage = new curvyCorners(settings_dashlets, "ktErrorMessage");
67 errorMessage.applyCornersToAll(); 64 errorMessage.applyCornersToAll();
68 var errorMessages = getElementsByClass("ktErrorMessage"); 65 var errorMessages = getElementsByClass("ktErrorMessage");
69 - for(var v = 0; v < errorMessages.length; v++){  
70 - errorMessages[v].style.margin="0 0 26px 0";  
71 - }  
72 66
73 if(getElementsByClass("noportlets").length != '1'){ 67 if(getElementsByClass("noportlets").length != '1'){
74 //portlets 68 //portlets
skins/kts_blue/dashlet_toprepeat.gif

839 Bytes | W: | H:

838 Bytes | W: | H:

  • 2-up
  • Swipe
  • Onion skin
skins/kts_blue/dashlet_toprepeat.png

283 Bytes | W: | H:

240 Bytes | W: | H:

  • 2-up
  • Swipe
  • Onion skin
skins/kts_blue/menu_corner_left.gif

987 Bytes | W: | H:

953 Bytes | W: | H:

  • 2-up
  • Swipe
  • Onion skin
skins/kts_blue/menu_corner_left.png

416 Bytes | W: | H:

480 Bytes | W: | H:

  • 2-up
  • Swipe
  • Onion skin
skins/kts_blue/menu_corner_right.gif

1 KB | W: | H:

987 Bytes | W: | H:

  • 2-up
  • Swipe
  • Onion skin
skins/kts_blue/menu_corner_right.png

482 Bytes | W: | H:

588 Bytes | W: | H:

  • 2-up
  • Swipe
  • Onion skin
skins/kts_blue/menu_divider.gif

839 Bytes | W: | H:

834 Bytes | W: | H:

  • 2-up
  • Swipe
  • Onion skin
skins/kts_blue/menu_divider.png

182 Bytes | W: | H:

256 Bytes | W: | H:

  • 2-up
  • Swipe
  • Onion skin
skins/kts_blue/menubg-active.gif

836 Bytes | W: | H:

836 Bytes | W: | H:

  • 2-up
  • Swipe
  • Onion skin
skins/kts_blue/menubg-active.png

181 Bytes | W: | H:

300 Bytes | W: | H:

  • 2-up
  • Swipe
  • Onion skin
skins/kts_blue/menubg.gif

838 Bytes | W: | H:

835 Bytes | W: | H:

  • 2-up
  • Swipe
  • Onion skin
skins/kts_blue/menubg.png

176 Bytes | W: | H:

285 Bytes | W: | H:

  • 2-up
  • Swipe
  • Onion skin
skins/kts_blue/portlet_bg.gif

837 Bytes | W: | H:

836 Bytes | W: | H:

  • 2-up
  • Swipe
  • Onion skin
skins/kts_blue/portlet_bg.png

277 Bytes | W: | H:

234 Bytes | W: | H:

  • 2-up
  • Swipe
  • Onion skin
skins/kts_blue/portlet_bg_collapsed.gif

820 Bytes | W: | H:

819 Bytes | W: | H:

  • 2-up
  • Swipe
  • Onion skin
skins/kts_blue/portlet_bg_collapsed.png

138 Bytes | W: | H:

138 Bytes | W: | H:

  • 2-up
  • Swipe
  • Onion skin
skins/kts_blue/title_bullet.png

239 Bytes | W: | H:

240 Bytes | W: | H:

  • 2-up
  • Swipe
  • Onion skin
templates/ktcore/principals/about.smarty
@@ -80,35 +80,19 @@ Call Sales: +1 415 670-9759 @@ -80,35 +80,19 @@ Call Sales: +1 415 670-9759
80 80
81 <p><strong>Third Party Software</strong></p> 81 <p><strong>Third Party Software</strong></p>
82 <table border="0" cellpadding="10"> 82 <table border="0" cellpadding="10">
83 - <tr>  
84 - <td><div style="background-color:#339900; width:104px;"><img src="{$rootUrl}/resources/graphics/thirdparty/pear.gif"/></div></td>  
85 - <td>Pear</td> 83 + <tr align="center">
  84 + <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>
  85 + <td><a href="http://phpmailer.sourceforge.net/"><img src="{$rootUrl}/resources/graphics/thirdparty/phpmailer.gif" border="0"/></a></td>
  86 + <td><a href="http://smarty.php.net/"><img src="{$rootUrl}/resources/graphics/thirdparty/smarty.gif" border="0"/></a></td>
86 </tr> 87 </tr>
87 - <tr>  
88 - <td><img src="{$rootUrl}/resources/graphics/thirdparty/phpmailer.gif"/></td>  
89 - <td>PHP Mailer</td> 88 + <tr align="center">
  89 + <td><a href="http://sourceforge.net/projects/jscalendar">JSCalendar</a></td>
  90 + <td><a href="http://mochikit.com/"><img src="{$rootUrl}/resources/graphics/thirdparty/mochikit.gif" border="0"/></a></td>
  91 + <td><a href="http://tinymce.moxiecode.com/"><img src="{$rootUrl}/resources/graphics/thirdparty/tinymce.gif" border="0"/></a></td>
90 </tr> 92 </tr>
91 - <tr>  
92 - <td><img src="{$rootUrl}/resources/graphics/thirdparty/smarty.gif"/></td>  
93 - <td>Smarty</td>  
94 - </tr>  
95 - <tr> 93 + <tr align="center">
  94 + <td><a href="http://developer.yahoo.com/yui/"><img src="{$rootUrl}/resources/graphics/thirdparty/yui.gif" border="0"/></a></td>
  95 + <td></td>
96 <td></td> 96 <td></td>
97 - <td>JSCalendar</td>  
98 - </tr>  
99 - <tr>  
100 - <td><img src="{$rootUrl}/resources/graphics/thirdparty/mochikit.gif"/></td>  
101 - <td>MochiKit</td>  
102 - </tr>  
103 - <tr>  
104 - <td><img src="{$rootUrl}/resources/graphics/thirdparty/tinymce.gif"/></td>  
105 - <td>TinyMCE</td>  
106 - </tr>  
107 - <tr>  
108 - <td><img src="{$rootUrl}/resources/graphics/thirdparty/yui.gif"/></td>  
109 - <td>YUI</td>  
110 - </tr>  
111 - <tr>  
112 - <td>&nbsp;</td>  
113 </tr> 97 </tr>
114 </table> 98 </table>