Peter M. Groen / knowledgetree

Commit 667c20da74d0e12d690697a071ac05b8f606ee55

Authored by kevin_fourie
1 parent a05d8d21

Merged in from STABLE trunk... 

KTC-582
"UI defect on I.E 7 Windows XP and RedHat Linux"
Fixed. Replaced the <p> tags with div's which render the css correctly. Set the permissions table width to 60% to allow the list to adjust its width properly.

KTS-3344
"Make provision for very long Firstname and Lastname combinations in the caption bar for KTDMS web interface."
Fixed. Set the truncate to 40 characters to account for the admin menu on a 1024x768 res.

Committed by: Megan Watson
Reviewed by: Conrad Vermeulen


git-svn-id: https://kt-dms.svn.sourceforge.net/svnroot/kt-dms/STABLE/branches/3.5.3a-Release-Branch@9376 c91229c3-7414-0410-bfa2-8a42b809f60b
Inline Side-by-side
Showing 5 changed files with 63 additions and 38 deletions
plugins/ktcore/folder/Permissions.php
  View file @667c20d
... ... @@ -299,7 +299,8 @@ class KTFolderPermissionsAction extends KTFolderAction {
299 299  
300 300 // permissions in JS format
301 301 $aPermissionsToJSON = array();
302   - foreach(KTPermission::getList() as $oP) {
  302 + $aPermList = KTPermission::getList();
  303 + foreach($aPermList as $oP) {
303 304 $aPermissionsToJSON[] = array('id'=>$oP->getId(), 'name'=>$oP->getHumanName());
304 305 }
305 306  
... ... @@ -315,7 +316,7 @@ class KTFolderPermissionsAction extends KTFolderAction {
315 316  
316 317 $bCanInherit = ($this->oFolder->getId() != 1);
317 318  
318   - $perms = KTPermission::getList();
  319 + $perms = $aPermList;
319 320 $docperms = KTPermission::getDocumentRelevantList();
320 321  
321 322 $aTemplateData = array(
... ... @@ -330,7 +331,7 @@ class KTFolderPermissionsAction extends KTFolderAction {
330 331 'edit' => true,
331 332 'permissions' => $perms,
332 333 'document_permissions' => $docperms,
333   - 'can_inherit' => $bCanInherit,
  334 + 'can_inherit' => $bCanInherit
334 335 );
335 336 return $oTemplate->render($aTemplateData);
336 337 }
... ...
resources/css/kt-framing.css
  View file @667c20d
... ... @@ -1029,24 +1029,36 @@ a.main_nav_item {
1029 1029 margin: 1em 0 0 0.5em;
1030 1030 }
1031 1031  
1032   -.ktError p {
  1032 +.ktError .err_list {
  1033 + background: #ffdd80;
  1034 + padding-left: 10px;
  1035 + margin-top: 20px;
  1036 +}
  1037 +
  1038 +.ktError .err_item {
1033 1039 padding-left: 25px;
1034 1040 background: #ffdd80 url(../../thirdparty/icon-theme/16x16/status/dialog-warning.png) top left no-repeat;
1035   - margin-top: 20px;
  1041 + padding-bottom: 3px;
1036 1042 }
1037 1043  
1038 1044 /* block level. */
1039 1045 .ktInfo {
1040 1046 padding: 0.1em 1em 1em 1em;
1041   - margin: 1em 0 0 0.5em;
  1047 + margin: 1em 0 1em 0.5em;
1042 1048 }
1043 1049  
1044   -.ktInfo p {
1045   - padding-left: 25px;
1046   - background: #DEDEDE url(../../thirdparty/icon-theme/16x16/status/dialog-information.png) top left no-repeat;
  1050 +
  1051 +.ktInfo .info_list {
  1052 + background: #DEDEDE;
  1053 + padding-left: 10px;
1047 1054 margin-top: 20px;
1048 1055 }
1049 1056  
  1057 +.ktInfo .info_item {
  1058 + padding-left: 25px;
  1059 + background: #DEDEDE url(../../thirdparty/icon-theme/16x16/status/dialog-information.png) top left no-repeat;
  1060 + padding-bottom: 3px;
  1061 +}
1050 1062  
1051 1063 .ktBlock {
1052 1064 position: relative;
... ...
resources/css/kt-ie-icons.css
  View file @667c20d
1   -.ktInfo p { background: transparent url(../../thirdparty/icon-theme/16x16/status/dialog-information.gif) center left no-repeat; }
2   -.ktError p { background: transparent url(../../thirdparty/icon-theme/16x16/status/dialog-warning.gif) center left no-repeat; }
  1 +.ktInfo .info_item { background: transparent url(../../thirdparty/icon-theme/16x16/status/dialog-information.gif) top left no-repeat; }
  2 +.ktError .err_item { background: transparent url(../../thirdparty/icon-theme/16x16/status/dialog-warning.gif) center left no-repeat; }
3 3 .ktHelp { background: transparent url(../../thirdparty/icon-theme/16x16/apps/help-browser.gif) top left no-repeat; }
4 4 .ktBlock {
5 5 background-color: white;
... ... @@ -50,15 +50,15 @@
50 50 .contenttype.folder { background-image: url(../../thirdparty/icon-theme/16x16/mimetypes/x-directory-normal.gif); }
51 51  
52 52 /* IE is woefully unable to */
53   -#portletbar {
  53 +#portletbar {
54 54 width: 200px;
55 55 }
56 56 #portlet-search-text { width: 150px; }
57 57 /* #content { padding-left: 220px; } */
58 58  
59   -#content {
  59 +#content {
60 60 float: left;
61   - padding: 0 25px 0 0;
  61 + padding: 0 25px 0 0;
62 62 }
63 63  
64 64 #pageBody {
... ... @@ -130,18 +130,18 @@
130 130 background: url(../../resources/graphics/menu_divider.gif) top left no-repeat;
131 131 }
132 132  
133   -#content .dashboard_block .action_rollup
134   -{
  133 +#content .dashboard_block .action_rollup
  134 +{
135 135 background-image: url(../graphics/bullet_toggle_minus.gif);
136 136 }
137 137  
138   -#content .dashboard_block.rolled-up .action_rollup
139   -{
  138 +#content .dashboard_block.rolled-up .action_rollup
  139 +{
140 140 background-image: url(../graphics/bullet_toggle_plus.gif);
141 141 }
142 142  
143   -#content .dashboard_block .action_close
144   -{
  143 +#content .dashboard_block .action_close
  144 +{
145 145 background-image: url(../graphics/bullet_toggle_close.gif);
146 146 }
147 147  
... ... @@ -149,13 +149,13 @@
149 149 /* NO CHILD SELECTORS IN IE! */
150 150  
151 151 .kt_treenodes li.treenode a.pathnode
152   -{
  152 +{
153 153 padding-left: 15px;
154 154 }
155 155  
156 156 .kt_treenodes li.treenode.active a.pathnode {
157 157 background: transparent url(../graphics/minus.png) center left no-repeat;
158   -
  158 +
159 159 }
160 160  
161 161 .kt_treenodes li.treenode.inactive a.pathnode {
... ... @@ -214,12 +214,12 @@
214 214 display: none;
215 215 }
216 216  
217   -.dashboard_block_handle {
  217 +.dashboard_block_handle {
218 218 margin: 0.2em -0.5em 0.5em 1em;
219 219 }
220 220  
221 221 .ktBlock .dashboard_block_body
222   -{
  222 +{
223 223 margin: 8px 0 10px 1em;
224 224 }
225 225  
... ... @@ -275,6 +275,10 @@
275 275 display: none;
276 276 }
277 277  
  278 +.error_dashlet_rightrepeat_top_small {
  279 + display: none;
  280 +}
  281 +
278 282 .error_dashlet_rightrepeat_bottom {
279 283 display: none;
280 284 }
... ... @@ -335,6 +339,10 @@
335 339 display: none;
336 340 }
337 341  
  342 +.info_dashlet_rightrepeat_top_small {
  343 + display: none;
  344 +}
  345 +
338 346 .info_dashlet_rightrepeat_bottom {
339 347 display: none;
340 348 }
... ... @@ -344,7 +352,7 @@
344 352 }
345 353  
346 354 .dashboard_block.rolled-up .error_dashlet_toprepeat
347   -{
  355 +{
348 356 height: 38px;
349 357 }
350 358  
... ... @@ -354,7 +362,7 @@
354 362 top:0;
355 363 left:35px;
356 364 width: 520px;
357   - height: 3px;
  365 + height: 3px;
358 366 }
359 367  
360 368 #loginbox.hasDisclaimer #loginboxBottomMiddle {
... ... @@ -389,7 +397,7 @@
389 397  
390 398 .workflow_step2
391 399 {
392   - overflow:scroll;
  400 + overflow:scroll;
393 401 width:700px;
394 402 }
395 403  
... ...
templates/kt3/standard_page.smarty
  View file @667c20d
... ... @@ -140,7 +140,7 @@
140 140 <!-- user menu -->
141 141 <li class="pref">
142 142 {if ($page->user)}
143   - <span class="ktLoggedInUser">{$page->user->getName()|truncate:65:"..."}</span>
  143 + <span class="ktLoggedInUser">{$page->user->getName()|mb_truncate:40:"..."}</span>
144 144 {/if}
145 145 {if !empty($page->userMenu)}
146 146 &middot;
... ... @@ -268,15 +268,17 @@
268 268 <div class="error_dashlet_leftrepeat_top"></div>
269 269 <div class="error_dashlet_rightrepeat_bottom"></div>
270 270 <div class="error_dashlet_leftrepeat_bottom"></div>
  271 + <div class="err_list">
271 272 {foreach item=sError from=$page->errStack}
272   -
273   - {if ($page->booleanLink == '0')}
274   - <p>{$sError|sanitize}</p>
275   - {else}
276   - <p>{$sError}</p>
277   - {/if}
278   -
  273 + <div class="err_item">
  274 + {if ($page->booleanLink == '0')}
  275 + {$sError|sanitize}
  276 + {else}
  277 + {$sError}
  278 + {/if}
  279 + </div>
279 280 {/foreach}
  281 + </div>
280 282 <div class="error_dashlet_topleft_small"></div>
281 283 <div class="error_dashlet_toprepeat_small"></div>
282 284 <div class="error_dashlet_topright_small"></div>
... ... @@ -290,12 +292,14 @@
290 292 {if (!empty($page->infoStack))}
291 293 <div class="ktInfo">
292 294 <div class="info_dashlet_rightrepeat_top_small"></div>
293   - <div class="info_dashlet_leftrepeat_top"></div>
294 295 <div class="info_dashlet_rightrepeat_bottom"></div>
  296 + <div class="info_dashlet_leftrepeat_top"></div>
295 297 <div class="info_dashlet_leftrepeat_bottom"></div>
  298 + <div class="info_list">
296 299 {foreach item=sInfo from=$page->infoStack}
297   - <p>{$sInfo|sanitize}</p>
  300 + <div class="info_item">{$sInfo|sanitize}</div>
298 301 {/foreach}
  302 + </div>
299 303 <div class="info_dashlet_topleft_small"></div>
300 304 <div class="info_dashlet_toprepeat_small"></div>
301 305 <div class="info_dashlet_topright_small"></div>
... ...
templates/ktcore/folder/permissions.smarty
  View file @667c20d
... ... @@ -34,7 +34,7 @@
34 34  
35 35 <p class="descriptiveText">{i18n}Select roles and groups for whom you wish to change permission assignment from the box on the left, and move them over to the box on the right using the button with right-pointing arrows. You can then allocate or remove permissions from these entities and save by pressing the 'Update Permission Assignments' button'.{/i18n}</p>
36 36  
37   -<table>
  37 +<table width="60%">
38 38  
39 39 <thead>
40 40 <tr>
... ...