diff --git a/resources/css/kt-framing.css b/resources/css/kt-framing.css index 15e9529..2214bd3 100644 --- a/resources/css/kt-framing.css +++ b/resources/css/kt-framing.css @@ -20,8 +20,6 @@ body #kt-wrapper { - min-height:600px; - height:auto; margin-top: 15px; margin-left: 15px; } @@ -37,17 +35,17 @@ body #pageBody { position: relative; border: 1px solid white; - z-index: 0; - height: 100%; + min-height: 800px; + height: auto; } #pageBodyBg { position: absolute; background: url(../../resources/graphics/page_bg.png) bottom left repeat-x; - bottom: 0px; - left: 3px; width: 99.2%; height: 611px; + bottom: 0px; + left: 3px; } #bodyTopLeft { @@ -343,17 +341,6 @@ a.main_nav_item { border:0; } -#portletbar .portlet.expanded .portletTopRepeat { - position: absolute; - background: url(../../resources/graphics/portlet_bg.png) top left repeat-x; - top: 0px; - left: 30px; - height: 28px; - width: 67%; - z-index: -1; - border: 0; -} - #portletbar .portlet .portletTopRight { position: absolute; background: url(../../resources/graphics/portlet_corner_topright_collapsed.png) top right no-repeat; @@ -365,6 +352,26 @@ a.main_nav_item { 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; + 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: 67%; + z-index: -1; + border: 0; +} + #portletbar .portlet.expanded .portletTopRight { position: absolute; background: url(../../resources/graphics/portlet_corner_topright.png) top right no-repeat; @@ -381,11 +388,9 @@ a.main_nav_item { background: url(../../resources/graphics/portlet_borderrepeat.png) top left repeat-y; padding: 0 0 1em 0; background-color: white; - z-index: 0; border: 0; width: 100%; - height: 100%; - z-index: 0; + height: 100%; } #portletbar .portlet .portletbodyBottomLeft { @@ -415,7 +420,7 @@ a.main_nav_item { background: url(../../resources/graphics/portlet_borderbottom.png) bottom left repeat-x; } -#portletbar .portlet .portletbodyRight { +#portletbar .portlet .portletbodyRightTop { position: absolute; background: url(../../resources/graphics/portlet_borderright.png) top right repeat-y; top: 0px; @@ -470,16 +475,6 @@ a.main_nav_item { height: 68px; } -#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; - z-index: 2; -} - - #portletbar .portlet a { text-decoration: none; } @@ -508,7 +503,6 @@ a.main_nav_item { font-size: small; } - #portletbar .portlet.expanded h4 { margin: 0; @@ -532,6 +526,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; @@ -1008,8 +1053,7 @@ a.main_nav_item { } -.kt_collection .odd td -{ +.kt_collection .odd td { background-color: #fafafa; } @@ -1039,8 +1083,7 @@ a.main_nav_item { } /* block level. */ -.ktError -{ +.ktError { padding: 0 1em; border: 1px solid #ffc21e; margin: 0.5em 0; @@ -1053,8 +1096,7 @@ a.main_nav_item { } /* block level. */ -.ktInfo -{ +.ktInfo { padding: 0 1em; border: 1px solid #c5c5c5; margin: 0.5em 0; @@ -1067,8 +1109,7 @@ a.main_nav_item { } -.ktBlock -{ +.ktBlock { padding: 0 1em; border: 1px solid #c5c5c5; background-color: #fcfcfc; @@ -1076,19 +1117,16 @@ a.main_nav_item { } -.ktBlock, .ktInfo, .ktError -{ +.ktBlock, .ktInfo, .ktError { -moz-border-radius: 15px; background-repeat: no-repeat; } -.ktInfo -{ +.ktInfo { background-image: url(../../resources/graphics/dashlet-gradient-info.gif); } -.ktError -{ +.ktError { background-image: url(../../resources/graphics/dashlet-gradient-error.gif); } diff --git a/resources/css/kt-ie-icons.css b/resources/css/kt-ie-icons.css index 79522f7..38753c9 100644 --- a/resources/css/kt-ie-icons.css +++ b/resources/css/kt-ie-icons.css @@ -39,8 +39,8 @@ padding: 0 25px 0 0; } -#kt-wrapper { - height: 600px; +#pageBody { + height: 800px; } /* IE does not know what 100% is!! */ diff --git a/resources/graphics/menu_divider.png b/resources/graphics/menu_divider.png index 9e97c64..78bc26e 100644 --- a/resources/graphics/menu_divider.png +++ b/resources/graphics/menu_divider.png diff --git a/resources/graphics/menu_divider_old.png b/resources/graphics/menu_divider_old.png new file mode 100644 index 0000000..1ff035a --- /dev/null +++ b/resources/graphics/menu_divider_old.png diff --git a/resources/graphics/minus.gif b/resources/graphics/minus.gif new file mode 100644 index 0000000..6067c5a --- /dev/null +++ b/resources/graphics/minus.gif diff --git a/resources/graphics/plus.gif b/resources/graphics/plus.gif new file mode 100644 index 0000000..cf63e16 --- /dev/null +++ b/resources/graphics/plus.gif diff --git a/resources/graphics/portlet_bg.gif b/resources/graphics/portlet_bg.gif new file mode 100644 index 0000000..426d5ae --- /dev/null +++ b/resources/graphics/portlet_bg.gif diff --git a/resources/graphics/portlet_bg_collapsed.gif b/resources/graphics/portlet_bg_collapsed.gif new file mode 100644 index 0000000..22599f3 --- /dev/null +++ b/resources/graphics/portlet_bg_collapsed.gif diff --git a/resources/graphics/portlet_corner_bottomleft.gif b/resources/graphics/portlet_corner_bottomleft.gif new file mode 100644 index 0000000..798ccf0 --- /dev/null +++ b/resources/graphics/portlet_corner_bottomleft.gif diff --git a/resources/graphics/portlet_corner_bottomright.gif b/resources/graphics/portlet_corner_bottomright.gif new file mode 100644 index 0000000..127327f --- /dev/null +++ b/resources/graphics/portlet_corner_bottomright.gif diff --git a/resources/graphics/portlet_corner_topleft.gif b/resources/graphics/portlet_corner_topleft.gif new file mode 100644 index 0000000..01a4f71 --- /dev/null +++ b/resources/graphics/portlet_corner_topleft.gif 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 --- /dev/null +++ b/resources/graphics/portlet_corner_topleft_collapsed.gif diff --git a/resources/graphics/portlet_corner_topright.gif b/resources/graphics/portlet_corner_topright.gif new file mode 100644 index 0000000..4acd3c6 --- /dev/null +++ b/resources/graphics/portlet_corner_topright.gif 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 --- /dev/null +++ b/resources/graphics/portlet_corner_topright_collapsed.gif diff --git a/resources/graphics/title_bullet.png b/resources/graphics/title_bullet.png new file mode 100644 index 0000000..0308fd7 --- /dev/null +++ b/resources/graphics/title_bullet.png diff --git a/templates/kt3/standard_page.smarty b/templates/kt3/standard_page.smarty index 6028462..330dc06 100644 --- a/templates/kt3/standard_page.smarty +++ b/templates/kt3/standard_page.smarty @@ -53,13 +53,7 @@
-
-
-
-
-
-
- +
@@ -143,16 +137,16 @@ {if $portlet_output}

{$oPortlet->getTitle()}

-
-
+
+
- {$portlet_output} -
+
+ {$portlet_output}
@@ -191,6 +185,11 @@
+
+
+
+
+
diff --git a/templates/ktcore/document/view.smarty b/templates/ktcore/document/view.smarty index 94fd38c..647eb1f 100644 --- a/templates/ktcore/document/view.smarty +++ b/templates/ktcore/document/view.smarty @@ -1,4 +1,4 @@ -

{$document->getName()|escape}

+

{$document->getName()|escape}

{if ($document->getIsCheckedOut() == 1)} {capture assign=checkout_user}{$sCheckoutUser}{/capture}