From 7789f1de7dc61cdf1285971bf4369d20fefb758a Mon Sep 17 00:00:00 2001 From: bryndivey Date: Fri, 8 Dec 2006 08:44:16 +0000 Subject: [PATCH] Jalal's latest commit --- resources/css/kt-framing.css | 132 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++--------- resources/css/kt-ie-icons.css | 4 ++++ resources/css/kt-login.css | 85 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++--- resources/graphics/ktbg.png | Bin 16697 -> 0 bytes resources/graphics/ktbg_old.png | Bin 0 -> 16697 bytes resources/graphics/login_border_bottom.png | Bin 0 -> 190 bytes resources/graphics/login_border_repeat.png | Bin 0 -> 179 bytes resources/graphics/login_border_right.png | Bin 0 -> 187 bytes resources/graphics/login_corner_bottomleft.gif | Bin 0 -> 1031 bytes resources/graphics/login_corner_bottomright.gif | Bin 0 -> 1064 bytes resources/graphics/login_corner_topleft.gif | Bin 0 -> 949 bytes resources/graphics/login_corner_topright.gif | Bin 0 -> 991 bytes resources/graphics/menu_divider.gif | Bin 0 -> 845 bytes resources/graphics/menu_divider.png | Bin 226 -> 0 bytes resources/graphics/portlet_borderright.png | Bin 188 -> 0 bytes resources/graphics/portlet_borderright_future.png | Bin 0 -> 188 bytes templates/kt3/standard_page.smarty | 19 +++++++++---------- templates/ktcore/login.smarty | 16 +++++++++++----- 18 files changed, 229 insertions(+), 27 deletions(-) create mode 100644 resources/graphics/ktbg_old.png create mode 100644 resources/graphics/login_border_bottom.png create mode 100644 resources/graphics/login_border_repeat.png create mode 100644 resources/graphics/login_border_right.png create mode 100644 resources/graphics/login_corner_bottomleft.gif create mode 100644 resources/graphics/login_corner_bottomright.gif create mode 100644 resources/graphics/login_corner_topleft.gif create mode 100644 resources/graphics/login_corner_topright.gif create mode 100644 resources/graphics/menu_divider.gif create mode 100644 resources/graphics/portlet_borderright_future.png diff --git a/resources/css/kt-framing.css b/resources/css/kt-framing.css index 2214bd3..58832bc 100644 --- a/resources/css/kt-framing.css +++ b/resources/css/kt-framing.css @@ -75,6 +75,42 @@ body left: 0px; } +#bodyLeftRepeatQuartTop { + position: absolute; + background: url(../../resources/graphics/page_border_leftrepeat.gif) top left repeat-y; + top: 15%; + left: 0px; + width: 3px; + height: 300px; +} + +#bodyLeftRepeatMiddleTop { + position: absolute; + background: url(../../resources/graphics/page_border_leftrepeat.gif) top left repeat-y; + top: 50%; + left: 0px; + width: 3px; + height: 300px; +} + +#bodyLeftRepeatMiddleBottom { + position: absolute; + background: url(../../resources/graphics/page_border_leftrepeat.gif) top left repeat-y; + bottom: 50%; + left: 0px; + width: 3px; + height: 300px; +} + +#bodyLeftRepeatQuartBottom { + position: absolute; + background: url(../../resources/graphics/page_border_leftrepeat.gif) top left repeat-y; + bottom: 25%; + left: 0px; + width: 3px; + height: 300px; +} + #bodyLeftRepeatBottom { position: absolute; background: url(../../resources/graphics/page_border_leftrepeat.gif) top left repeat-y; @@ -93,6 +129,42 @@ body right: 0px; } +#bodyRightRepeatQuartTop { + position: absolute; + background: url(../../resources/graphics/page_border_rightrepeat.gif) top right repeat-y; + top: 15%; + right: 0px; + width: 8px; + height: 300px; +} + +#bodyRightRepeatMiddleTop { + position: absolute; + background: url(../../resources/graphics/page_border_rightrepeat.gif) top right repeat-y; + top: 50%; + right: 0px; + width: 8px; + height: 300px; +} + +#bodyRightRepeatMiddleBottom { + position: absolute; + background: url(../../resources/graphics/page_border_rightrepeat.gif) top right repeat-y; + bottom: 50%; + right: 0px; + width: 8px; + height: 300px; +} + +#bodyRightRepeatQuartBottom { + position: absolute; + background: url(../../resources/graphics/page_border_rightrepeat.gif) top right repeat-y; + bottom: 25%; + right: 0px; + width: 8px; + height: 300px; +} + #bodyRightRepeatBottom { position: absolute; background: url(../../resources/graphics/page_border_rightrepeat.gif) top right repeat-y; @@ -242,6 +314,12 @@ body border-bottom: 1px solid white; } +#menu_divider { + background: url(../../resources/graphics/menu_divider.png) top left no-repeat; + width: 2px; + height: 31px; +} + .ktLoggedInUser { font-weight: bold; } @@ -384,17 +462,51 @@ a.main_nav_item { } #portletbar .portlet .portletbody { - position: relative; - background: url(../../resources/graphics/portlet_borderrepeat.png) top left repeat-y; + /* This is for the left-hand side border */ + /*background: url(../../resources/graphics/portlet_borderrepeat.png) top left repeat-y;*/ + background: url(../../resources/graphics/portlet_borderright.png) top right repeat-y; padding: 0 0 1em 0; + margin-right: 1px; background-color: white; - border: 0; + border-bottom: 1px solid #ccc; + border-left: 1px solid #ccc; + width: 99%; + height: 100%; +} + +/* Attempt to contain side portlet containers in MORE containers*/ +/* +#portletbar .portlet.expanded .portletBodyDoubleTop { + position: relative; width: 100%; - height: 100%; + height: 1px; + top:0px; + right:0px; + border: 1px solid red; +} + +#portletbar .portlet.expanded .portletBodyDoubleMiddle { + position: relative; + width: 100%; + height: 1px; + top:0px; + right:0px; + border: 1px solid blue; } +#portletbar .portlet.expanded .portletBodyDoubleBottom { + position: relative; + width: 100%; + height: 1px; + bottom:0px; + right:0px; + border: 1px solid red; +}*/ + +/* Bottom Portlet borders */ +/* #portletbar .portlet .portletbodyBottomLeft { - position: absolute; + position: absolute; bottom: 0px; left: 0px; width: 10px; @@ -418,8 +530,10 @@ a.main_nav_item { height: 3px; width: 95%; background: url(../../resources/graphics/portlet_borderbottom.png) bottom left repeat-x; -} +}*/ +/* Right-hand side portlet borders */ +/* #portletbar .portlet .portletbodyRightTop { position: absolute; background: url(../../resources/graphics/portlet_borderright.png) top right repeat-y; @@ -432,7 +546,7 @@ a.main_nav_item { #portletbar .portlet .portletbodyRightBottom { position: absolute; background: url(../../resources/graphics/portlet_borderright.png) top right repeat-y; - bottom: 10px; + bottom: 0px; right: 0px; width: 5px; height: 80px; @@ -473,7 +587,7 @@ a.main_nav_item { right: 0px; width: 5px; height: 68px; -} +}*/ #portletbar .portlet a { text-decoration: none; @@ -1362,7 +1476,7 @@ The text will be hidden for screen view. The generic fahrner-ish approach comes background: url(../../resources/graphics/footer_bg.png) top left repeat-x; height: 2.45em; width: 99%; - right: 3px; + right: 5px; top: 0px; } diff --git a/resources/css/kt-ie-icons.css b/resources/css/kt-ie-icons.css index 38753c9..5d462ad 100644 --- a/resources/css/kt-ie-icons.css +++ b/resources/css/kt-ie-icons.css @@ -82,6 +82,10 @@ width: 65%; } +#menu_divider { + background: url(../../resources/graphics/menu_divider.gif) top left no-repeat; +} + /* NO CHILD SELECTORS IN IE! */ diff --git a/resources/css/kt-login.css b/resources/css/kt-login.css index 46e3293..3c71ae0 100644 --- a/resources/css/kt-login.css +++ b/resources/css/kt-login.css @@ -13,16 +13,91 @@ } #loginbox { + position: relative; padding: 1em; - border: 1px solid #888; + /*border: 1px solid #888;*/ width: 252px; margin-left: auto; margin-right: auto; text-align: left; - background: white url(../graphics/ktbg.png) bottom right no-repeat; - -moz-border-radius: 1em; + background: white url(../graphics/ktbg.png) bottom left no-repeat; + /*-moz-border-radius: 1em;*/ } + #loginboxTopLeft { + position: absolute; + background: url(../graphics/login_corner_topleft.gif) top left no-repeat; + top: 0; + left: 0; + width: 40px; + height: 40px; + } + + #loginboxTopMiddle { + position: absolute; + background: url(../graphics/login_border_repeat.png) top left repeat-x; + top:0; + left:35px; + width: 230px; + height: 3px; + } + + #loginboxTopRight { + position: absolute; + background: url(../graphics/login_corner_topright.gif) top right no-repeat; + top:0; + right:0; + width: 40px; + height: 40px; + } + + #loginboxBottomLeft { + position: absolute; + background: url(../graphics/login_corner_bottomleft.gif) bottom left no-repeat; + bottom:0; + left:0; + width: 40px; + height: 40px; + } + + #loginboxBottomMiddle { + position: absolute; + background: url(../graphics/login_border_bottom.png) bottom left repeat-x; + bottom: 0; + left: 35px; + width: 230px; + height: 3px; + } + + #loginboxBottomRight { + position: absolute; + background: url(../graphics/login_corner_bottomright.gif) bottom left no-repeat; + bottom: 0; + right: 0; + width: 40px; + height: 40px; + } + + #loginboxLeft { + position: absolute; + background: url(../graphics/login_border_repeat.png) top left repeat-y; + top: 35px; + left: 0; + width: 3px; + height: 405px; + } + + #loginboxRight { + position: absolute; + background: url(../graphics/login_border_right.png) top right repeat-y; + top: 35px; + right: 0; + width: 3px; + height: 405px; + } + + + #loginbox.hasDisclaimer { width: 564px; } @@ -89,6 +164,10 @@ font-size: x-small; } +#bottomspacer { + height: 50px; + +} /* block level. */ .ktError diff --git a/resources/graphics/ktbg.png b/resources/graphics/ktbg.png index 217f950..f02fe67 100644 Binary files a/resources/graphics/ktbg.png and b/resources/graphics/ktbg.png differ diff --git a/resources/graphics/ktbg_old.png b/resources/graphics/ktbg_old.png new file mode 100644 index 0000000..217f950 Binary files /dev/null and b/resources/graphics/ktbg_old.png differ diff --git a/resources/graphics/login_border_bottom.png b/resources/graphics/login_border_bottom.png new file mode 100644 index 0000000..8f76d6f Binary files /dev/null and b/resources/graphics/login_border_bottom.png differ diff --git a/resources/graphics/login_border_repeat.png b/resources/graphics/login_border_repeat.png new file mode 100644 index 0000000..69f1abc Binary files /dev/null and b/resources/graphics/login_border_repeat.png differ diff --git a/resources/graphics/login_border_right.png b/resources/graphics/login_border_right.png new file mode 100644 index 0000000..ab50ca7 Binary files /dev/null and b/resources/graphics/login_border_right.png differ diff --git a/resources/graphics/login_corner_bottomleft.gif b/resources/graphics/login_corner_bottomleft.gif new file mode 100644 index 0000000..0b1447f Binary files /dev/null and b/resources/graphics/login_corner_bottomleft.gif differ diff --git a/resources/graphics/login_corner_bottomright.gif b/resources/graphics/login_corner_bottomright.gif new file mode 100644 index 0000000..86841ad Binary files /dev/null and b/resources/graphics/login_corner_bottomright.gif differ diff --git a/resources/graphics/login_corner_topleft.gif b/resources/graphics/login_corner_topleft.gif new file mode 100644 index 0000000..1b6dff1 Binary files /dev/null and b/resources/graphics/login_corner_topleft.gif differ diff --git a/resources/graphics/login_corner_topright.gif b/resources/graphics/login_corner_topright.gif new file mode 100644 index 0000000..11e7510 Binary files /dev/null and b/resources/graphics/login_corner_topright.gif differ diff --git a/resources/graphics/menu_divider.gif b/resources/graphics/menu_divider.gif new file mode 100644 index 0000000..df17643 Binary files /dev/null and b/resources/graphics/menu_divider.gif differ diff --git a/resources/graphics/menu_divider.png b/resources/graphics/menu_divider.png index 78bc26e..afbab20 100644 Binary files a/resources/graphics/menu_divider.png and b/resources/graphics/menu_divider.png differ diff --git a/resources/graphics/portlet_borderright.png b/resources/graphics/portlet_borderright.png index edc6ceb..851396b 100644 Binary files a/resources/graphics/portlet_borderright.png and b/resources/graphics/portlet_borderright.png differ diff --git a/resources/graphics/portlet_borderright_future.png b/resources/graphics/portlet_borderright_future.png new file mode 100644 index 0000000..edc6ceb Binary files /dev/null and b/resources/graphics/portlet_borderright_future.png differ diff --git a/templates/kt3/standard_page.smarty b/templates/kt3/standard_page.smarty index 330dc06..939622b 100644 --- a/templates/kt3/standard_page.smarty +++ b/templates/kt3/standard_page.smarty @@ -71,7 +71,7 @@ {else}
  • {$aMenuItem.label}
    • {/if} -
    • +
    • {/foreach} @@ -140,16 +140,7 @@
    -
    -
    -
    -
    -
    -
    {$portlet_output} -
    -
    -
    {/if} @@ -187,8 +178,16 @@
    +
    +
    +
    +
    +
    +
    +
    +
    diff --git a/templates/ktcore/login.smarty b/templates/ktcore/login.smarty index 33a1ce0..6f55def 100644 --- a/templates/ktcore/login.smarty +++ b/templates/ktcore/login.smarty @@ -46,21 +46,27 @@ - - {if ($disclaimer)}
    {$disclaimer}
    {/if} -

    + {i18n}KnowledgeTree Version{/i18n}
    {$versionName}
    {i18n}© 2006 The Jam Warehouse Software (Pty) Ltd. All Rights Reserved{/i18n} -

    + +
    - +
    +
    +
    +
    +
    +
    +
    +
    -- libgit2 0.21.4