From 4e3b6b8bf811cc22f98232daea8efdb5189d1c5c Mon Sep 17 00:00:00 2001 From: kevin_fourie Date: Fri, 1 Jun 2007 09:01:26 +0000 Subject: [PATCH] Merged in from DEV trunk... --- lib/templating/kt3template.inc.php | 8 +++++++- plugins/rssplugin/templates/RSSPlugin/managerssfeeds.smarty | 2 +- resources/css/kt-framing.css | 1095 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- resources/css/kt-ie-icons.css | 23 +++-------------------- resources/css/kt-login.css | 211 ++++++++++++++++++++++++++++++++----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- resources/graphics/dashlet_toprepeat.png | Bin 271 -> 0 bytes resources/graphics/error_bottomleft.gif | Bin 945 -> 0 bytes resources/graphics/error_bottomleft.png | Bin 277 -> 0 bytes resources/graphics/error_bottomrepeat.gif | Bin 809 -> 0 bytes resources/graphics/error_bottomrepeat.png | Bin 154 -> 0 bytes resources/graphics/error_bottomright.gif | Bin 980 -> 0 bytes resources/graphics/error_bottomright.png | Bin 365 -> 0 bytes resources/graphics/error_leftrepeat.gif | Bin 807 -> 0 bytes resources/graphics/error_leftrepeat.png | Bin 143 -> 0 bytes resources/graphics/error_rightrepeat.gif | Bin 809 -> 0 bytes resources/graphics/error_rightrepeat.png | Bin 131 -> 0 bytes resources/graphics/error_topleft.gif | Bin 1185 -> 0 bytes resources/graphics/error_topleft.png | Bin 356 -> 0 bytes resources/graphics/error_topleft_small.gif | Bin 1033 -> 0 bytes resources/graphics/error_topleft_small.png | Bin 279 -> 0 bytes resources/graphics/error_toprepeat.gif | Bin 846 -> 0 bytes resources/graphics/error_toprepeat.png | Bin 256 -> 0 bytes resources/graphics/error_topright.gif | Bin 1210 -> 0 bytes resources/graphics/error_topright.png | Bin 432 -> 0 bytes resources/graphics/error_topright_small.gif | Bin 1048 -> 0 bytes resources/graphics/error_topright_small.png | Bin 331 -> 0 bytes resources/graphics/footer_bg.png | Bin 200 -> 0 bytes resources/graphics/footer_bg_disclaimer.png | Bin 201 -> 0 bytes resources/graphics/footer_left.png | Bin 371 -> 0 bytes resources/graphics/footer_left_disclaimer.png | Bin 387 -> 0 bytes resources/graphics/footer_right.png | Bin 449 -> 0 bytes resources/graphics/footer_right_disclaimer.png | Bin 466 -> 0 bytes resources/graphics/info_bottomleft.gif | Bin 945 -> 0 bytes resources/graphics/info_bottomleft.png | Bin 272 -> 0 bytes resources/graphics/info_bottomrepeat.gif | Bin 809 -> 0 bytes resources/graphics/info_bottomrepeat.png | Bin 154 -> 0 bytes resources/graphics/info_bottomright.gif | Bin 980 -> 0 bytes resources/graphics/info_bottomright.png | Bin 358 -> 0 bytes resources/graphics/info_leftrepeat.gif | Bin 807 -> 0 bytes resources/graphics/info_leftrepeat.png | Bin 143 -> 0 bytes resources/graphics/info_rightrepeat.gif | Bin 809 -> 0 bytes resources/graphics/info_rightrepeat.png | Bin 130 -> 0 bytes resources/graphics/info_topleft.gif | Bin 1155 -> 0 bytes resources/graphics/info_topleft.png | Bin 315 -> 0 bytes resources/graphics/info_topleft_small.gif | Bin 1017 -> 0 bytes resources/graphics/info_topleft_small.png | Bin 248 -> 0 bytes resources/graphics/info_toprepeat.gif | Bin 846 -> 0 bytes resources/graphics/info_toprepeat.png | Bin 249 -> 0 bytes resources/graphics/info_topright.gif | Bin 1185 -> 0 bytes resources/graphics/info_topright.png | Bin 400 -> 0 bytes resources/graphics/info_topright_small.gif | Bin 1034 -> 0 bytes resources/graphics/info_topright_small.png | Bin 306 -> 0 bytes resources/graphics/page_border_bottomleft.gif | Bin 183 -> 0 bytes resources/graphics/page_border_bottomrepeat.gif | Bin 57 -> 0 bytes resources/graphics/page_border_bottomright.gif | Bin 192 -> 0 bytes resources/graphics/page_border_leftrepeat.gif | Bin 45 -> 0 bytes resources/graphics/page_border_rightborder.gif | Bin 811 -> 0 bytes resources/graphics/page_border_rightrepeat.gif | Bin 44 -> 0 bytes resources/graphics/page_border_topleft.gif | Bin 225 -> 0 bytes resources/graphics/page_border_toprepeat.gif | Bin 38 -> 0 bytes resources/graphics/page_border_topright.gif | Bin 606 -> 0 bytes resources/graphics/portlet_bg.gif | Bin 837 -> 0 bytes resources/graphics/portlet_bg.png | Bin 302 -> 0 bytes resources/graphics/portlet_bg_collapsed.gif | Bin 816 -> 0 bytes resources/graphics/portlet_bg_collapsed.png | Bin 193 -> 0 bytes resources/graphics/portlet_borderbottom.png | Bin 190 -> 0 bytes resources/graphics/portlet_borderrepeat.png | Bin 179 -> 0 bytes resources/graphics/portlet_borderright.png | Bin 112 -> 0 bytes resources/graphics/portlet_borderright_future.png | Bin 188 -> 0 bytes resources/graphics/portlet_corner_bottomleft.gif | Bin 896 -> 0 bytes resources/graphics/portlet_corner_bottomleft.png | Bin 265 -> 0 bytes resources/graphics/portlet_corner_bottomright.gif | Bin 923 -> 0 bytes resources/graphics/portlet_corner_bottomright.png | Bin 301 -> 0 bytes resources/graphics/portlet_corner_topleft.gif | Bin 1667 -> 0 bytes resources/graphics/portlet_corner_topleft.png | Bin 1160 -> 0 bytes resources/graphics/portlet_corner_topleft_collapsed.gif | Bin 1165 -> 0 bytes resources/graphics/portlet_corner_topleft_collapsed.png | Bin 518 -> 0 bytes resources/graphics/portlet_corner_topright.gif | Bin 1302 -> 0 bytes resources/graphics/portlet_corner_topright.png | Bin 785 -> 0 bytes resources/graphics/portlet_corner_topright_collapsed.gif | Bin 958 -> 0 bytes resources/graphics/portlet_corner_topright_collapsed.png | Bin 299 -> 0 bytes templates/kt3/dashboard.smarty | 100 ++++++---------------------------------------------------------------------------------------------- templates/kt3/standard_page.smarty | 237 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-------------------------------------------------------------------------------------------------------------------------------------- templates/ktcore/action/view_roles.smarty | 2 +- templates/ktcore/authentication/manage.smarty | 6 +++--- templates/ktcore/dashlets/checkedout.smarty | 2 +- templates/ktcore/dashlets/indexer_status.smarty | 4 ++-- templates/ktcore/dashlets/notifications.smarty | 2 +- templates/ktcore/document/admin/checkoutlisting.smarty | 4 ++-- templates/ktcore/document/admin/dearchiveconfirmlist.smarty | 6 +++--- templates/ktcore/document/admin/deletedlist.smarty | 2 +- templates/ktcore/document/admin/expungeconfirmlist.smarty | 6 +++--- templates/ktcore/document/admin/restoreconfirmlist.smarty | 6 +++--- templates/ktcore/document/cleanup.smarty | 2 +- templates/ktcore/document/compare.smarty | 4 ++-- templates/ktcore/document/document_permissions.smarty | 2 +- templates/ktcore/document/resolved_permissions_user.smarty | 2 +- templates/ktcore/document/view.smarty | 31 +++++++++++-------------------- templates/ktcore/documenttypes/edit.smarty | 6 +++--- templates/ktcore/folder/permissions.smarty | 8 ++++---- templates/ktcore/folder/resolved_permissions.smarty | 2 +- templates/ktcore/folder/resolved_permissions_user.smarty | 2 +- templates/ktcore/folder/roles.smarty | 6 +++--- templates/ktcore/folder/view_permissions.smarty | 8 ++++---- templates/ktcore/forms/widgets/selection.smarty | 2 +- templates/ktcore/forms/widgets/simple_selection.smarty | 2 +- templates/ktcore/login.smarty | 110 ++++++++++++++++++++++++++++++++++++++++++++++++-------------------------------------------------------------- templates/ktcore/manage_help.smarty | 2 +- templates/ktcore/metadata/admin/edit_lookuptree.smarty | 4 ++-- templates/ktcore/metadata/conditional/conditional_admin_overview.smarty | 2 +- templates/ktcore/metadata/conditional/manageConditional.smarty | 6 +++--- templates/ktcore/metadata/editFieldset.smarty | 2 +- templates/ktcore/misc/columns/edit_view.smarty | 2 +- templates/ktcore/misc/notification_overflow.smarty | 2 +- templates/ktcore/principals/roleadmin.smarty | 2 +- templates/ktcore/principals/useradmin.smarty | 2 +- templates/ktcore/search/administration/conditions.smarty | 2 +- templates/ktcore/search/administration/savedsearches.smarty | 2 +- templates/ktcore/workflow/admin/managepermissions.smarty | 4 ++-- templates/ktcore/workflow/admin/restrictions_edit.smarty | 2 +- templates/ktcore/workflow/admin/transition_actions_edit.smarty | 2 +- templates/ktcore/workflow/admin/view.smarty | 2 +- templates/ktcore/workflow/createState.smarty | 2 +- templates/ktcore/workflow/documentWorkflow.smarty | 10 +++++----- templates/ktcore/workflow/editState.smarty | 12 ++++++------ templates/ktcore/workflow/editTransition.smarty | 4 ++-- templates/ktcore/workflow/editWorkflow.smarty | 2 +- templates/ktcore/workflow/manageActions.smarty | 4 ++-- templates/ktcore/workflow/manageStates.smarty | 2 +- templates/ktcore/workflow/manageTransitions.smarty | 4 ++-- templates/ktstandard/action/link.smarty | 4 ++-- templates/ktstandard/authentication/ldapsearchgroup.smarty | 4 ++-- templates/ktstandard/authentication/ldapsearchuser.smarty | 4 ++-- thirdpartyjs/curvycorners/lgpl.txt | 502 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ thirdpartyjs/curvycorners/rounded_corners.inc.js | 1108 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ thirdpartyjs/curvycorners/rounded_corners_lite.inc.js | 285 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ thirdpartyjs/yui/tools/tools.js | 1013 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 137 files changed, 3299 insertions(+), 1602 deletions(-) delete mode 100644 resources/graphics/error_bottomleft.gif delete mode 100644 resources/graphics/error_bottomleft.png delete mode 100644 resources/graphics/error_bottomrepeat.gif delete mode 100644 resources/graphics/error_bottomrepeat.png delete mode 100644 resources/graphics/error_bottomright.gif delete mode 100644 resources/graphics/error_bottomright.png delete mode 100644 resources/graphics/error_leftrepeat.gif delete mode 100644 resources/graphics/error_leftrepeat.png delete mode 100644 resources/graphics/error_rightrepeat.gif delete mode 100644 resources/graphics/error_rightrepeat.png delete mode 100644 resources/graphics/error_topleft.gif delete mode 100644 resources/graphics/error_topleft.png delete mode 100644 resources/graphics/error_topleft_small.gif delete mode 100644 resources/graphics/error_topleft_small.png delete mode 100644 resources/graphics/error_toprepeat.gif delete mode 100644 resources/graphics/error_topright.gif delete mode 100644 resources/graphics/error_topright.png delete mode 100644 resources/graphics/error_topright_small.gif delete mode 100644 resources/graphics/error_topright_small.png delete mode 100644 resources/graphics/footer_bg.png delete mode 100644 resources/graphics/footer_bg_disclaimer.png delete mode 100644 resources/graphics/footer_left.png delete mode 100644 resources/graphics/footer_left_disclaimer.png delete mode 100644 resources/graphics/footer_right.png delete mode 100644 resources/graphics/footer_right_disclaimer.png delete mode 100644 resources/graphics/info_bottomleft.gif delete mode 100644 resources/graphics/info_bottomleft.png delete mode 100644 resources/graphics/info_bottomrepeat.gif delete mode 100644 resources/graphics/info_bottomrepeat.png delete mode 100644 resources/graphics/info_bottomright.gif delete mode 100644 resources/graphics/info_bottomright.png delete mode 100644 resources/graphics/info_leftrepeat.gif delete mode 100644 resources/graphics/info_leftrepeat.png delete mode 100644 resources/graphics/info_rightrepeat.gif delete mode 100644 resources/graphics/info_rightrepeat.png delete mode 100644 resources/graphics/info_topleft.gif delete mode 100644 resources/graphics/info_topleft.png delete mode 100644 resources/graphics/info_topleft_small.gif delete mode 100644 resources/graphics/info_topleft_small.png delete mode 100644 resources/graphics/info_toprepeat.gif delete mode 100644 resources/graphics/info_topright.gif delete mode 100644 resources/graphics/info_topright.png delete mode 100644 resources/graphics/info_topright_small.gif delete mode 100644 resources/graphics/info_topright_small.png delete mode 100644 resources/graphics/page_border_bottomleft.gif delete mode 100644 resources/graphics/page_border_bottomrepeat.gif delete mode 100644 resources/graphics/page_border_bottomright.gif delete mode 100644 resources/graphics/page_border_leftrepeat.gif delete mode 100644 resources/graphics/page_border_rightborder.gif delete mode 100644 resources/graphics/page_border_rightrepeat.gif delete mode 100644 resources/graphics/page_border_topleft.gif delete mode 100644 resources/graphics/page_border_toprepeat.gif delete mode 100644 resources/graphics/page_border_topright.gif delete mode 100644 resources/graphics/portlet_borderbottom.png delete mode 100644 resources/graphics/portlet_borderrepeat.png delete mode 100644 resources/graphics/portlet_borderright.png delete mode 100644 resources/graphics/portlet_borderright_future.png delete mode 100644 resources/graphics/portlet_corner_bottomleft.gif delete mode 100644 resources/graphics/portlet_corner_bottomleft.png delete mode 100644 resources/graphics/portlet_corner_bottomright.gif delete mode 100644 resources/graphics/portlet_corner_bottomright.png delete mode 100644 resources/graphics/portlet_corner_topleft.gif delete mode 100644 resources/graphics/portlet_corner_topleft.png delete mode 100644 resources/graphics/portlet_corner_topleft_collapsed.gif delete mode 100644 resources/graphics/portlet_corner_topleft_collapsed.png delete mode 100644 resources/graphics/portlet_corner_topright.gif delete mode 100644 resources/graphics/portlet_corner_topright.png delete mode 100644 resources/graphics/portlet_corner_topright_collapsed.gif delete mode 100644 resources/graphics/portlet_corner_topright_collapsed.png create mode 100644 thirdpartyjs/curvycorners/lgpl.txt create mode 100644 thirdpartyjs/curvycorners/rounded_corners.inc.js create mode 100644 thirdpartyjs/curvycorners/rounded_corners_lite.inc.js create mode 100644 thirdpartyjs/yui/tools/tools.js diff --git a/lib/templating/kt3template.inc.php b/lib/templating/kt3template.inc.php index c7c3baa..95cc4d1 100644 --- a/lib/templating/kt3template.inc.php +++ b/lib/templating/kt3template.inc.php @@ -111,6 +111,8 @@ class KTPage { /* default js files initialisation */ $aJS = Array(); + $aJS[] = 'thirdpartyjs/yui/yahoo/yahoo.js'; + $aJS[] = 'thirdpartyjs/yui/utilities/utilities.js'; /* $aJS[] = 'thirdpartyjs/MochiKit/MochiKit.js'; $aJS[] = 'thirdpartyjs/MochiKit/New.js'; @@ -119,9 +121,13 @@ class KTPage { $aJS[] = 'thirdpartyjs/MochiKit/Style.js'; $aJS[] = 'thirdpartyjs/MochiKit/Signal.js'; */ - $aJS[] = 'thirdpartyjs/MochiKit/MochiKitPacked.js'; + $aJS[] = 'thirdpartyjs/MochiKit/MochiKitPacked.js'; $aJS[] = 'resources/js/kt-utility.js'; $aJS[] = 'presentation/i18nJavascript.php'; + $aJS[] = 'thirdpartyjs/curvycorners/rounded_corners.inc.js'; + $aJS[] = 'resources/js/loader.js'; + $aJS[] = 'thirdpartyjs/yui/tools/tools.js'; + //$aJS[] = 'thirdpartyjs/MochiKit/Iter.js'; diff --git a/plugins/rssplugin/templates/RSSPlugin/managerssfeeds.smarty b/plugins/rssplugin/templates/RSSPlugin/managerssfeeds.smarty index 07063a0..e1ff37f 100644 --- a/plugins/rssplugin/templates/RSSPlugin/managerssfeeds.smarty +++ b/plugins/rssplugin/templates/RSSPlugin/managerssfeeds.smarty @@ -6,7 +6,7 @@ {if empty($feedlist)} -

{i18n}Your RSS feed list is empty.{/i18n}

+
{i18n}Your RSS feed list is empty.{/i18n}
{else} diff --git a/resources/css/kt-framing.css b/resources/css/kt-framing.css index 08dec47..013cc4a 100644 --- a/resources/css/kt-framing.css +++ b/resources/css/kt-framing.css @@ -43,154 +43,16 @@ body } #pageBody { - position: relative; - border: 1px solid white; + margin-top: 20px; + margin-bottom: 30px; + margin-left: auto; + margin-right: auto; + border: 1px solid #BBBBBB; + padding: 20px; min-height: 800px; height: auto; -} - -#pageBodyBg { - position: absolute; - background: url(../../resources/graphics/page_bg.png) bottom left repeat-x; - width: 99.2%; - height: 611px; - bottom: 0px; - left: 3px; -} - -#bodyTopLeft { - position: absolute; - background: url(../../resources/graphics/page_border_topleft.gif) top left no-repeat; - top: 0; - left: 0; - width: 50px; - height: 50px; -} - -#bodyTopRepeat { - position: absolute; - background: url(../../resources/graphics/page_border_toprepeat.gif) top left repeat-x; - width:95%; - height: 20px; - top: 0px; - left: 40px; -} - -#bodyLeftRepeatTop { - position: absolute; - background: url(../../resources/graphics/page_border_leftrepeat.gif) top left repeat-y; - width: 3px; - height: 560px; - top: 40px; - 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; - width: 3px; - height: 600px; - bottom: 0px; - left: 0px; -} - -#bodyRightRepeatTop { - position: absolute; - background: url(../../resources/graphics/page_border_rightrepeat.gif) top right repeat-y; - width: 8px; - height:585px; - top: 15px; - 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; - width: 8px; - height:600px; - bottom: 0px; - right: 0px; -} - -#bodyTopRight { - position: absolute; - background: url(../../resources/graphics/page_border_topright.gif) top right no-repeat; - top:0px; - right:0px; - width: 50px; - height:100%; + background-image: url(../../resources/graphics/page_bg.png); + background-repeat: repeat-x; } #bodyPad { @@ -199,33 +61,6 @@ body margin-right:15px; } -#bodyBottomRepeat { - position: absolute; - background: url(../../resources/graphics/page_border_bottomrepeat.gif) bottom left repeat-x; - width:99%; - height: 20px; - bottom: 0px; - left: 10px; -} - -#bodyBottomLeft { - position: absolute; - background: url(../../resources/graphics/page_border_bottomleft.gif) bottom left no-repeat; - width:100px; - height:100px; - bottom:0; - left:0; -} - -#bodyBottomRight { - position: absolute; - background: url(../../resources/graphics/page_border_bottomright.gif) bottom right no-repeat; - width:100px; - height:100px; - bottom:0; - right:0; -} - /* ------------------ logobar ------------------ */ #logobar @@ -400,193 +235,30 @@ a.main_nav_item { .noportlets #portletbar { display: none; } #portletbar .portlet { - position: relative; margin: 0 0 1.5em 0; - background: url(../../resources/graphics/portlet_corner_topleft_collapsed.png) top left no-repeat; + /*background: url(../../resources/graphics/portlet_corner_topleft_collapsed.png) top left no-repeat;*/ + background: #ffffff url(../../resources/graphics/portlet_bg_collapsed.png) top left repeat-x; + border: 1px solid #B7B7B7; padding: 0 0 0 0; - border: 0; z-index: 2; } -#portletbar .portlet .portletTopRepeat { - position: absolute; - background: url(../../resources/graphics/portlet_bg_collapsed.png) top left repeat-x; - top: 0; - left: 30px; - height: 30px; - width: 80%; - z-index: -1; - border:0; -} - -#portletbar .portlet .portletTopRight { - position: absolute; - background: url(../../resources/graphics/portlet_corner_topright_collapsed.png) top right no-repeat; - top: 0; - right: 0px; - height: 30px; - width: 60%; - z-index: -1; - border: 0; -} - #portletbar .portlet.expanded { - position: relative; margin: 0 0 1.5em 0; padding: 0 0 0 0; - background: url(../../resources/graphics/portlet_corner_topleft.png) top left no-repeat; - border: 0; + border: 1px solid #B7B7B7; + background: #ffffff url(../../resources/graphics/portlet_bg.png) top left repeat-x; z-index: 2; } -#portletbar .portlet.expanded .portletTopRepeat { - position: absolute; - background: url(../../resources/graphics/portlet_bg.png) top left repeat-x; - top: 0px; - left: 30px; - height: 28px; - width: 80%; - z-index: -1; - border: 0; -} - -#portletbar .portlet.expanded .portletTopRight { - position: absolute; - background: url(../../resources/graphics/portlet_corner_topright.png) top right no-repeat; - top: 0; - right: 0px; - height: 28px; - width: 60%; - z-index: -1; - border: 0; -} - #portletbar .portlet .portletbody { - background: url(../../resources/graphics/portlet_borderright.png) top right repeat-y; padding: 0 0 1em 0; margin-right: 1px; background-color: white; - 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: 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; - bottom: 0px; - left: 0px; - width: 10px; - height: 10px; - background: url(../../resources/graphics/portlet_corner_bottomleft.png) bottom left no-repeat; -} - -#portletbar .portlet .portletbodyBottomRight { - position: absolute; - bottom: 0px; - right: 0px; - width: 10px; - height: 10px; - background: url(../../resources/graphics/portlet_corner_bottomright.png) bottom right no-repeat; -} - -#portletbar .portlet .portletbodyBottom { - position: absolute; - bottom: 0px; - left: 5px; - 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; - top: 0px; - right: 0px; - width: 5px; - height: 76px; -} - -#portletbar .portlet .portletbodyRightBottom { - position: absolute; - background: url(../../resources/graphics/portlet_borderright.png) top right repeat-y; - bottom: 0px; - right: 0px; - width: 5px; - height: 80px; -} - - -#portletbar .portlet .portletbodyRightMiddleTop { - position: absolute; - background: url(../../resources/graphics/portlet_borderright.png) top right repeat-y; - top: 50%; - right: 0px; - width: 5px; - height: 36px; -} - -#portletbar .portlet .portletbodyRightMiddleBottom { - position: absolute; - background: url(../../resources/graphics/portlet_borderright.png) top right repeat-y; - bottom: 50%; - right: 0px; - width: 5px; - height: 63px; -} - -#portletbar .portlet .portletbodyRightQuartTop { - position: absolute; - background: url(../../resources/graphics/portlet_borderright.png) top right repeat-y; - top: 15%; - right: 0px; - width: 5px; - height: 60px; -} - -#portletbar .portlet .portletbodyRightQuartBottom { - position: absolute; - background: url(../../resources/graphics/portlet_borderright.png) top right repeat-y; - bottom: 25%; - right: 0px; - width: 5px; - height: 68px; -}*/ - #portletbar .portlet a { color: #344a6a; text-decoration: none; @@ -603,6 +275,7 @@ a.main_nav_item { #portletbar .portlet h4 { + margin: 0; padding-top: 0.35em; padding-bottom: 0.7em; padding-left: 30px; @@ -635,57 +308,6 @@ a.main_nav_item { display: block; } -#portletbar .portlet .portletbodyRightTop { - display: none; -} - -#portletbar .portlet .portletbodyRightBottom { - display: none; -} - -#portletbar .portlet .portletbodyRightMiddleTop { - display: none; -} - -#portletbar .portlet .portletbodyRightMiddleBottom { - display: none; -} - -#portletbar .portlet .portletbodyRightQuartTop { - display: none; -} - -#portletbar .portlet .portletbodyRightQuartBottom { - display: none; -} - - -#portletbar .portlet.expanded .portletbodyRightTop { - display: block; -} - -#portletbar .portlet.expanded .portletbodyRightBottom { - display: block; -} - - -#portletbar .portlet.expanded .portletbodyRightMiddleTop { - display: block; -} - -#portletbar .portlet.expanded .portletbodyRightMiddleBottom { - display: block; -} - -#portletbar .portlet.expanded .portletbodyRightQuartTop { - display: block; -} - -#portletbar .portlet.expanded .portletbodyRightQuartBottom { - display: block; -} - - #portletbar .portlet .actionlist { list-style: none; @@ -709,12 +331,11 @@ a.main_nav_item { #content { - position: relative; display: block; top: 0; z-index: 1; width:auto; - padding: 0 2em 1em 17em; + padding: 0 2em 1em 0; } #content.view.withviewlets { @@ -778,11 +399,6 @@ a.main_nav_item { margin-bottom: 1em; } - - - - - /* ----------------------- forms ---------------------------- */ #content fieldset @@ -917,6 +533,7 @@ a.main_nav_item { { font-family: "Lucida Grande", "Bitstream Vera Sans", Tahoma, sans-serif; padding-bottom: 0.25em; + margin-top: 0; border-width: 0 0 0 0; border-style: solid; border-color: #eee; @@ -1127,7 +744,6 @@ a.main_nav_item { white-space: normal !important; } - .centered, .kt_collection thead th.centered { text-align: center; } .centered .ktAction { margin-left: auto; margin-right: auto; width: 100%; background-position: top center;} @@ -1185,37 +801,85 @@ a.main_nav_item { /* block level. */ .ktError { - padding: 0.1em 1em; - margin: 1em 0 0 0.5em; + background: #ffdd80 url(../../resources/graphics/error_toprepeat.png) top left repeat-x; + border: 1px solid #FFC21E; + margin: 20px auto; +} + +.ktErrorMessage { + background-color: #ffdd80; + border: 1px solid #FFC21E; + margin: 20px auto; +} + +.ktErrorMessage p { + margin-left: 20px; + padding-left: 25px; + background: #ffdd80 url(../../thirdparty/icon-theme/16x16/status/dialog-warning.png) center left no-repeat; +} + +.ktErrorMessage span { + margin-left: 20px; + padding-left: 25px; + background: #ffdd80 url(../../thirdparty/icon-theme/16x16/status/dialog-warning.png) center left no-repeat; } .ktError p { + margin-left: 20px; + padding-left: 25px; + background: #ffdd80 url(../../thirdparty/icon-theme/16x16/status/dialog-warning.png) center left no-repeat; +} + +.ktError span { + margin-left: 20px; padding-left: 25px; background: #ffdd80 url(../../thirdparty/icon-theme/16x16/status/dialog-warning.png) center left no-repeat; - margin-top: 20px; } /* block level. */ .ktInfo { - padding: 0.1em 1em; - margin: 1em 0 0 0.5em; + background: #DEDEDE url(../../resources/graphics/info_toprepeat.png) top left repeat-x; + border: 1px solid #C5C5C5; + margin: 20px auto; +} + +.ktInfoMessage{ + background-color: #DEDEDE; + border: 1px solid #C5C5C5; + margin: 20px auto; } .ktInfo p { + margin-left: 20px; padding-left: 25px; background: #DEDEDE url(../../thirdparty/icon-theme/16x16/status/dialog-information.png) center left no-repeat; - margin-top: 20px; } +.ktInfoMessage p { + margin-left: 20px; + padding-left: 25px; + background: #DEDEDE url(../../thirdparty/icon-theme/16x16/status/dialog-information.png) center left no-repeat; +} -.ktBlock { - position: relative; - padding: 0.1em 1em; - margin: 1em 0 0 0.5em; +.ktInfo span { + margin-left: 20px; + padding-left: 25px; + background: #DEDEDE url(../../thirdparty/icon-theme/16x16/status/dialog-information.png) center left no-repeat; } +.ktInfoMessage span { + margin-left: 20px; + padding-left: 25px; + background: #DEDEDE url(../../thirdparty/icon-theme/16x16/status/dialog-information.png) center left no-repeat; +} -.ktInfo, .ktError { +.ktBlock { + background: #ffffff url(../../resources/graphics/dashlet_toprepeat.png) top left repeat-x; + border: 1px solid #C5C5C5; + margin: 20px auto; +} + +.ktBlock, .ktInfo, .ktError, .ktInfoMessage, .ktErrorMessage{ position: relative; } @@ -1262,7 +926,7 @@ Use them as follows: The text will be hidden for screen view. The generic fahrner-ish approach comes from Plone - */ +*/ .ktAction { @@ -1327,7 +991,6 @@ The text will be hidden for screen view. The generic fahrner-ish approach comes .ktActionLink.ktDenied, .ktAction.ktDenied { background-image: url(../../resources/graphics/denied.png); } .ktActionLink.ktMoveUp, .ktAction.ktMoveUp { background-image: url(../../thirdparty/icon-theme/16x16/actions/move-up.png); } .ktActionLink.ktMoveDown, .ktAction.ktMoveDown { background-image: url(../../thirdparty/icon-theme/16x16/actions/move-down.png); } -/*.ktActionLink.ktInfo, .ktAction.ktInfo { background-image: url(../graphics/info.png); }*/ /* this is sometimes used separately to get the auto-delete help. */ .ktDelete { } @@ -1362,6 +1025,8 @@ The text will be hidden for screen view. The generic fahrner-ish approach comes padding-bottom: 2em; height: 100%; min-height: 5em; + padding-left: 20px; + padding-top: 25px; /* background-color: #dfd; */ } @@ -1373,135 +1038,10 @@ The text will be hidden for screen view. The generic fahrner-ish approach comes padding-bottom: 2em; height: 100%; min-height: 5em; + padding-top: 25px; /* background-color: #ddf; */ } -.dashboard_block_topleft { - position: absolute; - width: 35px; - height: 36px; - top: 0px; - left: 0px; - background: url(../graphics/dashlet_topleft.png) top left no-repeat; - z-index:-1; -} - -.dashboard_block_toprepeat { - position: absolute; - width: 90%; - height: 36px; - top: 0px; - left: 30px; - background: white url(../graphics/dashlet_toprepeat.png) top left repeat-x; - z-index:-1; -} - -.dashboard_block_topright { - position: absolute; - width: 35px; - height: 36px; - top: 0px; - right: 0px; - background: url(../graphics/dashlet_topright.png) top right no-repeat; - z-index:-1; -} - -.dashboard_block_leftrepeat_top { - position: absolute; - width: 13px; - height: 50%; - top: 5px; - left: 0px; - background: white url(../graphics/dashlet_leftrepeat.png) top left repeat-y; - z-index:-1; -} - -.dashboard_block_leftrepeat_bottom { - position: absolute; - width: 13px; - height: 50%; - bottom: 10px; - left: 0px; - background: white url(../graphics/dashlet_leftrepeat.png) top left repeat-y; - z-index:-1; -} - -.dashboard_block_bottomleft { - position: absolute; - width: 40px; - height: 40px; - bottom: 0px; - left: 0px; - background: url(../graphics/dashlet_bottomleft.png) bottom left no-repeat; - z-index:-1; -} - -.dashboard_block_bottomrepeat { - position: absolute; - width: 92%; - height: 13px; - bottom: 0px; - left: 30px; - background: white url(../graphics/dashlet_bottomrepeat.png) bottom left repeat-x; - z-index:-1; -} - -.dashboard_block_bottomright { - position: absolute; - width: 40px; - height: 40px; - bottom: 0px; - right: 0px; - background: url(../graphics/dashlet_bottomright.png) bottom right no-repeat; - z-index:-1; -} - -.dashboard_block_rightrepeat_top { - position: absolute; - width: 13px; - height: 50%; - top: 5px; - right: 0px; - background: white url(../graphics/dashlet_rightrepeat.png) top right repeat-y; - z-index:-1; - overflow:hidden; -} - -.dashboard_block_rightrepeat_bottom { - position: absolute; - width: 13px; - height: 50%; - bottom: 10px; - right: 0px; - background: white url(../graphics/dashlet_rightrepeat.png) bottom right repeat-y; - z-index:-1; - overflow:hidden; -} - -.dashboard_block_rightrepeat_top { - min-height: 70px; -} - -.dashboard_block.rolled-up .dashboard_block_rightrepeat_top -{ - display: none; -} - -.dashboard_block.rolled-up .dashboard_block_rightrepeat_bottom -{ - display: none; -} - -.dashboard_block.rolled-up .dashboard_block_leftrepeat_top -{ - display: none; -} - -.dashboard_block.rolled-up .dashboard_block_leftrepeat_bottom -{ - display: none; -} - .dashboard_block { width: 100%; } @@ -1510,460 +1050,11 @@ The text will be hidden for screen view. The generic fahrner-ish approach comes border:none; } -.error_dashlet_topleft { - position: absolute; - width: 35px; - height: 36px; - top: 0px; - left: 0px; - background: url(../graphics/error_topleft.png) top left no-repeat; - z-index:-1; -} - -.error_dashlet_topleft_small { - position: absolute; - width: 35px; - height: 22px; - top: 0px; - left: 0px; - background: url(../graphics/error_topleft_small.png) top left no-repeat; - z-index:-1; -} - -.error_dashlet_toprepeat { - position: absolute; - width: 95%; - height: 55px; - top: 0px; - left: 13px; - background: #ffdd80 url(../graphics/error_toprepeat.png) top left repeat-x; - z-index:-1; -} - -.error_dashlet_toprepeat_small { - position: absolute; - width: 97%; - height: 21px; - top: 0px; - left: 13px; - background: #ffdd80 url(../graphics/error_toprepeat.png) bottom left repeat-x; - z-index:-1; - border-top: 1px solid #FFC21E; -} - -.error_dashlet_topright { - position: absolute; - width: 35px; - height: 36px; - top: 0px; - right: 0px; - background: url(../graphics/error_topright.png) top right no-repeat; - z-index:-1; -} - -.error_dashlet_topright_small { - position: absolute; - width: 35px; - height: 22px; - top: 0px; - right: 0px; - background: url(../graphics/error_topright_small.png) top right no-repeat; - z-index:-1; -} - -.error_dashlet_leftrepeat_top { - position: absolute; - width: 13px; - height: 50%; - top: 5px; - left: 0px; - background: #ffdd80 url(../graphics/error_leftrepeat.png) top left repeat-y; - z-index:-1; -} - -.error_dashlet_leftrepeat_bottom { - position: absolute; - width: 13px; - height: 50%; - bottom: 10px; - left: 0px; - background: #ffdd80 url(../graphics/error_leftrepeat.png) top left repeat-y; - z-index:-1; -} - -.error_dashlet_bottomleft { - position: absolute; - width: 40px; - height: 45px; - bottom: 0px; - left: 0px; - background: url(../graphics/error_bottomleft.png) bottom left no-repeat; - z-index:-1; -} - -.error_dashlet_bottomrepeat { - position: absolute; - width: 95%; - height: 30px; - bottom: 0px; - left: 10x; - background: #ffdd80 url(../graphics/error_bottomrepeat.png) bottom left repeat-x; - z-index:-1; -} - -.error_dashlet_bottomrepeat_small { - position: absolute; - width: 97%; - height: 21px; - bottom: 0px; - left: 10x; - background: #ffdd80 url(../graphics/error_bottomrepeat.png) bottom left repeat-x; - z-index:-1; -} - -.error_dashlet_bottomright { - position: absolute; - width: 40px; - height: 40px; - bottom: 0px; - right: 0px; - background: url(../graphics/error_bottomright.png) bottom right no-repeat; - z-index:-1; -} - -.error_dashlet_rightrepeat_top { - position: absolute; - width: 30px; - height: 50%; - top: 5px; - right: 0px; - background: #ffdd80 url(../graphics/error_rightrepeat.png) top right repeat-y; - z-index:-1; - overflow:hidden; -} - -.error_dashlet_rightrepeat_bottom { - position: absolute; - width: 30px; - height: 50%; - bottom: 10px; - right: 0px; - background: #ffdd80 url(../graphics/error_rightrepeat.png) bottom right repeat-y; - z-index:-1; - overflow:hidden; -} - -.error_dashlet_rightrepeat_top { - min-height: 70px; -} - -.dashboard_block.rolled-up .error_dashlet_toprepeat -{ - height: 38px; -} - -.dashboard_block.rolled-up .error_dashlet_bottomrepeat -{ - height: 20px; -} - -.dashboard_block.rolled-up .error_dashlet_rightrepeat_top -{ - display: none; -} - -.dashboard_block.rolled-up .error_dashlet_rightrepeat_bottom -{ - display: none; -} - -.dashboard_block.rolled-up .error_dashlet_leftrepeat_top -{ - display: none; -} - -.dashboard_block.rolled-up .error_dashlet_leftrepeat_bottom -{ - display: none; -} - -.info_dashlet_topleft { - position: absolute; - width: 35px; - height: 36px; - top: 0px; - left: 0px; - background: url(../graphics/info_topleft.png) top left no-repeat; - z-index:-1; -} - -.info_dashlet_topleft_small { - position: absolute; - width: 35px; - height: 22px; - top: 0px; - left: 0px; - background: url(../graphics/info_topleft_small.png) top left no-repeat; - z-index:-1; -} - -.info_dashlet_toprepeat { - position: absolute; - width: 95%; - height: 55px; - top: 0px; - left: 13px; - background: #DEDEDE url(../graphics/info_toprepeat.png) top left repeat-x; - z-index:-1; -} - -.info_dashlet_toprepeat_small { - position: absolute; - width: 97%; - height: 21px; - top: 0px; - left: 13px; - background: #DEDEDE url(../graphics/info_toprepeat.png) bottom left repeat-x; - z-index:-1; - border-top: 1px solid #C5C5C5; -} - -.info_dashlet_topright { - position: absolute; - width: 35px; - height: 36px; - top: 0px; - right: 0px; - background: url(../graphics/info_topright.png) top right no-repeat; - z-index:-1; -} - -.info_dashlet_topright_small { - position: absolute; - width: 35px; - height: 22px; - top: 0px; - right: 0px; - background: url(../graphics/info_topright_small.png) top right no-repeat; - z-index:-1; -} - -.info_dashlet_leftrepeat_top { - position: absolute; - width: 13px; - height: 50%; - top: 5px; - left: 0px; - background: #DEDEDE url(../graphics/info_leftrepeat.png) top left repeat-y; - z-index:-1; -} - -.info_dashlet_leftrepeat_bottom { - position: absolute; - width: 13px; - height: 50%; - bottom: 10px; - left: 0px; - background: #DEDEDE url(../graphics/info_leftrepeat.png) top left repeat-y; - z-index:-1; -} - -.info_dashlet_bottomleft { - position: absolute; - width: 40px; - height: 45px; - bottom: 0px; - left: 0px; - background: url(../graphics/info_bottomleft.png) bottom left no-repeat; - z-index:-1; -} - -.info_dashlet_bottomrepeat { - position: absolute; - width: 95%; - height: 30px; - bottom: 0px; - left: 10x; - background: #DEDEDE url(../graphics/info_bottomrepeat.png) bottom left repeat-x; - z-index:-1; -} - -.info_dashlet_bottomrepeat_small { - position: absolute; - width: 97%; - height: 21px; - bottom: 0px; - left: 10x; - background: #DEDEDE url(../graphics/info_bottomrepeat.png) bottom left repeat-x; - z-index:-1; -} - -.info_dashlet_bottomright { - position: absolute; - width: 40px; - height: 40px; - bottom: 0px; - right: 0px; - background: url(../graphics/info_bottomright.png) bottom right no-repeat; - z-index:-1; -} - -.info_dashlet_rightrepeat_top { - position: absolute; - width: 30px; - height: 50%; - top: 5px; - right: 0px; - background: #DEDEDE url(../graphics/info_rightrepeat.png) top right repeat-y; - z-index:-1; - overflow:hidden; -} - -.info_dashlet_rightrepeat_bottom { - position: absolute; - width: 30px; - height: 50%; - bottom: 10px; - right: 0px; - background: #DEDEDE url(../graphics/info_rightrepeat.png) bottom right repeat-y; - z-index:-1; - overflow:hidden; -} - -.info_dashlet_rightrepeat_top { - min-height: 70px; -} - -.dashboard_block.rolled-up .info_dashlet_toprepeat -{ - height: 38px; -} - -.dashboard_block.rolled-up .info_dashlet_bottomrepeat -{ - height: 20px; -} - -.dashboard_block.rolled-up .info_dashlet_rightrepeat_top -{ - display: none; -} - -.dashboard_block.rolled-up .info_dashlet_rightrepeat_bottom -{ - display: none; -} - -.dashboard_block.rolled-up .info_dashlet_leftrepeat_top -{ - display: none; -} - -.dashboard_block.rolled-up .info_dashlet_leftrepeat_bottom -{ - display: none; -} - - #copyrightbarBorder { - position: relative; - height: 62px; - width: 97.65%; - padding: 0em 1em; - margin-top: 10px; - margin: 0.5em 0 0.5em 0; -} - -#copyrightbarBg { - position: absolute; - background: url(../../resources/graphics/footer_bg.png) top left repeat-x; - height: 62px; - width: 99%; - right: 5px; - top: 0px; -} - -#copyrightbarLeft{ - position: absolute; - background: url(../../resources/graphics/footer_left.png) top left no-repeat; - width:8px; - height:62px; - top:0px; - left:3px; -} - -#copyrightbarRight{ - position: absolute; - background: url(../../resources/graphics/footer_right.png) top right no-repeat; - height:62px; - width:8px; - top:0px; - right:0px; -} - -#copyrightbar { - position: absolute; - top:10px; - left:20px; - color: #000000; - font-size: small; - height:62px; - width: 98%; - overflow: hidden; -} - -#copyrightbarBorderDisclaimer { - position: relative; - height: 82px; - width: 97.65%; - padding: 0em 1em; - margin-top: 10px; - margin: 0.5em 0 0.5em 0; -} - -#copyrightbarBgDisclaimer{ - position: absolute; - background: url(../../resources/graphics/footer_bg_disclaimer.png) top left repeat-x; - height: 100px; - width: 99%; - right: 5px; - top: 0px; -} - -#copyrightbarLeftDisclaimer{ - position: absolute; - background: url(../../resources/graphics/footer_left_disclaimer.png) top left no-repeat; - width:8px; - height:100px; - top:0px; - left:3px; -} - -#copyrightbarRightDisclaimer{ - position: absolute; - background: url(../../resources/graphics/footer_right_disclaimer.png) top right no-repeat; - height:100px; - width:8px; - top:0px; - right:0px; -} - -#copyrightbarDisclaimer { - position: absolute; - top:6px; - left:20px; - color: #000000; - font-size: small; - height:82px; - width: 98%; - overflow: hidden; -} - -.copyrightbarBorderLogo{ - position: absolute; - top:25px; - right:20px; - border: 0; + margin-top: 40px; + margin-bottom: 50px; + border: 1px solid #BBBBBB; + background-color: #D1D1D1; } hr { @@ -1972,7 +1063,6 @@ hr { border-color: #888; } - #support-block { width: 100%; height: 500px; @@ -2162,23 +1252,21 @@ hr { padding: 0; } - - /* -------------------------- dashboard ------------------------ */ .dashboard_block_icons { position: absolute; top: 0px; - right: 10px; + right: 8px; text-align: right; - margin: 0.2em 0em 0 0; + margin: -2px 0 0 0; } .dashboard_block_handle { cursor: pointer; - margin: 0.2em -0.5em 0.5em 0; + margin: -2px -0.5em 0.5em 0.5em; font-size:small; } @@ -2192,19 +1280,22 @@ hr { z-index:99; margin: 8px 0 10px 0; background-color:#FFFFFF; + padding-left: 15px; + padding-right: 15px; + padding-bottom: 5px; } .ktError .dashboard_block_body { z-index:99; - margin: 0; + margin-top: -8px; background-color: #ffdd80; } .ktInfo .dashboard_block_body { z-index:99; - margin: 0; + margin-top: -8px; background-color: #DEDEDE; } @@ -2251,8 +1342,6 @@ hr { padding-bottom: 10px; } - - #content .ktBlock h2 { border-bottom-width: 0px; @@ -2315,4 +1404,4 @@ body #content #add_dashlet font-weight: normal; float: right; margin-right: 3em; -} +} \ No newline at end of file diff --git a/resources/css/kt-ie-icons.css b/resources/css/kt-ie-icons.css index 69c1a6b..5a70541 100644 --- a/resources/css/kt-ie-icons.css +++ b/resources/css/kt-ie-icons.css @@ -1,15 +1,8 @@ -.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; } .ktHelp { background: transparent url(../../thirdparty/icon-theme/16x16/apps/help-browser.gif) top left no-repeat; } .ktBlock { - background-color: white; - border: 1px solid #ccc; - padding-left: 0em; -} - -.ktInfo, .ktError { - padding: 0.1em 1em; - margin: 0.5em 0 0.5em 0em; + background: #ffffff url(../../resources/graphics/dashlet_toprepeat.gif) top left repeat-x; + border: 1px solid #C5C5C5; + margin: 20px auto; } .ktActionLink.ktDelete, .ktAction.ktDelete { background-image: url(../../resources/graphics/delete.gif); } @@ -23,7 +16,6 @@ .ktActionLink.ktDenied, .ktAction.ktDenied { background-image: url(../../resources/graphics/denied.gif); } .ktActionLink.ktMoveUp, .ktAction.ktMoveUp { background-image: url(../../thirdparty/icon-theme/16x16/actions/move-up.gif); } .ktActionLink.ktMoveDown, .ktAction.ktMoveDown { background-image: url(../../thirdparty/icon-theme/16x16/actions/move-down.gif); } -.ktBlock {margin: 0.5em 0;} .contenttype.office { background-image: url(../../resources/mimetypes/office.gif); } .contenttype.word { background-image: url(../../resources/mimetypes/word.gif); } .contenttype.database { background-image: url(../../resources/mimetypes/database.gif); } @@ -53,11 +45,6 @@ height: 800px; } -/* IE does not know what 100% is!! */ -#copyrightbarBg { - width: 101%; -} - .floatClear { height: 1px !important; @@ -186,10 +173,6 @@ display: none; } -.dashboard_block_handle { - margin: 0.2em -0.5em 0.5em 1em; -} - .ktBlock .dashboard_block_body { margin: 8px 0 10px 1em; diff --git a/resources/css/kt-login.css b/resources/css/kt-login.css index 7c4662c..fc7c0f6 100644 --- a/resources/css/kt-login.css +++ b/resources/css/kt-login.css @@ -11,199 +11,45 @@ display: block; margin: 0.5em 0; } - - #loginbox { - position: relative; + + #loginbox_outer { + position: relative; padding: 1em; - /*border: 1px solid #888;*/ - width: 252px; + border: 1px solid #B7B7B7; + width: 280px; margin-left: auto; margin-right: auto; + background-color: #FFFFFF; + } + + #loginbox_outer.hasDisclaimer { + width: 580px; + } + + #loginbox { text-align: left; + margin: 0 10px; background: white url(../graphics/ktbg.png) bottom left no-repeat; } #loginbox_skin { - position: relative; - padding: 1em; - /*border: 1px solid #888;*/ - width: 252px; - margin-left: auto; - margin-right: auto; text-align: left; + margin: 0 10px; background: white url(../powered-by-kt.gif) bottom right no-repeat; } - #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; - } - - #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_skin.hasDisclaimer #loginboxTopMiddle { - position: absolute; - background: url(../graphics/login_border_repeat.png) top left repeat-x; - top:0; - left:35px; - width: 520px; - 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; - } - - #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_skin.hasDisclaimer #loginboxBottomMiddle { - position: absolute; - background: url(../graphics/login_border_bottom.png) bottom left repeat-x; - bottom: 0; - left: 35px; - width: 520px; - height: 3px; - } - - #loginboxBottomRight { - position: absolute; - background: url(../graphics/login_corner_bottomright.gif) bottom left no-repeat; - bottom: 0; - right: 0; - width: 40px; - height: 40px; - } - - #loginboxLeftTop { - position: absolute; - background: url(../graphics/login_border_repeat.png) top left repeat-y; - top: 35px; - left: 0; - width: 3px; - height: 405px; - } - - #loginbox.hasDisclaimer #loginboxLeftTop { - height: 200px; - } - - #loginbox_skin.hasDisclaimer #loginboxLeftTop { - height: 200px; - } - - #loginboxLeftBottom { - position: absolute; - background: url(../graphics/login_border_repeat.png) top left repeat-y; - bottom: 35px; - left: 0; - width: 3px; - height: 405px; - } - - #loginbox.hasDisclaimer #loginboxLeftBottom { - height: 250px; - } - - #loginbox_skin.hasDisclaimer #loginboxLeftBottom { - height: 250px; - } - - #loginboxRightTop { - position: absolute; - background: url(../graphics/login_border_right.png) top right repeat-y; - top: 35px; - right: 0; - width: 3px; - height: 405px; - } - - #loginbox.hasDisclaimer #loginboxRightTop { - height: 250px; - } - - #loginbox_skin.hasDisclaimer #loginboxRightTop { - height: 250px; - } - - #loginboxRightBottom { - position: absolute; - background: url(../graphics/login_border_right.png) top right repeat-y; - bottom: 35px; - right: 0; - width: 3px; - height: 405px; - } - - #loginbox.hasDisclaimer #loginboxRightBottom { - height: 200px; - } - - #loginbox_skin.hasDisclaimer #loginboxRightBottom { - height: 200px; - } - #loginbox.hasDisclaimer { background: white url(../graphics/ktbg.png) bottom left repeat-x; - width: 564px; } #loginbox_skin.hasDisclaimer { background: white url(../graphics/ktbg.png) bottom left repeat-x; - width: 564px; } #formbox { - border: 0; padding: 0; margin: 0; + border: 0; + padding: 0; + margin: 0; width: 252px; float: left; } @@ -228,6 +74,7 @@ #disclaimerbox p { margin-top: 0; + margin-left: 5px; margin-bottom: 1em; } @@ -265,6 +112,7 @@ .descriptiveText { + margin-top: 5px; color: #666; clear: both; } @@ -280,17 +128,22 @@ } /* block level. */ -.ktError -{ - padding: 0 1em; - border: 1px solid #ffc21e; - margin: 0.5em 0; - background: #ffdd80; +.ktError { + background: #ffdd80 url(../../resources/graphics/error_toprepeat.png) top left repeat-x; + border: 1px solid #FFC21E; + margin: 20px auto; } .ktError p { + margin-left: 20px; + padding-left: 25px; + background: #ffdd80 url(../../thirdparty/icon-theme/16x16/status/dialog-warning.png) center left no-repeat; +} + +.ktError span { + margin-left: 20px; padding-left: 25px; - background: transparent url(../../thirdparty/icon-theme/16x16/status/dialog-warning.png) center left no-repeat; + background: #ffdd80 url(../../thirdparty/icon-theme/16x16/status/dialog-warning.png) center left no-repeat; } .floatClear diff --git a/resources/graphics/dashlet_toprepeat.png b/resources/graphics/dashlet_toprepeat.png index 3ef6bc6..72542f0 100644 Binary files a/resources/graphics/dashlet_toprepeat.png and b/resources/graphics/dashlet_toprepeat.png differ diff --git a/resources/graphics/error_bottomleft.gif b/resources/graphics/error_bottomleft.gif deleted file mode 100644 index 3da8edf..0000000 Binary files a/resources/graphics/error_bottomleft.gif and /dev/null differ diff --git a/resources/graphics/error_bottomleft.png b/resources/graphics/error_bottomleft.png deleted file mode 100644 index b943689..0000000 Binary files a/resources/graphics/error_bottomleft.png and /dev/null differ diff --git a/resources/graphics/error_bottomrepeat.gif b/resources/graphics/error_bottomrepeat.gif deleted file mode 100644 index 73c3ebc..0000000 Binary files a/resources/graphics/error_bottomrepeat.gif and /dev/null differ diff --git a/resources/graphics/error_bottomrepeat.png b/resources/graphics/error_bottomrepeat.png deleted file mode 100644 index b622345..0000000 Binary files a/resources/graphics/error_bottomrepeat.png and /dev/null differ diff --git a/resources/graphics/error_bottomright.gif b/resources/graphics/error_bottomright.gif deleted file mode 100644 index 0637f5d..0000000 Binary files a/resources/graphics/error_bottomright.gif and /dev/null differ diff --git a/resources/graphics/error_bottomright.png b/resources/graphics/error_bottomright.png deleted file mode 100644 index 1ee02ff..0000000 Binary files a/resources/graphics/error_bottomright.png and /dev/null differ diff --git a/resources/graphics/error_leftrepeat.gif b/resources/graphics/error_leftrepeat.gif deleted file mode 100644 index d058285..0000000 Binary files a/resources/graphics/error_leftrepeat.gif and /dev/null differ diff --git a/resources/graphics/error_leftrepeat.png b/resources/graphics/error_leftrepeat.png deleted file mode 100644 index 362b72a..0000000 Binary files a/resources/graphics/error_leftrepeat.png and /dev/null differ diff --git a/resources/graphics/error_rightrepeat.gif b/resources/graphics/error_rightrepeat.gif deleted file mode 100644 index 0c52c97..0000000 Binary files a/resources/graphics/error_rightrepeat.gif and /dev/null differ diff --git a/resources/graphics/error_rightrepeat.png b/resources/graphics/error_rightrepeat.png deleted file mode 100644 index 954807c..0000000 Binary files a/resources/graphics/error_rightrepeat.png and /dev/null differ diff --git a/resources/graphics/error_topleft.gif b/resources/graphics/error_topleft.gif deleted file mode 100644 index efa3d13..0000000 Binary files a/resources/graphics/error_topleft.gif and /dev/null differ diff --git a/resources/graphics/error_topleft.png b/resources/graphics/error_topleft.png deleted file mode 100644 index eb94fd3..0000000 Binary files a/resources/graphics/error_topleft.png and /dev/null differ diff --git a/resources/graphics/error_topleft_small.gif b/resources/graphics/error_topleft_small.gif deleted file mode 100644 index 29a955a..0000000 Binary files a/resources/graphics/error_topleft_small.gif and /dev/null differ diff --git a/resources/graphics/error_topleft_small.png b/resources/graphics/error_topleft_small.png deleted file mode 100644 index 24fce1f..0000000 Binary files a/resources/graphics/error_topleft_small.png and /dev/null differ diff --git a/resources/graphics/error_toprepeat.gif b/resources/graphics/error_toprepeat.gif deleted file mode 100644 index daf10ee..0000000 Binary files a/resources/graphics/error_toprepeat.gif and /dev/null differ diff --git a/resources/graphics/error_toprepeat.png b/resources/graphics/error_toprepeat.png index b11dd26..2c7f97f 100644 Binary files a/resources/graphics/error_toprepeat.png and b/resources/graphics/error_toprepeat.png differ diff --git a/resources/graphics/error_topright.gif b/resources/graphics/error_topright.gif deleted file mode 100644 index 80447a3..0000000 Binary files a/resources/graphics/error_topright.gif and /dev/null differ diff --git a/resources/graphics/error_topright.png b/resources/graphics/error_topright.png deleted file mode 100644 index 72c5360..0000000 Binary files a/resources/graphics/error_topright.png and /dev/null differ diff --git a/resources/graphics/error_topright_small.gif b/resources/graphics/error_topright_small.gif deleted file mode 100644 index 0e23763..0000000 Binary files a/resources/graphics/error_topright_small.gif and /dev/null differ diff --git a/resources/graphics/error_topright_small.png b/resources/graphics/error_topright_small.png deleted file mode 100644 index 3f5ffcd..0000000 Binary files a/resources/graphics/error_topright_small.png and /dev/null differ diff --git a/resources/graphics/footer_bg.png b/resources/graphics/footer_bg.png deleted file mode 100644 index 0a149d2..0000000 Binary files a/resources/graphics/footer_bg.png and /dev/null differ diff --git a/resources/graphics/footer_bg_disclaimer.png b/resources/graphics/footer_bg_disclaimer.png deleted file mode 100644 index 1d1b571..0000000 Binary files a/resources/graphics/footer_bg_disclaimer.png and /dev/null differ diff --git a/resources/graphics/footer_left.png b/resources/graphics/footer_left.png deleted file mode 100644 index a625b5f..0000000 Binary files a/resources/graphics/footer_left.png and /dev/null differ diff --git a/resources/graphics/footer_left_disclaimer.png b/resources/graphics/footer_left_disclaimer.png deleted file mode 100644 index e91cc3d..0000000 Binary files a/resources/graphics/footer_left_disclaimer.png and /dev/null differ diff --git a/resources/graphics/footer_right.png b/resources/graphics/footer_right.png deleted file mode 100644 index c7ff631..0000000 Binary files a/resources/graphics/footer_right.png and /dev/null differ diff --git a/resources/graphics/footer_right_disclaimer.png b/resources/graphics/footer_right_disclaimer.png deleted file mode 100644 index e635423..0000000 Binary files a/resources/graphics/footer_right_disclaimer.png and /dev/null differ diff --git a/resources/graphics/info_bottomleft.gif b/resources/graphics/info_bottomleft.gif deleted file mode 100644 index f042519..0000000 Binary files a/resources/graphics/info_bottomleft.gif and /dev/null differ diff --git a/resources/graphics/info_bottomleft.png b/resources/graphics/info_bottomleft.png deleted file mode 100644 index aca85fb..0000000 Binary files a/resources/graphics/info_bottomleft.png and /dev/null differ diff --git a/resources/graphics/info_bottomrepeat.gif b/resources/graphics/info_bottomrepeat.gif deleted file mode 100644 index baad1e5..0000000 Binary files a/resources/graphics/info_bottomrepeat.gif and /dev/null differ diff --git a/resources/graphics/info_bottomrepeat.png b/resources/graphics/info_bottomrepeat.png deleted file mode 100644 index b959ad8..0000000 Binary files a/resources/graphics/info_bottomrepeat.png and /dev/null differ diff --git a/resources/graphics/info_bottomright.gif b/resources/graphics/info_bottomright.gif deleted file mode 100644 index 270a6fb..0000000 Binary files a/resources/graphics/info_bottomright.gif and /dev/null differ diff --git a/resources/graphics/info_bottomright.png b/resources/graphics/info_bottomright.png deleted file mode 100644 index c1fa3a3..0000000 Binary files a/resources/graphics/info_bottomright.png and /dev/null differ diff --git a/resources/graphics/info_leftrepeat.gif b/resources/graphics/info_leftrepeat.gif deleted file mode 100644 index f19990b..0000000 Binary files a/resources/graphics/info_leftrepeat.gif and /dev/null differ diff --git a/resources/graphics/info_leftrepeat.png b/resources/graphics/info_leftrepeat.png deleted file mode 100644 index fbe03f1..0000000 Binary files a/resources/graphics/info_leftrepeat.png and /dev/null differ diff --git a/resources/graphics/info_rightrepeat.gif b/resources/graphics/info_rightrepeat.gif deleted file mode 100644 index de78fcc..0000000 Binary files a/resources/graphics/info_rightrepeat.gif and /dev/null differ diff --git a/resources/graphics/info_rightrepeat.png b/resources/graphics/info_rightrepeat.png deleted file mode 100644 index 35f2e1c..0000000 Binary files a/resources/graphics/info_rightrepeat.png and /dev/null differ diff --git a/resources/graphics/info_topleft.gif b/resources/graphics/info_topleft.gif deleted file mode 100644 index 8670ba7..0000000 Binary files a/resources/graphics/info_topleft.gif and /dev/null differ diff --git a/resources/graphics/info_topleft.png b/resources/graphics/info_topleft.png deleted file mode 100644 index 7c3ec27..0000000 Binary files a/resources/graphics/info_topleft.png and /dev/null differ diff --git a/resources/graphics/info_topleft_small.gif b/resources/graphics/info_topleft_small.gif deleted file mode 100644 index 444fa78..0000000 Binary files a/resources/graphics/info_topleft_small.gif and /dev/null differ diff --git a/resources/graphics/info_topleft_small.png b/resources/graphics/info_topleft_small.png deleted file mode 100644 index dfd8c7c..0000000 Binary files a/resources/graphics/info_topleft_small.png and /dev/null differ diff --git a/resources/graphics/info_toprepeat.gif b/resources/graphics/info_toprepeat.gif deleted file mode 100644 index 358b810..0000000 Binary files a/resources/graphics/info_toprepeat.gif and /dev/null differ diff --git a/resources/graphics/info_toprepeat.png b/resources/graphics/info_toprepeat.png index a016a75..566007b 100644 Binary files a/resources/graphics/info_toprepeat.png and b/resources/graphics/info_toprepeat.png differ diff --git a/resources/graphics/info_topright.gif b/resources/graphics/info_topright.gif deleted file mode 100644 index 0d67ef9..0000000 Binary files a/resources/graphics/info_topright.gif and /dev/null differ diff --git a/resources/graphics/info_topright.png b/resources/graphics/info_topright.png deleted file mode 100644 index a3a1ec8..0000000 Binary files a/resources/graphics/info_topright.png and /dev/null differ diff --git a/resources/graphics/info_topright_small.gif b/resources/graphics/info_topright_small.gif deleted file mode 100644 index 8b76f1c..0000000 Binary files a/resources/graphics/info_topright_small.gif and /dev/null differ diff --git a/resources/graphics/info_topright_small.png b/resources/graphics/info_topright_small.png deleted file mode 100644 index 276a7e9..0000000 Binary files a/resources/graphics/info_topright_small.png and /dev/null differ diff --git a/resources/graphics/page_border_bottomleft.gif b/resources/graphics/page_border_bottomleft.gif deleted file mode 100644 index 5c14ca7..0000000 Binary files a/resources/graphics/page_border_bottomleft.gif and /dev/null differ diff --git a/resources/graphics/page_border_bottomrepeat.gif b/resources/graphics/page_border_bottomrepeat.gif deleted file mode 100644 index 266ea4f..0000000 Binary files a/resources/graphics/page_border_bottomrepeat.gif and /dev/null differ diff --git a/resources/graphics/page_border_bottomright.gif b/resources/graphics/page_border_bottomright.gif deleted file mode 100644 index b5658fe..0000000 Binary files a/resources/graphics/page_border_bottomright.gif and /dev/null differ diff --git a/resources/graphics/page_border_leftrepeat.gif b/resources/graphics/page_border_leftrepeat.gif deleted file mode 100644 index aed3b9d..0000000 Binary files a/resources/graphics/page_border_leftrepeat.gif and /dev/null differ diff --git a/resources/graphics/page_border_rightborder.gif b/resources/graphics/page_border_rightborder.gif deleted file mode 100644 index fce45e5..0000000 Binary files a/resources/graphics/page_border_rightborder.gif and /dev/null differ diff --git a/resources/graphics/page_border_rightrepeat.gif b/resources/graphics/page_border_rightrepeat.gif deleted file mode 100644 index 6e80c83..0000000 Binary files a/resources/graphics/page_border_rightrepeat.gif and /dev/null differ diff --git a/resources/graphics/page_border_topleft.gif b/resources/graphics/page_border_topleft.gif deleted file mode 100644 index 3513fae..0000000 Binary files a/resources/graphics/page_border_topleft.gif and /dev/null differ diff --git a/resources/graphics/page_border_toprepeat.gif b/resources/graphics/page_border_toprepeat.gif deleted file mode 100644 index 0b441eb..0000000 Binary files a/resources/graphics/page_border_toprepeat.gif and /dev/null differ diff --git a/resources/graphics/page_border_topright.gif b/resources/graphics/page_border_topright.gif deleted file mode 100644 index a534449..0000000 Binary files a/resources/graphics/page_border_topright.gif and /dev/null differ diff --git a/resources/graphics/portlet_bg.gif b/resources/graphics/portlet_bg.gif index 426d5ae..1076ab7 100644 Binary files a/resources/graphics/portlet_bg.gif and b/resources/graphics/portlet_bg.gif differ diff --git a/resources/graphics/portlet_bg.png b/resources/graphics/portlet_bg.png index 129efe8..cdc9f4f 100644 Binary files a/resources/graphics/portlet_bg.png and b/resources/graphics/portlet_bg.png differ diff --git a/resources/graphics/portlet_bg_collapsed.gif b/resources/graphics/portlet_bg_collapsed.gif index 22599f3..800bcf1 100644 Binary files a/resources/graphics/portlet_bg_collapsed.gif and b/resources/graphics/portlet_bg_collapsed.gif differ diff --git a/resources/graphics/portlet_bg_collapsed.png b/resources/graphics/portlet_bg_collapsed.png index 2c94fee..bfc2a1e 100644 Binary files a/resources/graphics/portlet_bg_collapsed.png and b/resources/graphics/portlet_bg_collapsed.png differ diff --git a/resources/graphics/portlet_borderbottom.png b/resources/graphics/portlet_borderbottom.png deleted file mode 100644 index 2b21ceb..0000000 Binary files a/resources/graphics/portlet_borderbottom.png and /dev/null differ diff --git a/resources/graphics/portlet_borderrepeat.png b/resources/graphics/portlet_borderrepeat.png deleted file mode 100644 index 69f1abc..0000000 Binary files a/resources/graphics/portlet_borderrepeat.png and /dev/null differ diff --git a/resources/graphics/portlet_borderright.png b/resources/graphics/portlet_borderright.png deleted file mode 100644 index 851396b..0000000 Binary files a/resources/graphics/portlet_borderright.png and /dev/null differ diff --git a/resources/graphics/portlet_borderright_future.png b/resources/graphics/portlet_borderright_future.png deleted file mode 100644 index edc6ceb..0000000 Binary files a/resources/graphics/portlet_borderright_future.png and /dev/null differ diff --git a/resources/graphics/portlet_corner_bottomleft.gif b/resources/graphics/portlet_corner_bottomleft.gif deleted file mode 100644 index 798ccf0..0000000 Binary files a/resources/graphics/portlet_corner_bottomleft.gif and /dev/null differ diff --git a/resources/graphics/portlet_corner_bottomleft.png b/resources/graphics/portlet_corner_bottomleft.png deleted file mode 100644 index dfdf6a8..0000000 Binary files a/resources/graphics/portlet_corner_bottomleft.png and /dev/null differ diff --git a/resources/graphics/portlet_corner_bottomright.gif b/resources/graphics/portlet_corner_bottomright.gif deleted file mode 100644 index 127327f..0000000 Binary files a/resources/graphics/portlet_corner_bottomright.gif and /dev/null differ diff --git a/resources/graphics/portlet_corner_bottomright.png b/resources/graphics/portlet_corner_bottomright.png deleted file mode 100644 index d144d08..0000000 Binary files a/resources/graphics/portlet_corner_bottomright.png and /dev/null differ diff --git a/resources/graphics/portlet_corner_topleft.gif b/resources/graphics/portlet_corner_topleft.gif deleted file mode 100644 index 01a4f71..0000000 Binary files a/resources/graphics/portlet_corner_topleft.gif and /dev/null differ diff --git a/resources/graphics/portlet_corner_topleft.png b/resources/graphics/portlet_corner_topleft.png deleted file mode 100644 index e2ade67..0000000 Binary files a/resources/graphics/portlet_corner_topleft.png and /dev/null differ diff --git a/resources/graphics/portlet_corner_topleft_collapsed.gif b/resources/graphics/portlet_corner_topleft_collapsed.gif deleted file mode 100644 index 06d4623..0000000 Binary files a/resources/graphics/portlet_corner_topleft_collapsed.gif and /dev/null differ diff --git a/resources/graphics/portlet_corner_topleft_collapsed.png b/resources/graphics/portlet_corner_topleft_collapsed.png deleted file mode 100644 index efe0bcf..0000000 Binary files a/resources/graphics/portlet_corner_topleft_collapsed.png and /dev/null differ diff --git a/resources/graphics/portlet_corner_topright.gif b/resources/graphics/portlet_corner_topright.gif deleted file mode 100644 index 4acd3c6..0000000 Binary files a/resources/graphics/portlet_corner_topright.gif and /dev/null differ diff --git a/resources/graphics/portlet_corner_topright.png b/resources/graphics/portlet_corner_topright.png deleted file mode 100644 index 7caaf52..0000000 Binary files a/resources/graphics/portlet_corner_topright.png and /dev/null differ diff --git a/resources/graphics/portlet_corner_topright_collapsed.gif b/resources/graphics/portlet_corner_topright_collapsed.gif deleted file mode 100644 index 13d58ed..0000000 Binary files a/resources/graphics/portlet_corner_topright_collapsed.gif and /dev/null differ diff --git a/resources/graphics/portlet_corner_topright_collapsed.png b/resources/graphics/portlet_corner_topright_collapsed.png deleted file mode 100644 index 41881b7..0000000 Binary files a/resources/graphics/portlet_corner_topright_collapsed.png and /dev/null differ diff --git a/templates/kt3/dashboard.smarty b/templates/kt3/dashboard.smarty index 0778507..22ac03a 100644 --- a/templates/kt3/dashboard.smarty +++ b/templates/kt3/dashboard.smarty @@ -1,27 +1,8 @@
{foreach item=oDashlet from=$dashlets_left}
-
- {if $oDashlet->sClass === "ktBlock"} -
-
-
-
- {/if} - - {if $oDashlet->sClass === "ktError"} -
-
-
-
- {/if} - - {if $oDashlet->sClass === "ktInfo"} -
-
-
-
- {/if} +
+
    @@ -32,33 +13,7 @@
{$oDashlet->render()}
- {if $oDashlet->sClass === "ktBlock"} -
-
-
- -
-
-
- {/if} - {if $oDashlet->sClass === "ktError"} -
-
-
- -
-
-
- {/if} - {if $oDashlet->sClass === "ktInfo"} -
-
-
- -
-
-
- {/if} +
{/foreach} @@ -68,25 +23,8 @@
{foreach item=oDashlet from=$dashlets_right}
-
- {if $oDashlet->sClass === "ktBlock"} -
-
-
-
- {/if} - {if $oDashlet->sClass === "ktError"} -
-
-
-
- {/if} - {if $oDashlet->sClass === "ktInfo"} -
-
-
-
- {/if} +
+
    @@ -97,33 +35,7 @@ {$oDashlet->render()}
- {if $oDashlet->sClass === "ktBlock"} -
-
-
- -
-
-
- {/if} - {if $oDashlet->sClass === "ktError"} -
-
-
- -
-
-
- {/if} - {if $oDashlet->sClass === "ktInfo"} -
-
-
- -
-
-
- {/if} +
{/foreach} diff --git a/templates/kt3/standard_page.smarty b/templates/kt3/standard_page.smarty index a5f60b1..7c0a2f8 100644 --- a/templates/kt3/standard_page.smarty +++ b/templates/kt3/standard_page.smarty @@ -63,9 +63,6 @@ show_portlets)}class="noportlets"{/if}>
-
-
-
{if $config->get("ui/mainLogo") != ''} @@ -79,44 +76,44 @@
{if (!$page->hide_navbar)} - + {/if} {if (!$page->hide_section)}
-
- {foreach item=oPortlet from=$page->portlets} - {assign var=portlet_output value=$oPortlet->render() } - {if $portlet_output} -
-

{$oPortlet->getTitle()}

-
-
-
- {$portlet_output} -
-
- {/if} - {/foreach} -
-
-
content_class}class="{$page->content_class}"{/if}> - - {if (!$page->hide_section)} -

{$page->componentLabel} - {if ($page->getHelpURL() != null)}Help {/if} -

- {/if} - - - {if (!empty($page->errStack))} -
-
-
- {foreach item=sError from=$page->errStack} -

{$sError}

- {/foreach} -
-
-
- -
-
-
-
- {/if} - - {if (!empty($page->infoStack))} -
-
-
- {foreach item=sInfo from=$page->infoStack} -

{$sInfo}

- {/foreach} -
-
-
- -
-
-
-
- {/if} - - {$page->contents} -
-
+
+ + + + +
+
+ {foreach item=oPortlet from=$page->portlets} + {assign var=portlet_output value=$oPortlet->render() } + {if $portlet_output} +
+

{$oPortlet->getTitle()}

+
+ {$portlet_output} +
+
+ {/if} + {/foreach} +
+
+ 		+
content_class}class="{$page->content_class}"{/if}> + {if (!$page->hide_section)} +

{$page->componentLabel} + {if ($page->getHelpURL() != null)}Help {/if} +

+ {/if} + + + {if (!empty($page->errStack))} +
+ {foreach item=sError from=$page->errStack} + {$sError} + {/foreach} +
+ {/if} + + {if (!empty($page->infoStack))} +
+ {foreach item=sInfo from=$page->infoStack} + {$sInfo} + {/foreach} +
+ {/if} + + {$page->contents} +
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- -
-
-
-
-
- {i18n}© 2007 The Jam Warehouse Software (Pty) Ltd. All Rights Reserved{/i18n} - {i18n arg_timing=$page->getReqTime()}Request created in #timing#s{/i18n}
- {i18n arg_version="$versionname" arg_appname="$appname"}#appname# Version: #version#{/i18n} -

{$page->getDisclaimer()}

-
- {if $config->get("ui/poweredByDisabled") == '0'} - - - {/if} +
+ + + + + +
+ {i18n}© 2007 The Jam Warehouse Software (Pty) Ltd. All Rights Reserved{/i18n} +

{$page->getDisclaimer()}

+ 		+ {i18n arg_timing=$page->getReqTime()}Request created in #timing#s{/i18n}
+ {i18n arg_version="$versionname" arg_appname="$appname"}#appname# Version: #version#{/i18n}
+ {if $config->get("ui/poweredByDisabled") == '0'} + {$config->get( + {/if} +
diff --git a/templates/ktcore/action/view_roles.smarty b/templates/ktcore/action/view_roles.smarty index c72e9f4..e9e3f4e 100644 --- a/templates/ktcore/action/view_roles.smarty +++ b/templates/ktcore/action/view_roles.smarty @@ -28,7 +28,7 @@ {/foreach} {else} -

{i18n}No roles defined in the Role Administration area.{/i18n}

+{i18n}No roles defined in the Role Administration area.{/i18n} {/if} diff --git a/templates/ktcore/authentication/manage.smarty b/templates/ktcore/authentication/manage.smarty index fc65e03..324077d 100644 --- a/templates/ktcore/authentication/manage.smarty +++ b/templates/ktcore/authentication/manage.smarty @@ -12,13 +12,13 @@ specify additional sources of authentication data.{/i18n}

ktInline">{i18n}Add authentication source{/i18n}{i18n}Add a new authentication source{/i18n}.

{else} -

{i18n}Only the standard database authentication is currently available. +

{i18n}Only the standard database authentication is currently available. If you need to use a different authentication type (e.g. LDAP) you will need to -ensure that the Plugin is enabled.{/i18n}

+ensure that the Plugin is enabled.{/i18n}
{/if} {if empty($sources)} -

{i18n}No additional authentication sources have been defined.{/i18n}

+
{i18n}No additional authentication sources have been defined.{/i18n}
{else} diff --git a/templates/ktcore/dashlets/checkedout.smarty b/templates/ktcore/dashlets/checkedout.smarty index 510f617..777c171 100644 --- a/templates/ktcore/dashlets/checkedout.smarty +++ b/templates/ktcore/dashlets/checkedout.smarty @@ -6,5 +6,5 @@ {/foreach} {else} -

{i18n}You have no documents which are currently checked out.{/i18n}

+
{i18n}You have no documents which are currently checked out.{/i18n}
{/if} diff --git a/templates/ktcore/dashlets/indexer_status.smarty b/templates/ktcore/dashlets/indexer_status.smarty index 477fcda..5cad2a2 100644 --- a/templates/ktcore/dashlets/indexer_status.smarty +++ b/templates/ktcore/dashlets/indexer_status.smarty @@ -13,8 +13,8 @@ {else} {if empty($transforms)} -
-

{i18n}All indexers claim to be working correctly.{/i18n}

+
+ {i18n}All indexers claim to be working correctly.{/i18n}
{else}
diff --git a/templates/ktcore/dashlets/notifications.smarty b/templates/ktcore/dashlets/notifications.smarty index a1a7adc..e6253e4 100644 --- a/templates/ktcore/dashlets/notifications.smarty +++ b/templates/ktcore/dashlets/notifications.smarty @@ -18,7 +18,7 @@ kt:deleteMessage="{i18n}Are you sure you wish to clear all notifications?{/i18n}" class="ktLinkDelete">{i18n}Clear all notifications{/i18n} {else} -

{i18n}No items require your attention.{/i18n}

+
{i18n}No items require your attention.{/i18n}
{/if} \ No newline at end of file diff --git a/templates/ktcore/document/admin/checkoutlisting.smarty b/templates/ktcore/document/admin/checkoutlisting.smarty index d59268a..97f8a48 100644 --- a/templates/ktcore/document/admin/checkoutlisting.smarty +++ b/templates/ktcore/document/admin/checkoutlisting.smarty @@ -34,7 +34,7 @@ $oUser->getName(); } else { print _kt("N/A"); }{/php}
{else} -
-

{i18n}No documents are currently checked out.{/i18n}

+
+ {i18n}No documents are currently checked out.{/i18n}
{/if} diff --git a/templates/ktcore/document/admin/dearchiveconfirmlist.smarty b/templates/ktcore/document/admin/dearchiveconfirmlist.smarty index 2a835e5..2c68298 100644 --- a/templates/ktcore/document/admin/dearchiveconfirmlist.smarty +++ b/templates/ktcore/document/admin/dearchiveconfirmlist.smarty @@ -1,8 +1,8 @@

{i18n}Confirm De-archival{/i18n}

-

{i18n}Note{/i18n}: {i18n}please +

{i18n}Note{/i18n}: {i18n}please confirm that you want to restore these documents from an archived -state.{/i18n}

+state.{/i18n}
{if (!empty($documents))} @@ -32,5 +32,5 @@ state.{/i18n}

{else} -

{i18n}No documents were selected.{/i18n}

+
{i18n}No documents were selected.{/i18n}
{/if} diff --git a/templates/ktcore/document/admin/deletedlist.smarty b/templates/ktcore/document/admin/deletedlist.smarty index aef7079..310b96a 100644 --- a/templates/ktcore/document/admin/deletedlist.smarty +++ b/templates/ktcore/document/admin/deletedlist.smarty @@ -67,5 +67,5 @@ can restore them as necessary.{/i18n}

{else} -

{i18n}No documents are marked as deleted.{/i18n}

+
{i18n}No documents are marked as deleted.{/i18n}
{/if} diff --git a/templates/ktcore/document/admin/expungeconfirmlist.smarty b/templates/ktcore/document/admin/expungeconfirmlist.smarty index 8a6e203..c50843c 100644 --- a/templates/ktcore/document/admin/expungeconfirmlist.smarty +++ b/templates/ktcore/document/admin/expungeconfirmlist.smarty @@ -1,7 +1,7 @@

{i18n}Confirm Expunge{/i18n}

-

{i18n}Note{/i18n}: {i18n}please -confirm that you want to delete these documents.{/i18n}

+
{i18n}Note{/i18n}: {i18n}please +confirm that you want to delete these documents.{/i18n}
{if (!empty($documents))} @@ -32,5 +32,5 @@ confirm that you want to delete these documents.{/i18n}

{else} -

{i18n}No documents were selected.{/i18n}

+
{i18n}No documents were selected.{/i18n}
{/if} diff --git a/templates/ktcore/document/admin/restoreconfirmlist.smarty b/templates/ktcore/document/admin/restoreconfirmlist.smarty index 83edd41..1b1b6d0 100644 --- a/templates/ktcore/document/admin/restoreconfirmlist.smarty +++ b/templates/ktcore/document/admin/restoreconfirmlist.smarty @@ -1,7 +1,7 @@

{i18n}Confirm Restore{/i18n}

-

{i18n}Note{/i18n}: {i18n}please -confirm that you want to restore these documents.{/i18n}

+
{i18n}Note{/i18n}: {i18n}please +confirm that you want to restore these documents.{/i18n}
{if (!empty($documents))} @@ -33,5 +33,5 @@ confirm that you want to restore these documents.{/i18n}

{else} -

{i18n}No documents were selected.{/i18n}

+
{i18n}No documents were selected.{/i18n}
{/if} diff --git a/templates/ktcore/document/cleanup.smarty b/templates/ktcore/document/cleanup.smarty index f79b814..7829556 100644 --- a/templates/ktcore/document/cleanup.smarty +++ b/templates/ktcore/document/cleanup.smarty @@ -34,5 +34,5 @@ which you should investigate.{/i18n}

{/if} {else} -

{i18n}No problems found - database is consistent with the contents of the repository.{/i18n}

+
{i18n}No problems found - database is consistent with the contents of the repository.{/i18n}
{/if} diff --git a/templates/ktcore/document/compare.smarty b/templates/ktcore/document/compare.smarty index 8e2403f..bd970d5 100644 --- a/templates/ktcore/document/compare.smarty +++ b/templates/ktcore/document/compare.smarty @@ -7,10 +7,10 @@ {capture assign=to} {$comparison_document->getMajorVersionNumber()}.{$comparison_document->getMinorVersionNumber()} ({$comparison_document->getMetadataVersion()}) {/capture} -

+

{i18n arg_from=$from arg_to=$to}showing comparison between versions #from# and #to#. {/i18n} {i18n}View current version{/i18n}. -

+
{if ($document_data.is_manufactured)}

{i18n}Please diff --git a/templates/ktcore/document/document_permissions.smarty b/templates/ktcore/document/document_permissions.smarty index 03d710b..5556f61 100644 --- a/templates/ktcore/document/document_permissions.smarty +++ b/templates/ktcore/document/document_permissions.smarty @@ -11,7 +11,7 @@ permissions are not shown.{/i18n}

{/if} {if ((empty($roles) && empty($groups) && empty($users)))} -

{i18n}No roles or groups have been defined or have permissions.{/i18n}

+
{i18n}No roles or groups have been defined or have permissions.{/i18n}
{else} diff --git a/templates/ktcore/document/resolved_permissions_user.smarty b/templates/ktcore/document/resolved_permissions_user.smarty index 4e4db8b..3bda91d 100644 --- a/templates/ktcore/document/resolved_permissions_user.smarty +++ b/templates/ktcore/document/resolved_permissions_user.smarty @@ -9,7 +9,7 @@ document due to membership of a group, or fulfilling a specific role on this document.{/i18n}

{if (empty($users)) } -

{i18n}No users have permissions on this item.{/i18n}

+
{i18n}No users have permissions on this item.{/i18n}
{else}
diff --git a/templates/ktcore/document/view.smarty b/templates/ktcore/document/view.smarty index fe7eb83..2630cde 100644 --- a/templates/ktcore/document/view.smarty +++ b/templates/ktcore/document/view.smarty @@ -3,44 +3,35 @@ {if ($document->getIsCheckedOut() == 1)} {capture assign=checkout_user}{$sCheckoutUser}{/capture} {if ($isCheckoutUser)} -
-
-
-

{i18n}This document is currently checked out by you. If this is incorrect, or you no longer need to make changes to it, please cancel the checkout.{/i18n}

-
-
-
- -
-
-
+
+ {i18n}This document is currently checked out by you. If this is incorrect, or you no longer need to make changes to it, please cancel the checkout.{/i18n}
{else} {if ($canCheckin)} -
-

{i18n arg_checkoutuser=$checkout_user}This document is currently checked out by #checkoutuser#, but you -have sufficient priviledges to cancel their checkout.{/i18n}

+
+{i18n arg_checkoutuser=$checkout_user}This document is currently checked out by #checkoutuser#, but you +have sufficient priviledges to cancel their checkout.{/i18n}
{else} -
-

{i18n arg_checkoutuser=$checkout_user arg_appname="$appname"}This document is currently checked out by #checkoutuser#. You cannot make +

+ {i18n arg_checkoutuser=$checkout_user arg_appname="$appname"}This document is currently checked out by #checkoutuser#. You cannot make changes until that user checks it in. If you have urgent modifications to make, please -contact your #appname# Administrator.{/i18n}

+contact your #appname# Administrator.{/i18n}
{/if} {/if} {/if} {if ($document->getImmutable() == true)} -
-

{i18n}This document is immutable. No further content changes can be +

+ {i18n}This document is immutable. No further content changes can be made to this document, and only administrators (in administration mode) can make changes to the metadata or can move or delete it.{/i18n} {if 1} {i18n}If you require assistance from an administrator to perform one of these tasks, use the Request Assistance action.{/i18n} {/if} -

+
{/if} diff --git a/templates/ktcore/documenttypes/edit.smarty b/templates/ktcore/documenttypes/edit.smarty index a33a4c3..26d07e1 100644 --- a/templates/ktcore/documenttypes/edit.smarty +++ b/templates/ktcore/documenttypes/edit.smarty @@ -39,7 +39,7 @@ {else} -

{i18n}No fieldsets are currently associated with this type.{/i18n}

+
{i18n}No fieldsets are currently associated with this type.{/i18n}
{ /if } { if $bAvailableFieldsets } @@ -58,6 +58,6 @@ {elseif !$bAnyFieldsets} -

{i18n}No fieldsets are available to be added. To add a fieldset, please go to -DMS Administration{/i18n} » {i18n}Document Metadata and Workflow Configuration{/i18n} » {i18n}Document Field Management{/i18n}

+
{i18n}No fieldsets are available to be added. To add a fieldset, please go to +DMS Administration{/i18n} » {i18n}Document Metadata and Workflow Configuration{/i18n} » {i18n}Document Field Management{/i18n}
{ /if } diff --git a/templates/ktcore/folder/permissions.smarty b/templates/ktcore/folder/permissions.smarty index 0c2ffcd..2491e2d 100644 --- a/templates/ktcore/folder/permissions.smarty +++ b/templates/ktcore/folder/permissions.smarty @@ -6,7 +6,7 @@ {* check if there are roles etc *} {if ((empty($roles) && empty($groups)))} -

{i18n}No roles or groups have been defined. Permissions can only be allocated to roles and groups.{/i18n}

+
{i18n}No roles or groups have been defined. Permissions can only be allocated to roles and groups.{/i18n}
{else} {* otherwise continue *} @@ -15,11 +15,11 @@

{if ($can_inherit)} -
-

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

+{i18n}This folder defines its own permissions.{/i18n} {i18n}Inherit permissions{/i18n} + href="{addQS context=$context}action=inheritPermissions{/addQS}">{i18n}Inherit permissions{/i18n}
{/if} diff --git a/templates/ktcore/folder/resolved_permissions.smarty b/templates/ktcore/folder/resolved_permissions.smarty index 31c1d2a..ca77b2a 100644 --- a/templates/ktcore/folder/resolved_permissions.smarty +++ b/templates/ktcore/folder/resolved_permissions.smarty @@ -5,7 +5,7 @@ this specific folder. Only the roles or groups which have permissions assigned are shown.{/i18n}

{if (empty($roles) && empty($groups) && empty($users)) } -

{i18n}No roles, groups, or users have been defined or have permissions.{/i18n}

+
{i18n}No roles, groups, or users have been defined or have permissions.{/i18n}
{else}
diff --git a/templates/ktcore/folder/resolved_permissions_user.smarty b/templates/ktcore/folder/resolved_permissions_user.smarty index 26c6871..9b14260 100644 --- a/templates/ktcore/folder/resolved_permissions_user.smarty +++ b/templates/ktcore/folder/resolved_permissions_user.smarty @@ -9,7 +9,7 @@ folder due to membership of a group, or fulfilling a specific role on this folder.{/i18n}

{if (empty($users)) } -

{i18n}No users have permissions on this item.{/i18n}

+
{i18n}No users have permissions on this item.{/i18n}
{else} {if $edit} diff --git a/templates/ktcore/folder/roles.smarty b/templates/ktcore/folder/roles.smarty index e89da1e..453f0a3 100644 --- a/templates/ktcore/folder/roles.smarty +++ b/templates/ktcore/folder/roles.smarty @@ -6,8 +6,8 @@ to specific groups in particular areas of the document management system. {/i18n}

-

{i18n}Warning:{/i18n} {i18n}Please note that changing -role allocations may take a some time, depending on the number of folders below this one.{/i18n}

+
{i18n}Warning:{/i18n} {i18n}Please note that changing +role allocations may take a some time, depending on the number of folders below this one.{/i18n}
@@ -49,7 +49,7 @@ role allocations may take a some time, depending on the number of folders below {/foreach} {else} - + {/if}

{i18n}No roles defined in the Role Administration area.{/i18n}

{i18n}No roles defined in the Role Administration area.{/i18n}
diff --git a/templates/ktcore/folder/view_permissions.smarty b/templates/ktcore/folder/view_permissions.smarty index 9e085c1..f399c4b 100644 --- a/templates/ktcore/folder/view_permissions.smarty +++ b/templates/ktcore/folder/view_permissions.smarty @@ -13,15 +13,15 @@ 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 } @@ -29,7 +29,7 @@ assigned are shown.{/i18n}

{ /if } {if (empty($roles) && empty($groups) && empty($users)) } -

{i18n}No roles, groups, or users have been defined or have permissions.{/i18n}

+
{i18n}No roles, groups, or users have been defined or have permissions.{/i18n}
{else} diff --git a/templates/ktcore/forms/widgets/selection.smarty b/templates/ktcore/forms/widgets/selection.smarty index 4b8fdc8..8b85705 100644 --- a/templates/ktcore/forms/widgets/selection.smarty +++ b/templates/ktcore/forms/widgets/selection.smarty @@ -1,5 +1,5 @@ {if empty($vocab)} -

{$context->sEmptyMessage}

+
{$context->sEmptyMessage}
{else} - - - {if $config->get("ui/mainLogo") != ''} - {$config->get(
- {else} - {$appname}
- {/if} - - {if ($errorMessage == null)} -

{i18n}Please enter your details below to login.{/i18n}

- {else} -

{$errorMessage}

- {/if} - - - - - - - - - - -
- -
- - - {if ($disclaimer)} -
-

{$disclaimer}

+ +
+
+
+
+ + + + {if $config->get("ui/mainLogo") != ''} + {$config->get(
+ {else} + {$appname}
+ {/if} + {if ($errorMessage == null)} +

{i18n}Please enter your details below to login.{/i18n}

+ {else} +

{$errorMessage}

+ {/if} + + + + + + + +
+ +
+ +
+ {if ($disclaimer)} +
+

{$disclaimer}

+
+ {/if} +

+ {i18n arg_appname="$appname"}#appname# Version{/i18n}
{$versionName}
+ {i18n}© 2007 The Jam Warehouse Software (Pty) Ltd. All Rights Reserved{/i18n} +

+
+
+
- {/if} - - - {i18n arg_appname="$appname"}#appname# Version{/i18n}
{$versionName}
- {i18n}© 2007 The Jam Warehouse Software (Pty) Ltd. All Rights Reserved{/i18n} - -
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/templates/ktcore/manage_help.smarty b/templates/ktcore/manage_help.smarty index 82b69a6..96881b0 100644 --- a/templates/ktcore/manage_help.smarty +++ b/templates/ktcore/manage_help.smarty @@ -30,7 +30,7 @@ via the help system and click on customise this help file.{/i18
{else} -

{i18n}No help files have been customised.{/i18n}

+
{i18n}No help files have been customised.{/i18n}
{ /if } diff --git a/templates/ktcore/metadata/admin/edit_lookuptree.smarty b/templates/ktcore/metadata/admin/edit_lookuptree.smarty index 2eba332..c0238f5 100644 --- a/templates/ktcore/metadata/admin/edit_lookuptree.smarty +++ b/templates/ktcore/metadata/admin/edit_lookuptree.smarty @@ -52,8 +52,8 @@ are immediately stored, so when you are done simply navigate back to the field m those in subcategories of the subcategory). {/i18n}

-

{i18n}No free keywords. Use the "unlink" action on a keyword to -make it available.{/i18n}

+
{i18n}No free keywords. Use the "unlink" action on a keyword to +make it available.{/i18n}
{else}
diff --git a/templates/ktcore/metadata/conditional/conditional_admin_overview.smarty b/templates/ktcore/metadata/conditional/conditional_admin_overview.smarty index 73104d7..1ace2d8 100644 --- a/templates/ktcore/metadata/conditional/conditional_admin_overview.smarty +++ b/templates/ktcore/metadata/conditional/conditional_admin_overview.smarty @@ -8,7 +8,7 @@ values in the other fields. Only lookup fields can be added to

- {i18n}View Overview{/i18n} + {i18n}View Overview{/i18n} {i18n}View Overview{/i18n}

diff --git a/templates/ktcore/metadata/conditional/manageConditional.smarty b/templates/ktcore/metadata/conditional/manageConditional.smarty index 46c9ff8..89af21d 100644 --- a/templates/ktcore/metadata/conditional/manageConditional.smarty +++ b/templates/ktcore/metadata/conditional/manageConditional.smarty @@ -16,11 +16,11 @@ how the user was allowed to select the specific street (given another field).{/i {if ($oMasterField && empty($free_fields))} {if $sIncomplete} -
-

{i18n}This conditional fieldset is marked such that it +

+{i18n}This conditional fieldset is marked such that it cannot be used. The system automatically checks whether the fieldset is useable, and if not it will prevent it being used in a "conditional" fashion. Please correct -the issues identified below.{/i18n}

+the issues identified below.{/i18n}
{/if} diff --git a/templates/ktcore/metadata/editFieldset.smarty b/templates/ktcore/metadata/editFieldset.smarty index bf4e78b..7bc2ee5 100644 --- a/templates/ktcore/metadata/editFieldset.smarty +++ b/templates/ktcore/metadata/editFieldset.smarty @@ -109,7 +109,7 @@ to complete{/i18n}: {$sIncomplete|escape}

{else} {if $context->haveConditional()} -

{i18n}This fieldset cannot be made conditional, since it contains fields which are not lookup types.{/i18n}

+
{i18n}This fieldset cannot be made conditional, since it contains fields which are not lookup types.{/i18n}
{/if} {/if} diff --git a/templates/ktcore/misc/columns/edit_view.smarty b/templates/ktcore/misc/columns/edit_view.smarty index fdde0a7..0508464 100644 --- a/templates/ktcore/misc/columns/edit_view.smarty +++ b/templates/ktcore/misc/columns/edit_view.smarty @@ -28,7 +28,7 @@ have multiple copies of a given column in a specific view this is not recommende {else} -

{i18n}No columns have been added to this view{/i18n}

+
{i18n}No columns have been added to this view{/i18n}
{/if} diff --git a/templates/ktcore/misc/notification_overflow.smarty b/templates/ktcore/misc/notification_overflow.smarty index 06e455b..6a035da 100644 --- a/templates/ktcore/misc/notification_overflow.smarty +++ b/templates/ktcore/misc/notification_overflow.smarty @@ -13,5 +13,5 @@

{i18n arg_batch=$batch_html}Page: #batch#{/i18n}

{else} -

{i18n}No items require your attention{/i18n}

+
{i18n}No items require your attention{/i18n}
{/if} diff --git a/templates/ktcore/principals/roleadmin.smarty b/templates/ktcore/principals/roleadmin.smarty index d4dff51..5428264 100644 --- a/templates/ktcore/principals/roleadmin.smarty +++ b/templates/ktcore/principals/roleadmin.smarty @@ -61,7 +61,7 @@ {/foreach} {else} -

{i18n}There are currently no roles created within the system.{/i18n} + {i18n}There are currently no roles created within the system.{/i18n} {/if} diff --git a/templates/ktcore/principals/useradmin.smarty b/templates/ktcore/principals/useradmin.smarty index 3e9dad0..dc367c6 100644 --- a/templates/ktcore/principals/useradmin.smarty +++ b/templates/ktcore/principals/useradmin.smarty @@ -38,7 +38,7 @@ system.{/i18n}

{else} -

{i18n}You do not have enough available licenses to add more active users. Please disable some existing ones if you wish to add new active users.{/i18n}

+
{i18n}You do not have enough available licenses to add more active users. Please disable some existing ones if you wish to add new active users.{/i18n}
{/if} diff --git a/templates/ktcore/search/administration/conditions.smarty b/templates/ktcore/search/administration/conditions.smarty index 59c7377..73c8f62 100644 --- a/templates/ktcore/search/administration/conditions.smarty +++ b/templates/ktcore/search/administration/conditions.smarty @@ -37,5 +37,5 @@ {else} -

{i18n}No Conditions have been defined.{/i18n}

+
{i18n}No Conditions have been defined.{/i18n}
{/if} diff --git a/templates/ktcore/search/administration/savedsearches.smarty b/templates/ktcore/search/administration/savedsearches.smarty index 7c97ae9..4589fb4 100644 --- a/templates/ktcore/search/administration/savedsearches.smarty +++ b/templates/ktcore/search/administration/savedsearches.smarty @@ -42,5 +42,5 @@ newsletters, etc.) based on a category or fieldset value.{/i18n}

{else} -

{i18n}No Saved Searches have been defined.{/i18n}

+
{i18n}No Saved Searches have been defined.{/i18n}
{/if} diff --git a/templates/ktcore/workflow/admin/managepermissions.smarty b/templates/ktcore/workflow/admin/managepermissions.smarty index 05fff90..0f833e3 100644 --- a/templates/ktcore/workflow/admin/managepermissions.smarty +++ b/templates/ktcore/workflow/admin/managepermissions.smarty @@ -1,8 +1,8 @@

{i18n arg_statename=$context->oState->getName()}Manage Permissions: #statename#{/i18n}

{if empty($perm_grid)} -

{i18n}No permissions are controlled by this state. -Indicate below which permissions are controlled to allocate them.{/i18n}

+
{i18n}No permissions are controlled by this state. +Indicate below which permissions are controlled to allocate them.{/i18n}
{else}

{i18n}Once you've selected the permissions you want to control diff --git a/templates/ktcore/workflow/admin/restrictions_edit.smarty b/templates/ktcore/workflow/admin/restrictions_edit.smarty index 741a083..81104e8 100644 --- a/templates/ktcore/workflow/admin/restrictions_edit.smarty +++ b/templates/ktcore/workflow/admin/restrictions_edit.smarty @@ -7,7 +7,7 @@
{if empty($aGuardTriggers)} -

{i18n}Anybody (with the ability to see the document) can perform this transition.{/i18n}

+
{i18n}Anybody (with the ability to see the document) can perform this transition.{/i18n}
{else} diff --git a/templates/ktcore/workflow/admin/transition_actions_edit.smarty b/templates/ktcore/workflow/admin/transition_actions_edit.smarty index e1f06ad..842ac16 100644 --- a/templates/ktcore/workflow/admin/transition_actions_edit.smarty +++ b/templates/ktcore/workflow/admin/transition_actions_edit.smarty @@ -5,7 +5,7 @@
{if empty($aActionTriggers)} -

{i18n}This transition has no actions associated with it..{/i18n}

+
{i18n}This transition has no actions associated with it..{/i18n}
{else}
diff --git a/templates/ktcore/workflow/admin/view.smarty b/templates/ktcore/workflow/admin/view.smarty index 5e8c4bf..9523ef0 100644 --- a/templates/ktcore/workflow/admin/view.smarty +++ b/templates/ktcore/workflow/admin/view.smarty @@ -13,5 +13,5 @@ about states, transitions, security and notifications as they apply to this work