From 6c3241559aa6a2261058d4d4da3c61ed0d2f20e2 Mon Sep 17 00:00:00 2001 From: Jalaloedien Abrahams Date: Fri, 8 Jun 2007 14:54:28 +0000 Subject: [PATCH] KTC-96 "UI defects. " Fixed. --- resources/css/kt-framing.css | 2 ++ resources/css/kt-ie-icons.css | 130 ++++++++++++++++++++++++++++------------------------------------------------------------------------------------------------------ resources/graphics/dashlet_toprepeat.gif | Bin 842 -> 0 bytes resources/graphics/error_toprepeat.gif | Bin 0 -> 845 bytes resources/graphics/info.gif | Bin 0 -> 1000 bytes resources/graphics/info_toprepeat.gif | Bin 0 -> 845 bytes resources/js/loader.js | 6 ------ skins/kts_blue/dashlet_toprepeat.gif | Bin 839 -> 0 bytes skins/kts_blue/dashlet_toprepeat.png | Bin 283 -> 0 bytes skins/kts_blue/menu_corner_left.gif | Bin 987 -> 0 bytes skins/kts_blue/menu_corner_left.png | Bin 416 -> 0 bytes skins/kts_blue/menu_corner_right.gif | Bin 1026 -> 0 bytes skins/kts_blue/menu_corner_right.png | Bin 482 -> 0 bytes skins/kts_blue/menu_divider.gif | Bin 839 -> 0 bytes skins/kts_blue/menu_divider.png | Bin 182 -> 0 bytes skins/kts_blue/menubg-active.gif | Bin 836 -> 0 bytes skins/kts_blue/menubg-active.png | Bin 181 -> 0 bytes skins/kts_blue/menubg.gif | Bin 838 -> 0 bytes skins/kts_blue/menubg.png | Bin 176 -> 0 bytes skins/kts_blue/portlet_bg.gif | Bin 837 -> 0 bytes skins/kts_blue/portlet_bg.png | Bin 277 -> 0 bytes skins/kts_blue/portlet_bg_collapsed.gif | Bin 820 -> 0 bytes skins/kts_blue/portlet_bg_collapsed.png | Bin 138 -> 0 bytes skins/kts_blue/title_bullet.png | Bin 239 -> 0 bytes templates/ktcore/folder/view_permissions.smarty | 4 ++-- 25 files changed, 32 insertions(+), 110 deletions(-) create mode 100644 resources/graphics/error_toprepeat.gif create mode 100644 resources/graphics/info.gif create mode 100644 resources/graphics/info_toprepeat.gif diff --git a/resources/css/kt-framing.css b/resources/css/kt-framing.css index bf0702d..5bf8398 100644 --- a/resources/css/kt-framing.css +++ b/resources/css/kt-framing.css @@ -339,6 +339,8 @@ a.main_nav_item { z-index: 1; width:auto; padding: 0 2em 1em 0; + overflow: auto; + min-height: 600px; } #content.view.withviewlets { diff --git a/resources/css/kt-ie-icons.css b/resources/css/kt-ie-icons.css index 5a70541..41e2fd1 100644 --- a/resources/css/kt-ie-icons.css +++ b/resources/css/kt-ie-icons.css @@ -5,6 +5,33 @@ margin: 20px auto; } +/* block level. */ +.ktError { + background: #ffdd80 url(../../resources/graphics/error_toprepeat.gif) top left repeat-x; + border: 1px solid #FFC21E; + margin: 20px auto; +} + +.ktError p { + margin-left: 20px; + padding-left: 25px; + background: transparent url(../../thirdparty/icon-theme/16x16/status/dialog-warning.gif) center left no-repeat; +} + +.ktError span { + margin-left: 20px; + padding-left: 25px; + background: transparent url(../../thirdparty/icon-theme/16x16/status/dialog-warning.gif) center left no-repeat; +} + +.ktError .dashboard_block_body +{ + z-index:99; + margin-top: -8px; + background-color: #ffdd80; + overflow: auto; +} + .ktActionLink.ktDelete, .ktAction.ktDelete { background-image: url(../../resources/graphics/delete.gif); } .ktActionLink.ktEdit, .ktAction.ktEdit { background-image: url(../../thirdparty/icon-theme/16x16/actions/document-properties.gif); } .ktActionLink.ktAddUser, .ktAction.ktAddUser { background-image: url(../../thirdparty/icon-theme/16x16/actions/contact-new.gif); } @@ -60,32 +87,6 @@ background: url(../../resources/graphics/portlet_corner_topleft.gif) top left no-repeat; } -#portletbar .portlet .portletTopRight { - background: url(../../resources/graphics/portlet_corner_topright_collapsed.gif) top right no-repeat; -} - -#portletbar .portlet.expanded .portletTopRight { - background: url(../../resources/graphics/portlet_corner_topright.gif) top right no-repeat; -} - -#portletbar .portlet .portletbodyBottomLeft { - background: url(../../resources/graphics/portlet_corner_bottomleft.gif) bottom left no-repeat; -} - -#portletbar .portlet .portletbodyBottomRight { - background: url(../../resources/graphics/portlet_corner_bottomright.gif) bottom right no-repeat; -} - -#portletbar .portlet .portletTopRepeat { - background: url(../../resources/graphics/portlet_bg_collapsed.gif) top left repeat-x; - width: 65%; -} - -#portletbar .portlet.expanded .portletTopRepeat { - background: url(../../resources/graphics/portlet_bg.gif) top left repeat-x; - width: 65%; -} - #menu_divider { background: url(../../resources/graphics/menu_divider.gif) top left no-repeat; } @@ -131,83 +132,8 @@ display: none; } - -.dashboard_block_topleft { - background: white url(../graphics/dashlet_toprepeat.gif) top left repeat-x; -} - -.dashboard_block_toprepeat { - width: 95%; - background: white url(../graphics/dashlet_toprepeat.gif) top left repeat-x; -} - -.dashboard_block_topright { - background: white url(../graphics/dashlet_toprepeat.gif) top left repeat-x; -} - -.dashboard_block_leftrepeat_top { - display: none; -} - -.dashboard_block_leftrepeat_bottom { - display: none; -} - -.dashboard_block_bottomleft { - display: none; -} - -.dashboard_block_bottomrepeat { - display: none; -} - -.dashboard_block_bottomright { - display: none; -} - -.dashboard_block_rightrepeat_top { - display: none; -} - -.dashboard_block_rightrepeat_bottom { - display: none; -} - .ktBlock .dashboard_block_body { margin: 8px 0 10px 1em; -} - -#loginbox.hasDisclaimer #loginboxTopMiddle { - position: absolute; - background: url(../graphics/login_border_repeat.png) top left repeat-x; - top:0; - left:35px; - width: 520px; - height: 3px; -} - -#loginbox.hasDisclaimer #loginboxBottomMiddle { - position: absolute; - background: url(../graphics/login_border_bottom.png) bottom left repeat-x; - bottom: 0; - left: 35px; - width: 520px; - height: 3px; -} - -#loginbox.hasDisclaimer #loginboxLeftTop { - height: 260px; -} - -#loginbox.hasDisclaimer #loginboxLeftBottom { - height: 260px; -} - -#loginbox.hasDisclaimer #loginboxRightTop { - height: 260px; -} - -#loginbox.hasDisclaimer #loginboxRightBottom { - height: 260px; + overflow: scroll; } diff --git a/resources/graphics/dashlet_toprepeat.gif b/resources/graphics/dashlet_toprepeat.gif index 00a970d..10cb194 100644 Binary files a/resources/graphics/dashlet_toprepeat.gif and b/resources/graphics/dashlet_toprepeat.gif differ diff --git a/resources/graphics/error_toprepeat.gif b/resources/graphics/error_toprepeat.gif new file mode 100644 index 0000000..3dd6c55 Binary files /dev/null and b/resources/graphics/error_toprepeat.gif differ diff --git a/resources/graphics/info.gif b/resources/graphics/info.gif new file mode 100644 index 0000000..5675956 Binary files /dev/null and b/resources/graphics/info.gif differ diff --git a/resources/graphics/info_toprepeat.gif b/resources/graphics/info_toprepeat.gif new file mode 100644 index 0000000..18007f3 Binary files /dev/null and b/resources/graphics/info_toprepeat.gif differ diff --git a/resources/js/loader.js b/resources/js/loader.js index c152eb8..7b774ec 100644 --- a/resources/js/loader.js +++ b/resources/js/loader.js @@ -50,9 +50,6 @@ window.onload = function() var infoMessage = new curvyCorners(settings_dashlets, "ktInfoMessage"); infoMessage.applyCornersToAll(); var infoMessages = getElementsByClass("ktInfoMessage"); - for(var s = 0; s < infoMessages.length; s++){ - infoMessages[s].style.margin="0 0 26px 0"; - } //error message dashlets var errorBlock = new curvyCorners(settings_dashlets, "ktError"); @@ -66,9 +63,6 @@ window.onload = function() var errorMessage = new curvyCorners(settings_dashlets, "ktErrorMessage"); errorMessage.applyCornersToAll(); var errorMessages = getElementsByClass("ktErrorMessage"); - for(var v = 0; v < errorMessages.length; v++){ - errorMessages[v].style.margin="0 0 26px 0"; - } if(getElementsByClass("noportlets").length != '1'){ //portlets diff --git a/skins/kts_blue/dashlet_toprepeat.gif b/skins/kts_blue/dashlet_toprepeat.gif index 51c566c..e521a28 100644 Binary files a/skins/kts_blue/dashlet_toprepeat.gif and b/skins/kts_blue/dashlet_toprepeat.gif differ diff --git a/skins/kts_blue/dashlet_toprepeat.png b/skins/kts_blue/dashlet_toprepeat.png index 95f89e9..edaa3a0 100644 Binary files a/skins/kts_blue/dashlet_toprepeat.png and b/skins/kts_blue/dashlet_toprepeat.png differ diff --git a/skins/kts_blue/menu_corner_left.gif b/skins/kts_blue/menu_corner_left.gif index 4b26dd1..cbe7f4d 100644 Binary files a/skins/kts_blue/menu_corner_left.gif and b/skins/kts_blue/menu_corner_left.gif differ diff --git a/skins/kts_blue/menu_corner_left.png b/skins/kts_blue/menu_corner_left.png index 24f721c..f034faa 100644 Binary files a/skins/kts_blue/menu_corner_left.png and b/skins/kts_blue/menu_corner_left.png differ diff --git a/skins/kts_blue/menu_corner_right.gif b/skins/kts_blue/menu_corner_right.gif index eeb949a..78d2861 100644 Binary files a/skins/kts_blue/menu_corner_right.gif and b/skins/kts_blue/menu_corner_right.gif differ diff --git a/skins/kts_blue/menu_corner_right.png b/skins/kts_blue/menu_corner_right.png index 8054167..fb97fab 100644 Binary files a/skins/kts_blue/menu_corner_right.png and b/skins/kts_blue/menu_corner_right.png differ diff --git a/skins/kts_blue/menu_divider.gif b/skins/kts_blue/menu_divider.gif index b537b1b..edad141 100644 Binary files a/skins/kts_blue/menu_divider.gif and b/skins/kts_blue/menu_divider.gif differ diff --git a/skins/kts_blue/menu_divider.png b/skins/kts_blue/menu_divider.png index 18462a9..bd11ab3 100644 Binary files a/skins/kts_blue/menu_divider.png and b/skins/kts_blue/menu_divider.png differ diff --git a/skins/kts_blue/menubg-active.gif b/skins/kts_blue/menubg-active.gif index 44cd76c..60f0b73 100644 Binary files a/skins/kts_blue/menubg-active.gif and b/skins/kts_blue/menubg-active.gif differ diff --git a/skins/kts_blue/menubg-active.png b/skins/kts_blue/menubg-active.png index f5647e6..893177b 100644 Binary files a/skins/kts_blue/menubg-active.png and b/skins/kts_blue/menubg-active.png differ diff --git a/skins/kts_blue/menubg.gif b/skins/kts_blue/menubg.gif index 7c545bf..40c1f65 100644 Binary files a/skins/kts_blue/menubg.gif and b/skins/kts_blue/menubg.gif differ diff --git a/skins/kts_blue/menubg.png b/skins/kts_blue/menubg.png index 127af67..0d4de56 100644 Binary files a/skins/kts_blue/menubg.png and b/skins/kts_blue/menubg.png differ diff --git a/skins/kts_blue/portlet_bg.gif b/skins/kts_blue/portlet_bg.gif index 5c62bea..aed4ee7 100644 Binary files a/skins/kts_blue/portlet_bg.gif and b/skins/kts_blue/portlet_bg.gif differ diff --git a/skins/kts_blue/portlet_bg.png b/skins/kts_blue/portlet_bg.png index f8a47c9..b618607 100644 Binary files a/skins/kts_blue/portlet_bg.png and b/skins/kts_blue/portlet_bg.png differ diff --git a/skins/kts_blue/portlet_bg_collapsed.gif b/skins/kts_blue/portlet_bg_collapsed.gif index 8f82052..aec20e2 100644 Binary files a/skins/kts_blue/portlet_bg_collapsed.gif and b/skins/kts_blue/portlet_bg_collapsed.gif differ diff --git a/skins/kts_blue/portlet_bg_collapsed.png b/skins/kts_blue/portlet_bg_collapsed.png index 661fcd2..8045120 100644 Binary files a/skins/kts_blue/portlet_bg_collapsed.png and b/skins/kts_blue/portlet_bg_collapsed.png differ diff --git a/skins/kts_blue/title_bullet.png b/skins/kts_blue/title_bullet.png index 81d0758..9bcb76f 100644 Binary files a/skins/kts_blue/title_bullet.png and b/skins/kts_blue/title_bullet.png differ diff --git a/templates/ktcore/folder/view_permissions.smarty b/templates/ktcore/folder/view_permissions.smarty index f399c4b..87abaac 100644 --- a/templates/ktcore/folder/view_permissions.smarty +++ b/templates/ktcore/folder/view_permissions.smarty @@ -15,13 +15,13 @@ assigned are shown.{/i18n}

{if $iFolderId != 1}
{ if $inherited } -{i18n arg_permission_source=$inherited}This folder inherits its permissions from #permission_source#.{/i18n} +

{i18n arg_permission_source=$inherited}This folder inherits its permissions from #permission_source#.{/i18n} {if $inheritable} {i18n}Override permissions{/i18n} {/if} - +

{ else }

{i18n}This folder defines its own permissions.{/i18n}

{ /if } -- libgit2 0.21.4