From fb1bbf83f5320a2c9dde6043c1964b832d9e8732 Mon Sep 17 00:00:00 2001 From: kevin_fourie Date: Tue, 3 Jul 2007 19:07:30 +0000 Subject: [PATCH] Merged in from DEV trunk... --- plugins/ktstandard/KTBulkExportPlugin.php | 35 ++++++++++++++++++----------------- resources/css/kt-framing.css | 804 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++---------------------------------------------------------------------------------- resources/graphics/dashlet_bottomleft.gif | Bin 0 -> 953 bytes resources/graphics/dashlet_bottomleft.png | Bin 0 -> 292 bytes resources/graphics/dashlet_bottomrepeat.gif | Bin 0 -> 809 bytes resources/graphics/dashlet_bottomrepeat.png | Bin 0 -> 210 bytes resources/graphics/dashlet_bottomright.gif | Bin 0 -> 989 bytes resources/graphics/dashlet_bottomright.png | Bin 0 -> 368 bytes resources/graphics/dashlet_leftrepeat.gif | Bin 0 -> 807 bytes resources/graphics/dashlet_leftrepeat.png | Bin 0 -> 199 bytes resources/graphics/dashlet_rightrepeat.gif | Bin 0 -> 809 bytes resources/graphics/dashlet_rightrepeat.png | Bin 0 -> 208 bytes resources/graphics/dashlet_topleft.gif | Bin 0 -> 1398 bytes resources/graphics/dashlet_topleft.png | Bin 0 -> 798 bytes resources/graphics/dashlet_toprepeat.gif | Bin 841 -> 0 bytes resources/graphics/dashlet_toprepeat.png | Bin 268 -> 0 bytes resources/graphics/dashlet_topright.gif | Bin 0 -> 1358 bytes resources/graphics/dashlet_topright.png | Bin 0 -> 950 bytes resources/graphics/error_bottomleft.gif | Bin 0 -> 945 bytes resources/graphics/error_bottomleft.png | Bin 0 -> 277 bytes resources/graphics/error_bottomrepeat.gif | Bin 0 -> 809 bytes resources/graphics/error_bottomrepeat.png | Bin 0 -> 154 bytes resources/graphics/error_bottomright.gif | Bin 0 -> 980 bytes resources/graphics/error_bottomright.png | Bin 0 -> 365 bytes resources/graphics/error_leftrepeat.gif | Bin 0 -> 807 bytes resources/graphics/error_leftrepeat.png | Bin 0 -> 143 bytes resources/graphics/error_rightrepeat.gif | Bin 0 -> 809 bytes resources/graphics/error_rightrepeat.png | Bin 0 -> 131 bytes resources/graphics/error_topleft.gif | Bin 0 -> 1185 bytes resources/graphics/error_topleft.png | Bin 0 -> 356 bytes resources/graphics/error_topleft_small.gif | Bin 0 -> 1033 bytes resources/graphics/error_topleft_small.png | Bin 0 -> 279 bytes resources/graphics/error_toprepeat.gif | Bin 845 -> 0 bytes resources/graphics/error_toprepeat.png | Bin 252 -> 0 bytes resources/graphics/error_topright.gif | Bin 0 -> 1210 bytes resources/graphics/error_topright.png | Bin 0 -> 432 bytes resources/graphics/error_topright_small.gif | Bin 0 -> 1048 bytes resources/graphics/error_topright_small.png | Bin 0 -> 331 bytes resources/graphics/info_bottomleft.gif | Bin 0 -> 945 bytes resources/graphics/info_bottomleft.png | Bin 0 -> 272 bytes resources/graphics/info_bottomrepeat.gif | Bin 0 -> 809 bytes resources/graphics/info_bottomrepeat.png | Bin 0 -> 154 bytes resources/graphics/info_bottomright.gif | Bin 0 -> 980 bytes resources/graphics/info_bottomright.png | Bin 0 -> 358 bytes resources/graphics/info_leftrepeat.gif | Bin 0 -> 807 bytes resources/graphics/info_leftrepeat.png | Bin 0 -> 143 bytes resources/graphics/info_rightrepeat.gif | Bin 0 -> 809 bytes resources/graphics/info_rightrepeat.png | Bin 0 -> 130 bytes resources/graphics/info_topleft.gif | Bin 0 -> 1155 bytes resources/graphics/info_topleft.png | Bin 0 -> 315 bytes resources/graphics/info_topleft_small.gif | Bin 0 -> 1017 bytes resources/graphics/info_topleft_small.png | Bin 0 -> 248 bytes resources/graphics/info_toprepeat.gif | Bin 845 -> 0 bytes resources/graphics/info_toprepeat.png | Bin 244 -> 0 bytes resources/graphics/info_topright.gif | Bin 0 -> 1185 bytes resources/graphics/info_topright.png | Bin 0 -> 400 bytes resources/graphics/info_topright_small.gif | Bin 0 -> 1034 bytes resources/graphics/info_topright_small.png | Bin 0 -> 306 bytes resources/graphics/portlet_bg.gif | Bin 836 -> 0 bytes resources/graphics/portlet_bg.png | Bin 299 -> 0 bytes resources/graphics/portlet_bg_collapsed.gif | Bin 820 -> 0 bytes resources/graphics/portlet_bg_collapsed.png | Bin 209 -> 0 bytes resources/graphics/portlet_borderbottom.png | Bin 0 -> 190 bytes resources/graphics/portlet_borderrepeat.png | Bin 0 -> 179 bytes resources/graphics/portlet_borderright.png | Bin 0 -> 112 bytes resources/graphics/portlet_borderright_future.png | Bin 0 -> 188 bytes resources/graphics/portlet_corner_bottomleft.gif | Bin 0 -> 896 bytes resources/graphics/portlet_corner_bottomleft.png | Bin 0 -> 265 bytes resources/graphics/portlet_corner_bottomright.gif | Bin 0 -> 923 bytes resources/graphics/portlet_corner_bottomright.png | Bin 0 -> 301 bytes resources/graphics/portlet_corner_topleft.gif | Bin 0 -> 1667 bytes resources/graphics/portlet_corner_topleft.png | Bin 0 -> 1160 bytes resources/graphics/portlet_corner_topleft_collapsed.gif | Bin 0 -> 1165 bytes resources/graphics/portlet_corner_topleft_collapsed.png | Bin 0 -> 518 bytes resources/graphics/portlet_corner_topright.gif | Bin 0 -> 1302 bytes resources/graphics/portlet_corner_topright.png | Bin 0 -> 785 bytes resources/graphics/portlet_corner_topright_collapsed.gif | Bin 0 -> 958 bytes resources/graphics/portlet_corner_topright_collapsed.png | Bin 0 -> 299 bytes resources/js/loader.js | 60 ------------------------------------------------------------ templates/kt3/dashboard.smarty | 100 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++------ templates/kt3/standard_page.smarty | 78 +++++++++++++++++++++++++++++++++++++++++++++++++----------------------------- 81 files changed, 883 insertions(+), 194 deletions(-) create mode 100644 resources/graphics/dashlet_bottomleft.gif create mode 100644 resources/graphics/dashlet_bottomleft.png create mode 100644 resources/graphics/dashlet_bottomrepeat.gif create mode 100644 resources/graphics/dashlet_bottomrepeat.png create mode 100644 resources/graphics/dashlet_bottomright.gif create mode 100644 resources/graphics/dashlet_bottomright.png create mode 100644 resources/graphics/dashlet_leftrepeat.gif create mode 100644 resources/graphics/dashlet_leftrepeat.png create mode 100644 resources/graphics/dashlet_rightrepeat.gif create mode 100644 resources/graphics/dashlet_rightrepeat.png create mode 100644 resources/graphics/dashlet_topleft.gif create mode 100644 resources/graphics/dashlet_topleft.png create mode 100644 resources/graphics/dashlet_topright.gif create mode 100644 resources/graphics/dashlet_topright.png create mode 100644 resources/graphics/error_bottomleft.gif create mode 100644 resources/graphics/error_bottomleft.png create mode 100644 resources/graphics/error_bottomrepeat.gif create mode 100644 resources/graphics/error_bottomrepeat.png create mode 100644 resources/graphics/error_bottomright.gif create mode 100644 resources/graphics/error_bottomright.png create mode 100644 resources/graphics/error_leftrepeat.gif create mode 100644 resources/graphics/error_leftrepeat.png create mode 100644 resources/graphics/error_rightrepeat.gif create mode 100644 resources/graphics/error_rightrepeat.png create mode 100644 resources/graphics/error_topleft.gif create mode 100644 resources/graphics/error_topleft.png create mode 100644 resources/graphics/error_topleft_small.gif create mode 100644 resources/graphics/error_topleft_small.png create mode 100644 resources/graphics/error_topright.gif create mode 100644 resources/graphics/error_topright.png create mode 100644 resources/graphics/error_topright_small.gif create mode 100644 resources/graphics/error_topright_small.png create mode 100644 resources/graphics/info_bottomleft.gif create mode 100644 resources/graphics/info_bottomleft.png create mode 100644 resources/graphics/info_bottomrepeat.gif create mode 100644 resources/graphics/info_bottomrepeat.png create mode 100644 resources/graphics/info_bottomright.gif create mode 100644 resources/graphics/info_bottomright.png create mode 100644 resources/graphics/info_leftrepeat.gif create mode 100644 resources/graphics/info_leftrepeat.png create mode 100644 resources/graphics/info_rightrepeat.gif create mode 100644 resources/graphics/info_rightrepeat.png create mode 100644 resources/graphics/info_topleft.gif create mode 100644 resources/graphics/info_topleft.png create mode 100644 resources/graphics/info_topleft_small.gif create mode 100644 resources/graphics/info_topleft_small.png create mode 100644 resources/graphics/info_topright.gif create mode 100644 resources/graphics/info_topright.png create mode 100644 resources/graphics/info_topright_small.gif create mode 100644 resources/graphics/info_topright_small.png create mode 100644 resources/graphics/portlet_borderbottom.png create mode 100644 resources/graphics/portlet_borderrepeat.png create mode 100644 resources/graphics/portlet_borderright.png create mode 100644 resources/graphics/portlet_borderright_future.png create mode 100644 resources/graphics/portlet_corner_bottomleft.gif create mode 100644 resources/graphics/portlet_corner_bottomleft.png create mode 100644 resources/graphics/portlet_corner_bottomright.gif create mode 100644 resources/graphics/portlet_corner_bottomright.png create mode 100644 resources/graphics/portlet_corner_topleft.gif create mode 100644 resources/graphics/portlet_corner_topleft.png create mode 100644 resources/graphics/portlet_corner_topleft_collapsed.gif create mode 100644 resources/graphics/portlet_corner_topleft_collapsed.png create mode 100644 resources/graphics/portlet_corner_topright.gif create mode 100644 resources/graphics/portlet_corner_topright.png create mode 100644 resources/graphics/portlet_corner_topright_collapsed.gif create mode 100644 resources/graphics/portlet_corner_topright_collapsed.png diff --git a/plugins/ktstandard/KTBulkExportPlugin.php b/plugins/ktstandard/KTBulkExportPlugin.php index 22f9127..4a26a64 100644 --- a/plugins/ktstandard/KTBulkExportPlugin.php +++ b/plugins/ktstandard/KTBulkExportPlugin.php @@ -6,7 +6,7 @@ * License Version 1.1.2 ("License"); You may not use this file except in * compliance with the License. You may obtain a copy of the License at * http://www.knowledgetree.com/KPL - * + * * Software distributed under the License is distributed on an "AS IS" * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. * See the License for the specific language governing rights and @@ -17,9 +17,9 @@ * (ii) the KnowledgeTree copyright notice * in the same form as they appear in the distribution. See the License for * requirements. - * + * * The Original Code is: KnowledgeTree Open Source - * + * * The Initial Developer of the Original Code is The Jam Warehouse Software * (Pty) Ltd, trading as KnowledgeTree. * Portions created by The Jam Warehouse Software (Pty) Ltd are Copyright @@ -42,7 +42,7 @@ class KTBulkExportPlugin extends KTPlugin { $res = parent::KTPlugin($sFilename); $this->sFriendlyName = _kt('Bulk Export Plugin'); return $res; - } + } function setup() { $this->registerAction('folderaction', 'KTBulkExportAction', 'ktstandard.bulkexport.action'); @@ -105,7 +105,7 @@ class KTBulkExportAction extends KTFolderAction { $aQuery = $this->buildQuery(); $this->oValidator->notError($aQuery); $aDocumentIds = DBUtil::getResultArrayKey($aQuery, 'id'); - + $this->startTransaction(); $oKTConfig =& KTConfig::getSingleton(); @@ -138,17 +138,17 @@ class KTBulkExportAction extends KTFolderAction { $aReplaceValues = array_values($aReplace); foreach ($aDocumentIds as $iId) { $oDocument = Document::get($iId); - + if ($bNoisy) { $oDocumentTransaction = & new DocumentTransaction($oDocument, "Document part of bulk export", 'ktstandard.transactions.bulk_export', array()); - $oDocumentTransaction->create(); + $oDocumentTransaction->create(); } - + $sParentFolder = sprintf('%s/%s', $sTmpPath, $oDocument->getFullPath()); $newDir = $this->sTmpPath; $sFullPath = $this->_convertEncoding($oDocument->getFullPath(), true); - foreach (split('/', $sFullPath) as $dirPart) { - $newDir = sprintf("%s/%s", $newDir, $dirPart); + foreach (split('/', $sFullPath) as $dirPart) { + $newDir = sprintf("%s/%s", $newDir, $dirPart); if (!file_exists($newDir)) { mkdir($newDir, 0700); } @@ -181,9 +181,10 @@ class KTBulkExportAction extends KTFolderAction { ); $sOldPath = getcwd(); chdir($this->sTmpPath); + // Note that the popen means that pexec will return a file descriptor $aOptions = array('popen' => 'r'); - $aRet = KTUtil::pexec($aCmd, $aOptions); - $fh = $aRet['ret']; + $fh = KTUtil::pexec($aCmd, $aOptions); + $last_beat = time(); while(!feof($fh)) { if ($i % 1000 == 0) { @@ -221,8 +222,8 @@ class KTBulkExportAction extends KTFolderAction { callLater(1, kt_bulkexport_redirect); ', $url); - - $this->commitTransaction(); + + $this->commitTransaction(); exit(0); } @@ -277,13 +278,13 @@ class KTBulkExportAction extends KTFolderAction { $aData = KTUtil::arrayGet($_SESSION['bulkexport'], $sCode); $this->oValidator->notEmpty($aData); $sZipFile = $aData['file']; - + if (!file_exists($sZipFile)) { $this->addErrorMessage(_kt('The ZIP can only be downloaded once - if you cancel the download, you will need to reload the Bulk Export page.')); redirect(generateControllerUrl("browse", "fBrowseType=folder&fFolderId=" . $this->oFolder->getId())); exit(0); - } - + } + header("Content-Type: application/zip"); header("Content-Length: ". filesize($sZipFile)); header("Content-Disposition: attachment; filename=\"" . $this->oFolder->getName() . ".zip" . "\""); diff --git a/resources/css/kt-framing.css b/resources/css/kt-framing.css index 5bf8398..d2ebf38 100644 --- a/resources/css/kt-framing.css +++ b/resources/css/kt-framing.css @@ -239,29 +239,193 @@ a.main_nav_item { .noportlets #portletbar { display: none; } #portletbar .portlet { + position: relative; margin: 0 0 1.5em 0; - background: #ffffff url(../../resources/graphics/portlet_bg_collapsed.png) top left repeat-x; - border: 1px solid #B7B7B7; + background: url(../../resources/graphics/portlet_corner_topleft_collapsed.png) top left no-repeat; 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; - border: 1px solid #B7B7B7; - background: #ffffff url(../../resources/graphics/portlet_bg.png) top left repeat-x; + background: url(../../resources/graphics/portlet_corner_topleft.png) top left no-repeat; + border: 0; 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; @@ -278,9 +442,8 @@ a.main_nav_item { #portletbar .portlet h4 { - margin: 0; - padding-top: 0; - padding-bottom: 0.4em; + padding-top: 0.35em; + padding-bottom: 0.7em; padding-left: 30px; background: url(../graphics/plus.gif) 10px 45% no-repeat; text-align: left; @@ -294,8 +457,8 @@ a.main_nav_item { border-width: 0 0 1px 0; border-style: solid; border-color: #eee; - padding-top: 0; - padding-bottom: 0.4em; + padding-top: 0.35em; + padding-bottom: 0.50em; padding-left: 30px; text-align: left; background: url(../graphics/minus.gif) 10px 45% no-repeat; @@ -311,6 +474,57 @@ 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; @@ -538,7 +752,6 @@ 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; @@ -806,85 +1019,37 @@ a.main_nav_item { /* block level. */ .ktError { - background: #ffdd80 url(../../resources/graphics/error_toprepeat.png) top left repeat-x; - border: 1px solid #FFC21E; - margin: 20px auto; + padding: 0.1em 1em; + margin: 1em 0 0 0.5em; } .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; -} - -.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; + margin-top: 20px; } /* block level. */ .ktInfo { - 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; + padding: 0.1em 1em; + margin: 1em 0 0 0.5em; } .ktInfo p { - margin-left: 20px; - padding-left: 25px; - background: #DEDEDE url(../../thirdparty/icon-theme/16x16/status/dialog-information.png) center left no-repeat; -} - -.ktInfoMessage p { - margin-left: 20px; - padding-left: 25px; - background: #DEDEDE url(../../thirdparty/icon-theme/16x16/status/dialog-information.png) center left no-repeat; -} - -.ktInfo span { - 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 span { - margin-left: 20px; - padding-left: 25px; - background: #DEDEDE url(../../thirdparty/icon-theme/16x16/status/dialog-information.png) center left no-repeat; -} .ktBlock { - background: #ffffff url(../../resources/graphics/dashlet_toprepeat.png) top left repeat-x; - border: 1px solid #C5C5C5; - margin: 20px auto; + position: relative; + padding: 0.1em 1em; + margin: 1em 0 0 0.5em; } -.ktBlock, .ktInfo, .ktError, .ktInfoMessage, .ktErrorMessage{ + +.ktInfo, .ktError { position: relative; } @@ -1030,8 +1195,6 @@ 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; */ } @@ -1043,10 +1206,135 @@ 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%; } @@ -1055,6 +1343,361 @@ 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 { margin-top: 40px; margin-bottom: 50px; @@ -1078,7 +1721,7 @@ hr { #document-views { position: absolute; - top: 0; + top: 200px; right: 0; width: 19em; z-index: 2; @@ -1263,15 +1906,15 @@ hr { { position: absolute; top: 0px; - right: 8px; + right: 10px; text-align: right; - margin: -2px 0 0 0; + margin: 0.2em 0em 0 0; } .dashboard_block_handle { cursor: pointer; - margin: -2px -0.5em 0.5em 0.5em; + margin: 0.2em -0.5em 0.5em 0; font-size:small; } @@ -1283,18 +1926,15 @@ hr { .ktBlock .dashboard_block_body { z-index:99; - margin: 8px 5px 10px 5px; + margin: 8px 0 10px 0; background-color:#FFFFFF; - padding-left: 15px; - padding-right: 15px; - padding-bottom: 5px; overflow: auto; } .ktError .dashboard_block_body { z-index:99; - margin-top: -8px; + margin: 0; background-color: #ffdd80; overflow: auto; } @@ -1302,7 +1942,7 @@ hr { .ktInfo .dashboard_block_body { z-index:99; - margin-top: -8px; + margin: 0; background-color: #DEDEDE; overflow: auto; } diff --git a/resources/graphics/dashlet_bottomleft.gif b/resources/graphics/dashlet_bottomleft.gif new file mode 100644 index 0000000..d0736c7 Binary files /dev/null and b/resources/graphics/dashlet_bottomleft.gif differ diff --git a/resources/graphics/dashlet_bottomleft.png b/resources/graphics/dashlet_bottomleft.png new file mode 100644 index 0000000..a8af31e Binary files /dev/null and b/resources/graphics/dashlet_bottomleft.png differ diff --git a/resources/graphics/dashlet_bottomrepeat.gif b/resources/graphics/dashlet_bottomrepeat.gif new file mode 100644 index 0000000..9f28119 Binary files /dev/null and b/resources/graphics/dashlet_bottomrepeat.gif differ diff --git a/resources/graphics/dashlet_bottomrepeat.png b/resources/graphics/dashlet_bottomrepeat.png new file mode 100644 index 0000000..591b13b Binary files /dev/null and b/resources/graphics/dashlet_bottomrepeat.png differ diff --git a/resources/graphics/dashlet_bottomright.gif b/resources/graphics/dashlet_bottomright.gif new file mode 100644 index 0000000..dcbccc3 Binary files /dev/null and b/resources/graphics/dashlet_bottomright.gif differ diff --git a/resources/graphics/dashlet_bottomright.png b/resources/graphics/dashlet_bottomright.png new file mode 100644 index 0000000..cd6eb4d Binary files /dev/null and b/resources/graphics/dashlet_bottomright.png differ diff --git a/resources/graphics/dashlet_leftrepeat.gif b/resources/graphics/dashlet_leftrepeat.gif new file mode 100644 index 0000000..0b64eca Binary files /dev/null and b/resources/graphics/dashlet_leftrepeat.gif differ diff --git a/resources/graphics/dashlet_leftrepeat.png b/resources/graphics/dashlet_leftrepeat.png new file mode 100644 index 0000000..625ec5c Binary files /dev/null and b/resources/graphics/dashlet_leftrepeat.png differ diff --git a/resources/graphics/dashlet_rightrepeat.gif b/resources/graphics/dashlet_rightrepeat.gif new file mode 100644 index 0000000..31eaa04 Binary files /dev/null and b/resources/graphics/dashlet_rightrepeat.gif differ diff --git a/resources/graphics/dashlet_rightrepeat.png b/resources/graphics/dashlet_rightrepeat.png new file mode 100644 index 0000000..241ba85 Binary files /dev/null and b/resources/graphics/dashlet_rightrepeat.png differ diff --git a/resources/graphics/dashlet_topleft.gif b/resources/graphics/dashlet_topleft.gif new file mode 100644 index 0000000..11ee051 Binary files /dev/null and b/resources/graphics/dashlet_topleft.gif differ diff --git a/resources/graphics/dashlet_topleft.png b/resources/graphics/dashlet_topleft.png new file mode 100644 index 0000000..d0a3519 Binary files /dev/null and b/resources/graphics/dashlet_topleft.png differ diff --git a/resources/graphics/dashlet_toprepeat.gif b/resources/graphics/dashlet_toprepeat.gif index 10cb194..00a970d 100644 Binary files a/resources/graphics/dashlet_toprepeat.gif and b/resources/graphics/dashlet_toprepeat.gif differ diff --git a/resources/graphics/dashlet_toprepeat.png b/resources/graphics/dashlet_toprepeat.png index 72542f0..3ef6bc6 100644 Binary files a/resources/graphics/dashlet_toprepeat.png and b/resources/graphics/dashlet_toprepeat.png differ diff --git a/resources/graphics/dashlet_topright.gif b/resources/graphics/dashlet_topright.gif new file mode 100644 index 0000000..8a667ff Binary files /dev/null and b/resources/graphics/dashlet_topright.gif differ diff --git a/resources/graphics/dashlet_topright.png b/resources/graphics/dashlet_topright.png new file mode 100644 index 0000000..5aeced3 Binary files /dev/null and b/resources/graphics/dashlet_topright.png differ diff --git a/resources/graphics/error_bottomleft.gif b/resources/graphics/error_bottomleft.gif new file mode 100644 index 0000000..3da8edf Binary files /dev/null and b/resources/graphics/error_bottomleft.gif differ diff --git a/resources/graphics/error_bottomleft.png b/resources/graphics/error_bottomleft.png new file mode 100644 index 0000000..b943689 Binary files /dev/null and b/resources/graphics/error_bottomleft.png differ diff --git a/resources/graphics/error_bottomrepeat.gif b/resources/graphics/error_bottomrepeat.gif new file mode 100644 index 0000000..73c3ebc Binary files /dev/null and b/resources/graphics/error_bottomrepeat.gif differ diff --git a/resources/graphics/error_bottomrepeat.png b/resources/graphics/error_bottomrepeat.png new file mode 100644 index 0000000..b622345 Binary files /dev/null and b/resources/graphics/error_bottomrepeat.png differ diff --git a/resources/graphics/error_bottomright.gif b/resources/graphics/error_bottomright.gif new file mode 100644 index 0000000..0637f5d Binary files /dev/null and b/resources/graphics/error_bottomright.gif differ diff --git a/resources/graphics/error_bottomright.png b/resources/graphics/error_bottomright.png new file mode 100644 index 0000000..1ee02ff Binary files /dev/null and b/resources/graphics/error_bottomright.png differ diff --git a/resources/graphics/error_leftrepeat.gif b/resources/graphics/error_leftrepeat.gif new file mode 100644 index 0000000..d058285 Binary files /dev/null and b/resources/graphics/error_leftrepeat.gif differ diff --git a/resources/graphics/error_leftrepeat.png b/resources/graphics/error_leftrepeat.png new file mode 100644 index 0000000..362b72a Binary files /dev/null and b/resources/graphics/error_leftrepeat.png differ diff --git a/resources/graphics/error_rightrepeat.gif b/resources/graphics/error_rightrepeat.gif new file mode 100644 index 0000000..0c52c97 Binary files /dev/null and b/resources/graphics/error_rightrepeat.gif differ diff --git a/resources/graphics/error_rightrepeat.png b/resources/graphics/error_rightrepeat.png new file mode 100644 index 0000000..954807c Binary files /dev/null and b/resources/graphics/error_rightrepeat.png differ diff --git a/resources/graphics/error_topleft.gif b/resources/graphics/error_topleft.gif new file mode 100644 index 0000000..efa3d13 Binary files /dev/null and b/resources/graphics/error_topleft.gif differ diff --git a/resources/graphics/error_topleft.png b/resources/graphics/error_topleft.png new file mode 100644 index 0000000..eb94fd3 Binary files /dev/null and b/resources/graphics/error_topleft.png differ diff --git a/resources/graphics/error_topleft_small.gif b/resources/graphics/error_topleft_small.gif new file mode 100644 index 0000000..29a955a Binary files /dev/null and b/resources/graphics/error_topleft_small.gif differ diff --git a/resources/graphics/error_topleft_small.png b/resources/graphics/error_topleft_small.png new file mode 100644 index 0000000..24fce1f Binary files /dev/null and b/resources/graphics/error_topleft_small.png differ diff --git a/resources/graphics/error_toprepeat.gif b/resources/graphics/error_toprepeat.gif index 3dd6c55..daf10ee 100644 Binary files a/resources/graphics/error_toprepeat.gif and b/resources/graphics/error_toprepeat.gif differ diff --git a/resources/graphics/error_toprepeat.png b/resources/graphics/error_toprepeat.png index 2c7f97f..b11dd26 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 new file mode 100644 index 0000000..80447a3 Binary files /dev/null and b/resources/graphics/error_topright.gif differ diff --git a/resources/graphics/error_topright.png b/resources/graphics/error_topright.png new file mode 100644 index 0000000..72c5360 Binary files /dev/null and b/resources/graphics/error_topright.png differ diff --git a/resources/graphics/error_topright_small.gif b/resources/graphics/error_topright_small.gif new file mode 100644 index 0000000..0e23763 Binary files /dev/null and b/resources/graphics/error_topright_small.gif differ diff --git a/resources/graphics/error_topright_small.png b/resources/graphics/error_topright_small.png new file mode 100644 index 0000000..3f5ffcd Binary files /dev/null and b/resources/graphics/error_topright_small.png differ diff --git a/resources/graphics/info_bottomleft.gif b/resources/graphics/info_bottomleft.gif new file mode 100644 index 0000000..f042519 Binary files /dev/null and b/resources/graphics/info_bottomleft.gif differ diff --git a/resources/graphics/info_bottomleft.png b/resources/graphics/info_bottomleft.png new file mode 100644 index 0000000..aca85fb Binary files /dev/null and b/resources/graphics/info_bottomleft.png differ diff --git a/resources/graphics/info_bottomrepeat.gif b/resources/graphics/info_bottomrepeat.gif new file mode 100644 index 0000000..baad1e5 Binary files /dev/null and b/resources/graphics/info_bottomrepeat.gif differ diff --git a/resources/graphics/info_bottomrepeat.png b/resources/graphics/info_bottomrepeat.png new file mode 100644 index 0000000..b959ad8 Binary files /dev/null and b/resources/graphics/info_bottomrepeat.png differ diff --git a/resources/graphics/info_bottomright.gif b/resources/graphics/info_bottomright.gif new file mode 100644 index 0000000..270a6fb Binary files /dev/null and b/resources/graphics/info_bottomright.gif differ diff --git a/resources/graphics/info_bottomright.png b/resources/graphics/info_bottomright.png new file mode 100644 index 0000000..c1fa3a3 Binary files /dev/null and b/resources/graphics/info_bottomright.png differ diff --git a/resources/graphics/info_leftrepeat.gif b/resources/graphics/info_leftrepeat.gif new file mode 100644 index 0000000..f19990b Binary files /dev/null and b/resources/graphics/info_leftrepeat.gif differ diff --git a/resources/graphics/info_leftrepeat.png b/resources/graphics/info_leftrepeat.png new file mode 100644 index 0000000..fbe03f1 Binary files /dev/null and b/resources/graphics/info_leftrepeat.png differ diff --git a/resources/graphics/info_rightrepeat.gif b/resources/graphics/info_rightrepeat.gif new file mode 100644 index 0000000..de78fcc Binary files /dev/null and b/resources/graphics/info_rightrepeat.gif differ diff --git a/resources/graphics/info_rightrepeat.png b/resources/graphics/info_rightrepeat.png new file mode 100644 index 0000000..35f2e1c Binary files /dev/null and b/resources/graphics/info_rightrepeat.png differ diff --git a/resources/graphics/info_topleft.gif b/resources/graphics/info_topleft.gif new file mode 100644 index 0000000..8670ba7 Binary files /dev/null and b/resources/graphics/info_topleft.gif differ diff --git a/resources/graphics/info_topleft.png b/resources/graphics/info_topleft.png new file mode 100644 index 0000000..7c3ec27 Binary files /dev/null and b/resources/graphics/info_topleft.png differ diff --git a/resources/graphics/info_topleft_small.gif b/resources/graphics/info_topleft_small.gif new file mode 100644 index 0000000..444fa78 Binary files /dev/null and b/resources/graphics/info_topleft_small.gif differ diff --git a/resources/graphics/info_topleft_small.png b/resources/graphics/info_topleft_small.png new file mode 100644 index 0000000..dfd8c7c Binary files /dev/null and b/resources/graphics/info_topleft_small.png differ diff --git a/resources/graphics/info_toprepeat.gif b/resources/graphics/info_toprepeat.gif index 18007f3..358b810 100644 Binary files a/resources/graphics/info_toprepeat.gif and b/resources/graphics/info_toprepeat.gif differ diff --git a/resources/graphics/info_toprepeat.png b/resources/graphics/info_toprepeat.png index 566007b..a016a75 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 new file mode 100644 index 0000000..0d67ef9 Binary files /dev/null and b/resources/graphics/info_topright.gif differ diff --git a/resources/graphics/info_topright.png b/resources/graphics/info_topright.png new file mode 100644 index 0000000..a3a1ec8 Binary files /dev/null and b/resources/graphics/info_topright.png differ diff --git a/resources/graphics/info_topright_small.gif b/resources/graphics/info_topright_small.gif new file mode 100644 index 0000000..8b76f1c Binary files /dev/null and b/resources/graphics/info_topright_small.gif differ diff --git a/resources/graphics/info_topright_small.png b/resources/graphics/info_topright_small.png new file mode 100644 index 0000000..276a7e9 Binary files /dev/null and b/resources/graphics/info_topright_small.png differ diff --git a/resources/graphics/portlet_bg.gif b/resources/graphics/portlet_bg.gif index 1076ab7..426d5ae 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 cdc9f4f..129efe8 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 800bcf1..22599f3 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 bfc2a1e..2c94fee 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 new file mode 100644 index 0000000..2b21ceb Binary files /dev/null and b/resources/graphics/portlet_borderbottom.png differ diff --git a/resources/graphics/portlet_borderrepeat.png b/resources/graphics/portlet_borderrepeat.png new file mode 100644 index 0000000..69f1abc Binary files /dev/null and b/resources/graphics/portlet_borderrepeat.png differ diff --git a/resources/graphics/portlet_borderright.png b/resources/graphics/portlet_borderright.png new file mode 100644 index 0000000..851396b Binary files /dev/null and b/resources/graphics/portlet_borderright.png differ diff --git a/resources/graphics/portlet_borderright_future.png b/resources/graphics/portlet_borderright_future.png new file mode 100644 index 0000000..edc6ceb Binary files /dev/null and b/resources/graphics/portlet_borderright_future.png differ diff --git a/resources/graphics/portlet_corner_bottomleft.gif b/resources/graphics/portlet_corner_bottomleft.gif new file mode 100644 index 0000000..798ccf0 Binary files /dev/null and b/resources/graphics/portlet_corner_bottomleft.gif differ diff --git a/resources/graphics/portlet_corner_bottomleft.png b/resources/graphics/portlet_corner_bottomleft.png new file mode 100644 index 0000000..dfdf6a8 Binary files /dev/null and b/resources/graphics/portlet_corner_bottomleft.png differ diff --git a/resources/graphics/portlet_corner_bottomright.gif b/resources/graphics/portlet_corner_bottomright.gif new file mode 100644 index 0000000..127327f Binary files /dev/null and b/resources/graphics/portlet_corner_bottomright.gif differ diff --git a/resources/graphics/portlet_corner_bottomright.png b/resources/graphics/portlet_corner_bottomright.png new file mode 100644 index 0000000..d144d08 Binary files /dev/null and b/resources/graphics/portlet_corner_bottomright.png differ diff --git a/resources/graphics/portlet_corner_topleft.gif b/resources/graphics/portlet_corner_topleft.gif new file mode 100644 index 0000000..01a4f71 Binary files /dev/null and b/resources/graphics/portlet_corner_topleft.gif differ diff --git a/resources/graphics/portlet_corner_topleft.png b/resources/graphics/portlet_corner_topleft.png new file mode 100644 index 0000000..e2ade67 Binary files /dev/null and b/resources/graphics/portlet_corner_topleft.png differ diff --git a/resources/graphics/portlet_corner_topleft_collapsed.gif b/resources/graphics/portlet_corner_topleft_collapsed.gif new file mode 100644 index 0000000..06d4623 Binary files /dev/null and b/resources/graphics/portlet_corner_topleft_collapsed.gif differ diff --git a/resources/graphics/portlet_corner_topleft_collapsed.png b/resources/graphics/portlet_corner_topleft_collapsed.png new file mode 100644 index 0000000..efe0bcf Binary files /dev/null and b/resources/graphics/portlet_corner_topleft_collapsed.png differ diff --git a/resources/graphics/portlet_corner_topright.gif b/resources/graphics/portlet_corner_topright.gif new file mode 100644 index 0000000..4acd3c6 Binary files /dev/null and b/resources/graphics/portlet_corner_topright.gif differ diff --git a/resources/graphics/portlet_corner_topright.png b/resources/graphics/portlet_corner_topright.png new file mode 100644 index 0000000..7caaf52 Binary files /dev/null and b/resources/graphics/portlet_corner_topright.png differ diff --git a/resources/graphics/portlet_corner_topright_collapsed.gif b/resources/graphics/portlet_corner_topright_collapsed.gif new file mode 100644 index 0000000..13d58ed Binary files /dev/null and b/resources/graphics/portlet_corner_topright_collapsed.gif differ diff --git a/resources/graphics/portlet_corner_topright_collapsed.png b/resources/graphics/portlet_corner_topright_collapsed.png new file mode 100644 index 0000000..41881b7 Binary files /dev/null and b/resources/graphics/portlet_corner_topright_collapsed.png differ diff --git a/resources/js/loader.js b/resources/js/loader.js index 7b774ec..2c567a6 100644 --- a/resources/js/loader.js +++ b/resources/js/loader.js @@ -9,14 +9,6 @@ window.onload = function() autoPad: false } - settings_dashlets = { - tl: { radius: 8 }, - tr: { radius: 8 }, - bl: { radius: 8 }, - br: { radius: 8 }, - antiAlias: true, - autoPad: false - } var browser = $T.getBrowserAgent(); // pageBody @@ -29,56 +21,4 @@ window.onload = function() var footer = document.getElementById("copyrightbarBorder"); var footerBlock = new curvyCorners(settings, footer); footerBlock.applyCornersToAll(); - - // standard dashlets - var dashBlock = new curvyCorners(settings_dashlets, "ktBlock"); - dashBlock.applyCornersToAll(); - var dashboardBlocks = getElementsByClass("ktBlock"); - for(var t = 0; t < dashboardBlocks.length; t++){ - dashboardBlocks[t].style.margin="0 0 26px 0"; - } - - //info dashlets - var infoBlock = new curvyCorners(settings_dashlets, "ktInfo"); - infoBlock.applyCornersToAll(); - var infodashlets = getElementsByClass("ktInfo"); - for(var q = 0; q < infodashlets.length; q++){ - infodashlets[q].style.margin="0 0 26px 0"; - } - - //info message popups - var infoMessage = new curvyCorners(settings_dashlets, "ktInfoMessage"); - infoMessage.applyCornersToAll(); - var infoMessages = getElementsByClass("ktInfoMessage"); - - //error message dashlets - var errorBlock = new curvyCorners(settings_dashlets, "ktError"); - errorBlock.applyCornersToAll(); - var errordashlets = getElementsByClass("ktError"); - for(var r = 0; r < errordashlets.length; r++){ - errordashlets[r].style.margin="0 0 26px 0"; - } - - //error message popups - var errorMessage = new curvyCorners(settings_dashlets, "ktErrorMessage"); - errorMessage.applyCornersToAll(); - var errorMessages = getElementsByClass("ktErrorMessage"); - - if(getElementsByClass("noportlets").length != '1'){ - //portlets - var portletBlock = new curvyCorners(settings_dashlets, "portlet"); - portletBlock.applyCornersToAll(); - var portlets = getElementsByClass("portlet"); - for(var t = 0; t < portlets.length; t++){ - portlets[t].style.margin="0 0 26px 0"; - } - - //portlets - var exp_portletBlock = new curvyCorners(settings_dashlets, "portlet expanded"); - exp_portletBlock.applyCornersToAll(); - var exp_portlets = getElementsByClass("portlet expanded"); - for(var u = 0; u < exp_portlets.length; u++){ - exp_portlets[u].style.margin="0 0 26px 0"; - } - } } \ No newline at end of file diff --git a/templates/kt3/dashboard.smarty b/templates/kt3/dashboard.smarty index 22ac03a..0778507 100644 --- a/templates/kt3/dashboard.smarty +++ b/templates/kt3/dashboard.smarty @@ -1,8 +1,27 @@
{foreach item=oDashlet from=$dashlets_left}
-
- +
+ {if $oDashlet->sClass === "ktBlock"} +
+
+
+
+ {/if} + + {if $oDashlet->sClass === "ktError"} +
+
+
+
+ {/if} + + {if $oDashlet->sClass === "ktInfo"} +
+
+
+
+ {/if}
    @@ -13,7 +32,33 @@
{$oDashlet->render()}
- + {if $oDashlet->sClass === "ktBlock"} +
+
+
+ +
+
+
+ {/if} + {if $oDashlet->sClass === "ktError"} +
+
+
+ +
+
+
+ {/if} + {if $oDashlet->sClass === "ktInfo"} +
+
+
+ +
+
+
+ {/if}
{/foreach} @@ -23,8 +68,25 @@
{foreach item=oDashlet from=$dashlets_right}
-
- +
+ {if $oDashlet->sClass === "ktBlock"} +
+
+
+
+ {/if} + {if $oDashlet->sClass === "ktError"} +
+
+
+
+ {/if} + {if $oDashlet->sClass === "ktInfo"} +
+
+
+
+ {/if}
    @@ -35,7 +97,33 @@ {$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 197d5cd..db36e51 100644 --- a/templates/kt3/standard_page.smarty +++ b/templates/kt3/standard_page.smarty @@ -1,6 +1,6 @@ - + {$page->title}{if ($page->secondary_title != null)} — {$page->secondary_title}{/if} | {$page->systemName} @@ -152,18 +152,20 @@
- {foreach item=oPortlet from=$page->portlets} - {assign var=portlet_output value=$oPortlet->render() } - {if $portlet_output} -
-

{$oPortlet->getTitle()}

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

{$oPortlet->getTitle()}

+
+
+
+ {$portlet_output} +
+
+ {/if} + {/foreach} +
@@ -175,22 +177,40 @@ {/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} - + {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}
-- libgit2 0.21.4