diff --git a/plugins/ktcore/folder/Permissions.php b/plugins/ktcore/folder/Permissions.php index 25fe2e9..421eaf3 100644 --- a/plugins/ktcore/folder/Permissions.php +++ b/plugins/ktcore/folder/Permissions.php @@ -299,7 +299,8 @@ class KTFolderPermissionsAction extends KTFolderAction { // permissions in JS format $aPermissionsToJSON = array(); - foreach(KTPermission::getList() as $oP) { + $aPermList = KTPermission::getList(); + foreach($aPermList as $oP) { $aPermissionsToJSON[] = array('id'=>$oP->getId(), 'name'=>$oP->getHumanName()); } @@ -315,7 +316,7 @@ class KTFolderPermissionsAction extends KTFolderAction { $bCanInherit = ($this->oFolder->getId() != 1); - $perms = KTPermission::getList(); + $perms = $aPermList; $docperms = KTPermission::getDocumentRelevantList(); $aTemplateData = array( @@ -330,7 +331,7 @@ class KTFolderPermissionsAction extends KTFolderAction { 'edit' => true, 'permissions' => $perms, 'document_permissions' => $docperms, - 'can_inherit' => $bCanInherit, + 'can_inherit' => $bCanInherit ); return $oTemplate->render($aTemplateData); } diff --git a/resources/css/kt-framing.css b/resources/css/kt-framing.css index 8a85a3c..787bf15 100644 --- a/resources/css/kt-framing.css +++ b/resources/css/kt-framing.css @@ -1029,24 +1029,36 @@ a.main_nav_item { margin: 1em 0 0 0.5em; } -.ktError p { +.ktError .err_list { + background: #ffdd80; + padding-left: 10px; + margin-top: 20px; +} + +.ktError .err_item { padding-left: 25px; background: #ffdd80 url(../../thirdparty/icon-theme/16x16/status/dialog-warning.png) top left no-repeat; - margin-top: 20px; + padding-bottom: 3px; } /* block level. */ .ktInfo { padding: 0.1em 1em 1em 1em; - margin: 1em 0 0 0.5em; + margin: 1em 0 1em 0.5em; } -.ktInfo p { - padding-left: 25px; - background: #DEDEDE url(../../thirdparty/icon-theme/16x16/status/dialog-information.png) top left no-repeat; + +.ktInfo .info_list { + background: #DEDEDE; + padding-left: 10px; margin-top: 20px; } +.ktInfo .info_item { + padding-left: 25px; + background: #DEDEDE url(../../thirdparty/icon-theme/16x16/status/dialog-information.png) top left no-repeat; + padding-bottom: 3px; +} .ktBlock { position: relative; diff --git a/resources/css/kt-ie-icons.css b/resources/css/kt-ie-icons.css index 7443561..55b0905 100644 --- a/resources/css/kt-ie-icons.css +++ b/resources/css/kt-ie-icons.css @@ -1,5 +1,5 @@ -.ktInfo p { background: transparent url(../../thirdparty/icon-theme/16x16/status/dialog-information.gif) center left no-repeat; } -.ktError p { background: transparent url(../../thirdparty/icon-theme/16x16/status/dialog-warning.gif) center left no-repeat; } +.ktInfo .info_item { background: transparent url(../../thirdparty/icon-theme/16x16/status/dialog-information.gif) top left no-repeat; } +.ktError .err_item { background: transparent url(../../thirdparty/icon-theme/16x16/status/dialog-warning.gif) center left no-repeat; } .ktHelp { background: transparent url(../../thirdparty/icon-theme/16x16/apps/help-browser.gif) top left no-repeat; } .ktBlock { background-color: white; @@ -50,15 +50,15 @@ .contenttype.folder { background-image: url(../../thirdparty/icon-theme/16x16/mimetypes/x-directory-normal.gif); } /* IE is woefully unable to */ -#portletbar { +#portletbar { width: 200px; } #portlet-search-text { width: 150px; } /* #content { padding-left: 220px; } */ -#content { +#content { float: left; - padding: 0 25px 0 0; + padding: 0 25px 0 0; } #pageBody { @@ -130,18 +130,18 @@ background: url(../../resources/graphics/menu_divider.gif) top left no-repeat; } -#content .dashboard_block .action_rollup -{ +#content .dashboard_block .action_rollup +{ background-image: url(../graphics/bullet_toggle_minus.gif); } -#content .dashboard_block.rolled-up .action_rollup -{ +#content .dashboard_block.rolled-up .action_rollup +{ background-image: url(../graphics/bullet_toggle_plus.gif); } -#content .dashboard_block .action_close -{ +#content .dashboard_block .action_close +{ background-image: url(../graphics/bullet_toggle_close.gif); } @@ -149,13 +149,13 @@ /* NO CHILD SELECTORS IN IE! */ .kt_treenodes li.treenode a.pathnode -{ +{ padding-left: 15px; } .kt_treenodes li.treenode.active a.pathnode { background: transparent url(../graphics/minus.png) center left no-repeat; - + } .kt_treenodes li.treenode.inactive a.pathnode { @@ -214,12 +214,12 @@ display: none; } -.dashboard_block_handle { +.dashboard_block_handle { margin: 0.2em -0.5em 0.5em 1em; } .ktBlock .dashboard_block_body -{ +{ margin: 8px 0 10px 1em; } @@ -275,6 +275,10 @@ display: none; } +.error_dashlet_rightrepeat_top_small { + display: none; +} + .error_dashlet_rightrepeat_bottom { display: none; } @@ -335,6 +339,10 @@ display: none; } +.info_dashlet_rightrepeat_top_small { + display: none; +} + .info_dashlet_rightrepeat_bottom { display: none; } @@ -344,7 +352,7 @@ } .dashboard_block.rolled-up .error_dashlet_toprepeat -{ +{ height: 38px; } @@ -354,7 +362,7 @@ top:0; left:35px; width: 520px; - height: 3px; + height: 3px; } #loginbox.hasDisclaimer #loginboxBottomMiddle { @@ -389,7 +397,7 @@ .workflow_step2 { - overflow:scroll; + overflow:scroll; width:700px; } diff --git a/templates/kt3/standard_page.smarty b/templates/kt3/standard_page.smarty index feb2997..3d42eaa 100644 --- a/templates/kt3/standard_page.smarty +++ b/templates/kt3/standard_page.smarty @@ -140,7 +140,7 @@
  • {if ($page->user)} - {$page->user->getName()|truncate:65:"..."} + {$page->user->getName()|mb_truncate:40:"..."} {/if} {if !empty($page->userMenu)} · @@ -268,15 +268,17 @@
    +
    {foreach item=sError from=$page->errStack} - - {if ($page->booleanLink == '0')} -

    {$sError|sanitize}

    - {else} -

    {$sError}

    - {/if} - +
    + {if ($page->booleanLink == '0')} + {$sError|sanitize} + {else} + {$sError} + {/if} +
    {/foreach} +
    @@ -290,12 +292,14 @@ {if (!empty($page->infoStack))}
    -
    +
    +
    {foreach item=sInfo from=$page->infoStack} -

    {$sInfo|sanitize}

    +
    {$sInfo|sanitize}
    {/foreach} +
    diff --git a/templates/ktcore/folder/permissions.smarty b/templates/ktcore/folder/permissions.smarty index e4d53f9..f7d1a9d 100644 --- a/templates/ktcore/folder/permissions.smarty +++ b/templates/ktcore/folder/permissions.smarty @@ -34,7 +34,7 @@

    {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}

    - +