[gatein-commits] gatein SVN: r7307 - in portal/branches/dom: web/eXoResources/src/main/webapp/skin/DefaultSkin/portal/webui/component/view/UIPortalComponent and 5 other directories.

Monday, 5 September 2011


Author: phuong_vu
Date: 2011-09-06 00:52:36 -0400 (Tue, 06 Sep 2011)
New Revision: 7307

Removed:
  
portal/branches/dom/web/eXoResources/src/main/webapp/skin/DefaultSkin/webui/component/UIPopup/UIPopupCategory/background/MidlePopupCategory.gif
Modified:
  
portal/branches/dom/examples/skins/simpleskin/src/main/webapp/skin/PortletThemes/Stylesheet.css
  
portal/branches/dom/web/eXoResources/src/main/webapp/skin/DefaultSkin/portal/webui/component/view/UIPortalComponent/Stylesheet.css
  
portal/branches/dom/web/eXoResources/src/main/webapp/skin/DefaultSkin/webui/component/UIPopup/UIPopupCategory/Stylesheet.css
  
portal/branches/dom/web/eXoResources/src/main/webapp/skin/DefaultSkin/webui/component/UIPopup/UIPopupCategory/background/PopupCategory.gif
   portal/branches/dom/web/eXoResources/src/main/webapp/skin/PortletThemes/Stylesheet.css
  
portal/branches/dom/web/portal/src/main/webapp/groovy/portal/webui/application/UIPortlet.gtmpl
  
portal/branches/dom/web/portal/src/main/webapp/groovy/webui/form/UIFormInputThemeSelector.gtmpl
  
portal/branches/dom/web/portal/src/main/webapp/groovy/webui/form/UIItemThemeSelector.gtmpl
Log:
[DOM] UIPortlet.gtmpl optimization

Modified:
portal/branches/dom/examples/skins/simpleskin/src/main/webapp/skin/PortletThemes/Stylesheet.css
===================================================================
---
portal/branches/dom/examples/skins/simpleskin/src/main/webapp/skin/PortletThemes/Stylesheet.css	2011-09-06
04:49:25 UTC (rev 7306)
+++
portal/branches/dom/examples/skins/simpleskin/src/main/webapp/skin/PortletThemes/Stylesheet.css	2011-09-06
04:52:36 UTC (rev 7307)
@@ -106,7 +106,6 @@
 	color: #333333;
 	overflow: hidden;
 	white-space: nowrap;
-	width: 100%;
 }
 
 .DefaultTheme .WindowBarLeft {
@@ -127,9 +126,6 @@
 	background-image: url('background/DefaultTheme.png');
 	background-repeat: repeat-x;
 	background-position: left -90px;
-}
-
-.DefaultTheme .WindowBarCenter .FixHeight {
 	height: 20px;
 	padding-top: 7px;
 }
@@ -166,9 +162,6 @@
 	background-image: url('background/DefaultTheme.png');
 	background-repeat: repeat-x;
 	background-position: left top;
-}
-
-.DefaultTheme .BottomDecoratorCenter .FixHeight {
 	height: 26px;
 }
 
@@ -190,7 +183,6 @@
 	line-height: 17px;
 	overflow: hidden;
 	white-space: nowrap;
-	width: 100%;
 }
 
 .MacTheme .WindowBarCenter .PortletIcon {
@@ -307,9 +299,6 @@
 	background-image: url('background/MacTheme.png');
 	background-repeat: repeat-x;
 	background-position: center top;
-}
-
-.MacTheme .BottomDecoratorCenter .FixHeight {
 	height: 23px; line-height: 23px;
 }
 
@@ -331,9 +320,6 @@
 	background-image: url('background/MacTheme.png');
 	background-repeat: repeat-x;
 	background-position: center -69px;
-}
-
-.MacTheme .WindowBarCenter .FixHeight {
 	height: 19px;
 	padding-top: 4px;
 }
@@ -356,7 +342,6 @@
 	line-height: 17px;
 	overflow: hidden;
 	white-space: nowrap;
-	width: 100%;
 }
 
 .MacGray .WindowBarCenter .PortletIcon {
@@ -473,9 +458,6 @@
 	background-image: url('background/MacGray.png');
 	background-repeat: repeat-x;
 	background-position: left top;
-}
-
-.MacGray .BottomDecoratorCenter .FixHeight {
 	height: 24px; line-height: 24px;
 }
 
@@ -497,9 +479,6 @@
 	background-image: url('background/MacGray.png');
 	background-repeat: repeat-x;
 	background-position: center -72px;
-}
-
-.MacGray .WindowBarCenter .FixHeight {
 	height: 19px;
 	padding-top: 4px;
 }
@@ -522,7 +501,6 @@
 	line-height: 17px;
 	overflow: hidden;
 	white-space: nowrap;
-	width: 100%;
 }
 
 .MacBlack .WindowBarCenter .PortletIcon {
@@ -639,9 +617,6 @@
 	background-image: url('background/MacBlack.png');
 	background-repeat: repeat-x;
 	background-position: left top;
-}
-
-.MacBlack .BottomDecoratorCenter .FixHeight {
 	height: 24px; line-height: 24px;
 }
 
@@ -663,9 +638,6 @@
 	background-image: url('background/MacBlack.png');
 	background-repeat: repeat-x;
 	background-position: center -72px;
-}
-
-.MacBlack .WindowBarCenter .FixHeight {
 	height: 19px;
 	padding-top: 4px;
 }
@@ -688,7 +660,6 @@
 	line-height: 17px;
 	overflow: hidden;
 	white-space: nowrap;
-	width: 100%;
 }
 
 .MacGreenSteel .WindowBarCenter .PortletIcon {
@@ -805,9 +776,6 @@
 	background-image: url('background/MacGreen.png');
 	background-repeat: repeat-x;
 	background-position: left top;
-}
-
-.MacGreenSteel .BottomDecoratorCenter .FixHeight {
 	height: 24px; line-height: 24px;
 }
 
@@ -829,9 +797,6 @@
 	background-image: url('background/MacGreen.png');
 	background-repeat: repeat-x;
 	background-position: center -72px;
-}
-
-.MacGreenSteel .WindowBarCenter .FixHeight {
 	height: 19px;
 	padding-top: 4px;
 }
@@ -962,9 +927,6 @@
 	background-image: url('background/VistaTheme.png');
 	background-repeat: repeat-x;
 	background-position: left top;
-}
-
-.VistaTheme .BottomDecoratorCenter .FixHeight {
 	height: 24px;
 }
 
@@ -973,7 +935,6 @@
 	line-height: 22px;
 	overflow: hidden;
 	white-space: nowrap;
-	width: 100%;
 }
 
 .VistaTheme .WindowBarLeft {
@@ -994,9 +955,6 @@
 	background-image: url('background/VistaTheme.png');
 	background-repeat: repeat-x;
 	background-position: left -72px;
-}
-
-.VistaTheme .WindowBarCenter .FixHeight {
 	height: 24px;
 	padding-top: 5px;
 }
@@ -1022,7 +980,6 @@
 	line-height: 22px;
 	overflow: hidden;
 	white-space: nowrap;
-	width: 100%;
 }
 
 .VistaBlue .WindowBarCenter .PortletIcon {
@@ -1135,9 +1092,6 @@
 	background-image: url('background/VistaBlue.png');
 	background-repeat: repeat-x;
 	background-position: left top;
-}
-
-.VistaBlue .BottomDecoratorCenter .FixHeight {
 	height: 27px;
 }
 
@@ -1159,9 +1113,6 @@
 	background-image: url('background/VistaBlue.png');
 	background-repeat: repeat-x;
 	background-position: left -81px;
-}
-
-.VistaBlue .WindowBarCenter .FixHeight {
 	height: 27px;
 	padding-top: 8px;
 }
@@ -1215,7 +1166,6 @@
 	line-height: 19px;
 	overflow: hidden;
 	white-space: nowrap;
-	width: 100%;
 }
 
 .RoundConerBlue .ArrowDownIcon {
@@ -1275,9 +1225,6 @@
 .RoundConerBlue .WindowBarCenter {
 	background: url('background/RoundCornerBlue.png') repeat-x;
 	background-position: left -90px;
-}
-
-.RoundConerBlue .WindowBarCenter .FixHeight {
 	height: 22px;
 	padding-top: 10px;
 }
@@ -1317,9 +1264,6 @@
 .RoundConerBlue .BottomDecoratorCenter {
 	background: url('background/RoundCornerBlue.png') repeat-x;
 	background-position: top;
-}
-
-.RoundConerBlue .BottomDecoratorCenter .FixHeight {
 	height: 30px;
 }
 
@@ -1370,7 +1314,6 @@
 	line-height: 19px;
 	overflow: hidden;
 	white-space: nowrap;
-	width: 100%;
 }
 
 .RoundConerViolet .ArrowDownIcon {
@@ -1430,9 +1373,6 @@
 .RoundConerViolet .WindowBarCenter {
 	background: url('background/RoundConerViolet.png') repeat-x;
 	background-position: left -90px;
-}
-
-.RoundConerViolet .WindowBarCenter .FixHeight {
 	height: 22px;
 	padding-top: 10px;
 }
@@ -1476,9 +1416,6 @@
 .RoundConerViolet .BottomDecoratorCenter {
 	background: url('background/RoundConerViolet.png') repeat-x;
 	background-position: top;
-}
-
-.RoundConerViolet .BottomDecoratorCenter .FixHeight {
 	height: 30px;
 }
 
@@ -1530,7 +1467,6 @@
 	line-height: 19px;
 	overflow: hidden;
 	white-space: nowrap;
-	width: 100%;
 }
 
 .RoundConerOrange .ArrowDownIcon {
@@ -1590,9 +1526,6 @@
 .RoundConerOrange .WindowBarCenter {
 	background: url('background/RoundConerOrange.png') repeat-x;
 	background-position: left -90px;
-}
-
-.RoundConerOrange .WindowBarCenter .FixHeight {
 	height: 22px;
 	padding-top: 10px;
 }
@@ -1636,9 +1569,6 @@
 .RoundConerOrange .BottomDecoratorCenter {
 	background: url('background/RoundConerOrange.png') repeat-x;
 	background-position: top;
-}
-
-.RoundConerOrange .BottomDecoratorCenter .FixHeight {
 	height: 30px;
 }
 
@@ -1690,7 +1620,6 @@
 	line-height: 19px;
 	overflow: hidden;
 	white-space: nowrap;
-	width: 100%;
 }
 
 .RoundConerPink .ArrowDownIcon {
@@ -1750,9 +1679,6 @@
 .RoundConerPink .WindowBarCenter {
 	background: url('background/RoundConerPink.png') repeat-x;
 	background-position: left -90px;
-}
-
-.RoundConerPink .WindowBarCenter .FixHeight {
 	height: 22px;
 	padding-top: 10px;
 }
@@ -1796,9 +1722,6 @@
 .RoundConerPink .BottomDecoratorCenter {
 	background: url('background/RoundConerPink.png') repeat-x;
 	background-position: top;
-}
-
-.RoundConerPink .BottomDecoratorCenter .FixHeight {
 	height: 30px;
 }
 
@@ -1850,7 +1773,6 @@
 	line-height: 19px;
 	overflow: hidden;
 	white-space: nowrap;
-	width: 100%;
 }
 
 .RoundConerGreen .ArrowDownIcon {
@@ -1910,9 +1832,6 @@
 .RoundConerGreen .WindowBarCenter {
 	background: url('background/RoundConerGreen.png') repeat-x;
 	background-position: left -90px;
-}
-
-.RoundConerGreen .WindowBarCenter .FixHeight {
 	height: 22px;
 	padding-top: 10px;
 }
@@ -1956,9 +1875,6 @@
 .RoundConerGreen .BottomDecoratorCenter {
 	background: url('background/RoundConerGreen.png') repeat-x;
 	background-position: top;
-}
-
-.RoundConerGreen .BottomDecoratorCenter .FixHeight {
 	height: 30px;
 }
 
@@ -2010,7 +1926,6 @@
 	line-height: 16px;
 	overflow: hidden;
 	white-space: nowrap;
-	width: 100%;
 }
 
 .ShadowBlue .ArrowDownIcon {
@@ -2071,9 +1986,6 @@
 	background-image: url('background/ShadowBlue.png');
 	background-repeat: repeat-x;
 	background-position: center -84px;
-}
-
-.ShadowBlue .WindowBarCenter .FixHeight {
 	height: 20px;
 	padding-top: 9px;
 }
@@ -2114,9 +2026,6 @@
 	background-image: url('background/ShadowBlue.png');
 	background-repeat: repeat-x;
 	background-position: center top;
-}
-
-.ShadowBlue .BottomDecoratorCenter .FixHeight {
 	height: 28px;
 }
 
@@ -2168,7 +2077,6 @@
 	line-height: 16px;
 	overflow: hidden;
 	white-space: nowrap;
-	width: 100%;
 }
 
 .ShadowViolet .ArrowDownIcon {
@@ -2229,9 +2137,6 @@
 	background-image: url('background/ShadowViolet.png');
 	background-repeat: repeat-x;
 	background-position: center -84px;
-}
-
-.ShadowViolet .WindowBarCenter .FixHeight {
 	height: 20px;
 	padding-top: 9px;
 }
@@ -2272,9 +2177,6 @@
 	background-image: url('background/ShadowViolet.png');
 	background-repeat: repeat-x;
 	background-position: center top;
-}
-
-.ShadowViolet .BottomDecoratorCenter .FixHeight {
 	height: 28px;
 }
 
@@ -2326,7 +2228,6 @@
 	line-height: 16px;
 	overflow: hidden;
 	white-space: nowrap;
-	width: 100%;
 }
 
 .ShadowOrange .ArrowDownIcon {
@@ -2387,9 +2288,6 @@
 	background-image: url('background/ShadowOrange.png');
 	background-repeat: repeat-x;
 	background-position: center -84px;
-}
-
-.ShadowOrange .WindowBarCenter .FixHeight {
 	height: 19px;
 	padding-top: 10px;
 }
@@ -2430,9 +2328,6 @@
 	background-image: url('background/ShadowOrange.png');
 	background-repeat: repeat-x;
 	background-position: center top;
-}
-
-.ShadowOrange .BottomDecoratorCenter .FixHeight {
 	height: 28px;
 }
 
@@ -2485,7 +2380,6 @@
 	line-height: 16px;
 	overflow: hidden;
 	white-space: nowrap;
-	width: 100%;
 }
 
 .ShadowPink .ArrowDownIcon {
@@ -2546,9 +2440,6 @@
 	background-image: url('background/ShadowPink.png');
 	background-repeat: repeat-x;
 	background-position: center -84px;
-}
-
-.ShadowPink .WindowBarCenter .FixHeight {
 	height: 19px;
 	padding-top: 10px;
 }
@@ -2589,9 +2480,6 @@
 	background-image: url('background/ShadowPink.png');
 	background-repeat: repeat-x;
 	background-position: center top;
-}
-
-.ShadowPink .BottomDecoratorCenter .FixHeight {
 	height: 28px;
 }
 
@@ -2644,7 +2532,6 @@
 	line-height: 16px;
 	overflow: hidden;
 	white-space: nowrap;
-	width: 100%;
 }
 
 .ShadowGreen .ArrowDownIcon {
@@ -2705,9 +2592,6 @@
 	background-image: url('background/ShadowGreen.png');
 	background-repeat: repeat-x;
 	background-position: center -84px;
-}
-
-.ShadowGreen .WindowBarCenter .FixHeight {
 	height: 20px;
 	padding-top: 9px;
 }
@@ -2748,9 +2632,6 @@
 	background-image: url('background/ShadowGreen.png');
 	background-repeat: repeat-x;
 	background-position: center top;
-}
-
-.ShadowGreen .BottomDecoratorCenter .FixHeight {
 	height: 28px;
 }
 
@@ -2800,7 +2681,6 @@
 	color: #333333;
 	overflow: hidden;
 	white-space: nowrap;
-	width: 100%;
 }
 
 .SimpleBlue .ArrowDownIcon {
@@ -2854,9 +2734,6 @@
 
 .SimpleBlue .WindowBarCenter {
 	background: #b0c0f5;
-}
-
-.SimpleBlue .WindowBarCenter .FixHeight {
 	height: 18px;
 	line-height: 18px;
 }
@@ -2895,9 +2772,6 @@
 	border: 1px solid #4a67b1;
 	border-top: none;
 	background: white url('background/BGDecoratorCenter1x18.gif') repeat-x; 
-}
-
-.SimpleBlue .BottomDecoratorCenter .FixHeight {
 	height: 19px;
 }
 
@@ -2947,7 +2821,6 @@
 	color: #333333;
 	overflow: hidden;
 	white-space: nowrap;
-	width: 100%;
 }
 
 .SimpleViolet .ArrowDownIcon {
@@ -3001,9 +2874,6 @@
 
 .SimpleViolet .WindowBarCenter {
 	background: #c4a6ff;
-}
-
-.SimpleViolet .WindowBarCenter .FixHeight {
 	height: 18px;
 	line-height: 18px;
 }
@@ -3040,9 +2910,6 @@
 	border: 1px solid #5700a9;
 	border-top: none;
 	background: url('background/BGDecoratorCenter1x18.gif') repeat-x; 
-}
-
-.SimpleViolet .BottomDecoratorCenter .FixHeight {
 	height: 19px;
 }
 
@@ -3096,7 +2963,6 @@
 	color: #333333;
 	overflow: hidden;
 	white-space: nowrap;
-	width: 100%;
 }
 
 .SimpleOrange .ArrowDownIcon {
@@ -3150,9 +3016,6 @@
 
 .SimpleOrange .WindowBarCenter {
 	background: #ffd1a8;
-}
-
-.SimpleOrange .WindowBarCenter .FixHeight {
 	height: 18px;
 	line-height: 18px;
 }
@@ -3189,9 +3052,6 @@
 	border: 1px solid #b27a49;
 	border-top: none;
 	background: url('background/BGDecoratorCenter1x18.gif') repeat-x; 
-}
-
-.SimpleOrange .BottomDecoratorCenter .FixHeight {
 	height: 19px;
 }
 
@@ -3245,7 +3105,6 @@
 	color: #333333;
 	overflow: hidden;
 	white-space: nowrap;
-	width: 100%;
 }
 
 .SimplePink .ArrowDownIcon {
@@ -3299,9 +3158,6 @@
 
 .SimplePink .WindowBarCenter {
 	background: #fdd8f9;
-}
-
-.SimplePink .WindowBarCenter .FixHeight {
 	height: 18px;
 	line-height: 18px;
 }
@@ -3338,9 +3194,6 @@
 	border: 1px solid #9a5591;
 	border-top: none;
 	background: url('background/BGDecoratorCenter1x18.gif') repeat-x; 
-}
-
-.SimplePink .BottomDecoratorCenter .FixHeight {
 	height: 19px;
 }
 
@@ -3395,7 +3248,6 @@
 	color: #333333;
 	overflow: hidden;
 	white-space: nowrap;
-	width: 100%;
 }
 
 .SimpleGreen .ArrowDownIcon {
@@ -3449,9 +3301,6 @@
 
 .SimpleGreen .WindowBarCenter {
 	background: #a3d0ff;
-}
-
-.SimpleGreen .WindowBarCenter .FixHeight {
 	height: 18px;
 	line-height: 18px;
 }
@@ -3489,9 +3338,6 @@
 	border: 1px solid #4c717e;
 	border-top: none;
 	background: url('background/BGDecoratorCenter1x18.gif') repeat-x; 
-}
-
-.SimpleGreen .BottomDecoratorCenter .FixHeight {
 	height: 19px;
 }
 

Modified:
portal/branches/dom/web/eXoResources/src/main/webapp/skin/DefaultSkin/portal/webui/component/view/UIPortalComponent/Stylesheet.css
===================================================================
---
portal/branches/dom/web/eXoResources/src/main/webapp/skin/DefaultSkin/portal/webui/component/view/UIPortalComponent/Stylesheet.css	2011-09-06
04:49:25 UTC (rev 7306)
+++
portal/branches/dom/web/eXoResources/src/main/webapp/skin/DefaultSkin/portal/webui/component/view/UIPortalComponent/Stylesheet.css	2011-09-06
04:52:36 UTC (rev 7307)
@@ -182,9 +182,6 @@
 
 .PortletLayoutDecorator .CPortletLayoutDecorator {
 	background: url('background/PortletLayoutDecorator.gif') repeat-x center -89px;
-}
-
-.PortletLayoutDecorator .FixHeight {
 	height: 69px;
 	padding: 10px 0;
 }
@@ -218,4 +215,4 @@
 	filter: alpha(opacity=0);
 	background: #ffffff;
 	cursor:move;
-}
\ No newline at end of file
+}

Modified:
portal/branches/dom/web/eXoResources/src/main/webapp/skin/DefaultSkin/webui/component/UIPopup/UIPopupCategory/Stylesheet.css
===================================================================
---
portal/branches/dom/web/eXoResources/src/main/webapp/skin/DefaultSkin/webui/component/UIPopup/UIPopupCategory/Stylesheet.css	2011-09-06
04:49:25 UTC (rev 7306)
+++
portal/branches/dom/web/eXoResources/src/main/webapp/skin/DefaultSkin/webui/component/UIPopup/UIPopupCategory/Stylesheet.css	2011-09-06
04:52:36 UTC (rev 7307)
@@ -28,68 +28,25 @@
 	width: 120px;
 	top: 15px;
 	left: -85px; /* orientation=lt */
-	right: -85px; /* orientation=rt */
+	right: -85px; /* orientation=rt */
+	border: 1px solid #787878;
+	box-shadow: 1px 1px 2px #787878; /* orientation=lt */
+	-moz-box-shadow: 1px 1px 2px #787878; /* orientation=lt */
+	-webkit-box-shadow: 1px 1px 2px #787878; /* orientation=lt */
+	box-shadow: -1px 1px 2px #787878; /* orientation=rt */
+	-moz-box-shadow: -1px 1px 2px #787878; /* orientation=rt */
+	-webkit-box-shadow: -1px 1px 2px #787878; /* orientation=rt */
+	margin-top: 8px;
+	background: #ffffff;
 }
 
-.UIPopupCategory .PopupCategoryDecorator {
+.UIPopupCategory .PopupCategoryDecorator {
+	background: url('background/PopupCategory.gif') no-repeat 88% top; /*
orientation=lt */
+	background: url('background/PopupCategory-rt.gif') no-repeat 8px top; /*
orientation=rt */
+	margin-top: -11px;
+	padding: 15px 4px 4px;
 }
 
-.UIPopupCategory .PopupCategoryDecorator .PopupCategoryTL {
-	background: url('background/PopupCategory.gif') no-repeat left top; /*
orientation=lt */
-	background: url('background/PopupCategory-rt.gif') no-repeat right top; /*
orientation=rt */
-	padding-left: 6px; /* orientation=lt */
-	padding-right: 6px; /* orientation=rt */
-}
-
-.UIPopupCategory .PopupCategoryDecorator .PopupCategoryTC {
-	height: 16px;
-	background: url('background/PopupCategory.gif') repeat-x left -39px;
-}
-
-.UIPopupCategory .PopupCategoryDecorator .PopupCategoryTR {
-	background: url('background/PopupCategory.gif') no-repeat right -16px; /*
orientation=lt */
-	background: url('background/PopupCategory-rt.gif') no-repeat left -16px; /*
orientation=rt */
-	padding-right: 35px; /* orientation=lt */
-	padding-left: 35px; /* orientation=rt */
-}
-
-.UIPopupCategory .PopupCategoryDecorator .PopupCategoryML {
-	background: url('background/MidlePopupCategory.gif') repeat-y left; /*
orientation=lt */
-	background: url('background/MidlePopupCategory-rt.gif') repeat-y right; /*
orientation=rt */
-	padding-left: 6px; /* orientation=lt */
-	padding-right: 6px; /* orientation=rt */
-}
-
-.UIPopupCategory .PopupCategoryDecorator .PopupCategoryMC {
-	background: #efefef;
-}
-
-.UIPopupCategory .PopupCategoryDecorator .PopupCategoryMR {
-	background: url('background/MidlePopupCategory.gif') repeat-y right; /*
orientation=lt */
-	background: url('background/MidlePopupCategory-rt.gif') repeat-y left; /*
orientation=rt */
-	padding-right: 8px; /* orientation=lt */
-	padding-left: 8px; /* orientation=rt */
-}
-
-.UIPopupCategory .PopupCategoryDecorator .PopupCategoryBL {
-	background: url('background/PopupCategory.gif') no-repeat left -32px; /*
orientation=lt */
-	background: url('background/PopupCategory-rt.gif') no-repeat right -32px; /*
orientation=rt */
-	padding-left: 6px; /* orientation=lt */
-	padding-right: 6px; /* orientation=rt */
-}
-
-.UIPopupCategory .PopupCategoryDecorator .PopupCategoryBC {
-	height: 7px;
-	background: url('background/PopupCategory.gif') repeat-x left -55px;
-}
-
-.UIPopupCategory .PopupCategoryDecorator .PopupCategoryBR {
-	background: url('background/PopupCategory.gif') no-repeat right -32px; /*
orientation=lt */
-	background: url('background/PopupCategory-rt.gif') no-repeat left -32px; /*
orientation=rt */
-	padding-right: 8px; /* orientation=lt */
-	padding-left: 8px; /* orientation=rt */
-}
-
 .UIPopupCategory .CategoryItem .Icon {
 	width: 16px;
 	height: 16px;
@@ -110,21 +67,23 @@
 	border-bottom: 1px #cdcdcd solid;
 	cursor: pointer;
 	display: block;
-	text-align: left;
-	width: auto;
+	padding-left: 18px; /* orientation=lt */
+	padding-right: 18px; /* orientation=rt */
+	height: 22px;
+	line-height: 22px;
+	background: #efefef
url('/eXoResources/skin/DefaultSkin/skinIcons/16x16/icons/GrayNextArrow.gif')
no-repeat left center; /* orientation=lt */
+	background: #efefef
url('/eXoResources/skin/DefaultSkin/skinIcons/16x16/icons/GrayNextArrow-rt.gif')
no-repeat right center; /* orientation=rt */
 }
 
 .UIPopupCategory .CategoryItem:hover {
-	background: #cbcff2;
-	color: #2569dc;
-}
-
-.UIPopupCategory .CategoryItem .CategoryItemLabel {
-	padding-left: 18px; /* orientation=lt */
-	padding-right: 18px; /* orientation=rt */
-	height: 22px;
+	color: #2569dc;
+	border-bottom: 1px #cdcdcd solid;
+	cursor: pointer;
+	display: block;
+	padding-left: 18px; /* orientation=lt */
+	padding-right: 18px; /* orientation=rt */
+	height: 22px;
 	line-height: 22px;
-	overflow: hidden;
-	background:
url('/eXoResources/skin/DefaultSkin/skinIcons/16x16/icons/GrayNextArrow.gif')
no-repeat left center; /* orientation=lt */
-	background:
url('/eXoResources/skin/DefaultSkin/skinIcons/16x16/icons/GrayNextArrow-rt.gif')
no-repeat right center; /* orientation=rt */
+	background: #cbcff2
url('/eXoResources/skin/DefaultSkin/skinIcons/16x16/icons/GrayNextArrow.gif')
no-repeat left center; /* orientation=lt */
+	background: #cbcff2
url('/eXoResources/skin/DefaultSkin/skinIcons/16x16/icons/GrayNextArrow-rt.gif')
no-repeat right center; /* orientation=rt */
 }
\ No newline at end of file

Deleted:
portal/branches/dom/web/eXoResources/src/main/webapp/skin/DefaultSkin/webui/component/UIPopup/UIPopupCategory/background/MidlePopupCategory.gif
===================================================================
(Binary files differ)

Modified:
portal/branches/dom/web/eXoResources/src/main/webapp/skin/DefaultSkin/webui/component/UIPopup/UIPopupCategory/background/PopupCategory.gif
===================================================================
(Binary files differ)

Modified:
portal/branches/dom/web/eXoResources/src/main/webapp/skin/PortletThemes/Stylesheet.css
===================================================================
---
portal/branches/dom/web/eXoResources/src/main/webapp/skin/PortletThemes/Stylesheet.css	2011-09-06
04:49:25 UTC (rev 7306)
+++
portal/branches/dom/web/eXoResources/src/main/webapp/skin/PortletThemes/Stylesheet.css	2011-09-06
04:52:36 UTC (rev 7307)
@@ -96,7 +96,6 @@
 	color: #333333;
 	overflow: hidden;
 	white-space: nowrap;
-	width: 100%;
 }
 
 .DefaultTheme .WindowBarLeft {
@@ -117,9 +116,6 @@
 	background-image: url('background/DefaultTheme.png');
 	background-repeat: repeat-x;
 	background-position: left -90px;
-}
-
-.DefaultTheme .WindowBarCenter .FixHeight {
 	height: 21px;
 	padding-top: 8px;
 }
@@ -156,9 +152,6 @@
 	background-image: url('background/DefaultTheme.png');
 	background-repeat: repeat-x;
 	background-position: left top;
-}
-
-.DefaultTheme .BottomDecoratorCenter .FixHeight {
 	height: 30px;
 }
 
@@ -180,7 +173,6 @@
 	line-height: 17px;
 	overflow: hidden;
 	white-space: nowrap;
-	width: 100%;
 }
 
 .MacTheme .WindowBarCenter .PortletIcon {
@@ -288,9 +280,6 @@
 	background-image: url('background/MacTheme.png');
 	background-repeat: repeat-x;
 	background-position: center top;
-}
-
-.MacTheme .BottomDecoratorCenter .FixHeight {
 	height: 23px; line-height: 23px;
 }
 
@@ -312,9 +301,6 @@
 	background-image: url('background/MacTheme.png');
 	background-repeat: repeat-x;
 	background-position: center -69px;
-}
-
-.MacTheme .WindowBarCenter .FixHeight {
 	height: 19px;
 	padding-top: 4px;
 }
@@ -337,7 +323,6 @@
 	line-height: 17px;
 	overflow: hidden;
 	white-space: nowrap;
-	width: 100%;
 }
 
 .MacGray .WindowBarCenter .PortletIcon {
@@ -446,9 +431,6 @@
 	background-image: url('background/MacGray.png');
 	background-repeat: repeat-x;
 	background-position: left top;
-}
-
-.MacGray .BottomDecoratorCenter .FixHeight {
 	height: 24px; line-height: 24px;
 }
 
@@ -470,9 +452,6 @@
 	background-image: url('background/MacGray.png');
 	background-repeat: repeat-x;
 	background-position: center -72px;
-}
-
-.MacGray .WindowBarCenter .FixHeight {
 	height: 19px;
 	padding-top: 4px;
 }
@@ -495,7 +474,6 @@
 	line-height: 17px;
 	overflow: hidden;
 	white-space: nowrap;
-	width: 100%;
 }
 
 .MacBlack .WindowBarCenter .PortletIcon {
@@ -604,9 +582,6 @@
 	background-image: url('background/MacBlack.png');
 	background-repeat: repeat-x;
 	background-position: left top;
-}
-
-.MacBlack .BottomDecoratorCenter .FixHeight {
 	height: 24px; line-height: 24px;
 }
 
@@ -628,9 +603,6 @@
 	background-image: url('background/MacBlack.png');
 	background-repeat: repeat-x;
 	background-position: center -72px;
-}
-
-.MacBlack .WindowBarCenter .FixHeight {
 	height: 19px;
 	padding-top: 4px;
 }
@@ -653,7 +625,6 @@
 	line-height: 17px;
 	overflow: hidden;
 	white-space: nowrap;
-	width: 100%;
 }
 
 .MacGreenSteel .WindowBarCenter .PortletIcon {
@@ -762,9 +733,6 @@
 	background-image: url('background/MacGreen.png');
 	background-repeat: repeat-x;
 	background-position: left top;
-}
-
-.MacGreenSteel .BottomDecoratorCenter .FixHeight {
 	height: 24px; line-height: 24px;
 }
 
@@ -786,9 +754,6 @@
 	background-image: url('background/MacGreen.png');
 	background-repeat: repeat-x;
 	background-position: center -72px;
-}
-
-.MacGreenSteel .WindowBarCenter .FixHeight {
 	height: 19px;
 	padding-top: 4px;
 }
@@ -910,9 +875,6 @@
 	background-image: url('background/VistaTheme.png');
 	background-repeat: repeat-x;
 	background-position: left top;
-}
-
-.VistaTheme .BottomDecoratorCenter .FixHeight {
 	height: 24px;
 }
 
@@ -921,7 +883,6 @@
 	line-height: 22px;
 	overflow: hidden;
 	white-space: nowrap;
-	width: 100%;
 }
 
 .VistaTheme .WindowBarLeft {
@@ -942,9 +903,6 @@
 	background-image: url('background/VistaTheme.png');
 	background-repeat: repeat-x;
 	background-position: left -72px;
-}
-
-.VistaTheme .WindowBarCenter .FixHeight {
 	height: 24px;
 	padding-top: 5px;
 }
@@ -970,7 +928,6 @@
 	line-height: 22px;
 	overflow: hidden;
 	white-space: nowrap;
-	width: 100%;
 }
 
 .VistaBlue .WindowBarCenter .PortletIcon {
@@ -1075,9 +1032,6 @@
 	background-image: url('background/VistaBlue.png');
 	background-repeat: repeat-x;
 	background-position: left top;
-}
-
-.VistaBlue .BottomDecoratorCenter .FixHeight {
 	height: 27px;
 }
 
@@ -1099,9 +1053,6 @@
 	background-image: url('background/VistaBlue.png');
 	background-repeat: repeat-x;
 	background-position: left -81px;
-}
-
-.VistaBlue .WindowBarCenter .FixHeight {
 	height: 27px;
 	padding-top: 8px;
 }
@@ -1147,7 +1098,6 @@
 	line-height: 19px;
 	overflow: hidden;
 	white-space: nowrap;
-	width: 100%;
 }
 
 .RoundConerBlue .ArrowDownIcon {
@@ -1207,9 +1157,6 @@
 .RoundConerBlue .WindowBarCenter {
 	background: url('background/RoundCornerBlue.png') repeat-x;
 	background-position: left -90px;
-}
-
-.RoundConerBlue .WindowBarCenter .FixHeight {
 	height: 22px;
 	padding-top: 10px;
 }
@@ -1249,9 +1196,6 @@
 .RoundConerBlue .BottomDecoratorCenter {
 	background: url('background/RoundCornerBlue.png') repeat-x;
 	background-position: top;
-}
-
-.RoundConerBlue .BottomDecoratorCenter .FixHeight {
 	height: 30px;
 }
 
@@ -1294,7 +1238,6 @@
 	line-height: 19px;
 	overflow: hidden;
 	white-space: nowrap;
-	width: 100%;
 }
 
 .RoundConerViolet .ArrowDownIcon {
@@ -1354,9 +1297,6 @@
 .RoundConerViolet .WindowBarCenter {
 	background: url('background/RoundConerViolet.png') repeat-x;
 	background-position: left -90px;
-}
-
-.RoundConerViolet .WindowBarCenter .FixHeight {
 	height: 22px;
 	padding-top: 10px;
 }
@@ -1400,9 +1340,6 @@
 .RoundConerViolet .BottomDecoratorCenter {
 	background: url('background/RoundConerViolet.png') repeat-x;
 	background-position: top;
-}
-
-.RoundConerViolet .BottomDecoratorCenter .FixHeight {
 	height: 30px;
 }
 
@@ -1446,7 +1383,6 @@
 	line-height: 19px;
 	overflow: hidden;
 	white-space: nowrap;
-	width: 100%;
 }
 
 .RoundConerOrange .ArrowDownIcon {
@@ -1506,9 +1442,6 @@
 .RoundConerOrange .WindowBarCenter {
 	background: url('background/RoundConerOrange.png') repeat-x;
 	background-position: left -90px;
-}
-
-.RoundConerOrange .WindowBarCenter .FixHeight {
 	height: 22px;
 	padding-top: 10px;
 }
@@ -1552,9 +1485,6 @@
 .RoundConerOrange .BottomDecoratorCenter {
 	background: url('background/RoundConerOrange.png') repeat-x;
 	background-position: top;
-}
-
-.RoundConerOrange .BottomDecoratorCenter .FixHeight {
 	height: 30px;
 }
 
@@ -1598,7 +1528,6 @@
 	line-height: 19px;
 	overflow: hidden;
 	white-space: nowrap;
-	width: 100%;
 }
 
 .RoundConerPink .ArrowDownIcon {
@@ -1658,9 +1587,6 @@
 .RoundConerPink .WindowBarCenter {
 	background: url('background/RoundConerPink.png') repeat-x;
 	background-position: left -90px;
-}
-
-.RoundConerPink .WindowBarCenter .FixHeight {
 	height: 22px;
 	padding-top: 10px;
 }
@@ -1704,9 +1630,6 @@
 .RoundConerPink .BottomDecoratorCenter {
 	background: url('background/RoundConerPink.png') repeat-x;
 	background-position: top;
-}
-
-.RoundConerPink .BottomDecoratorCenter .FixHeight {
 	height: 30px;
 }
 
@@ -1750,7 +1673,6 @@
 	line-height: 19px;
 	overflow: hidden;
 	white-space: nowrap;
-	width: 100%;
 }
 
 .RoundConerGreen .ArrowDownIcon {
@@ -1810,9 +1732,6 @@
 .RoundConerGreen .WindowBarCenter {
 	background: url('background/RoundConerGreen.png') repeat-x;
 	background-position: left -90px;
-}
-
-.RoundConerGreen .WindowBarCenter .FixHeight {
 	height: 22px;
 	padding-top: 10px;
 }
@@ -1856,9 +1775,6 @@
 .RoundConerGreen .BottomDecoratorCenter {
 	background: url('background/RoundConerGreen.png') repeat-x;
 	background-position: top;
-}
-
-.RoundConerGreen .BottomDecoratorCenter .FixHeight {
 	height: 30px;
 }
 
@@ -1902,7 +1818,6 @@
 	line-height: 16px;
 	overflow: hidden;
 	white-space: nowrap;
-	width: 100%;
 }
 
 .ShadowBlue .ArrowDownIcon {
@@ -1963,9 +1878,6 @@
 	background-image: url('background/ShadowBlue.png');
 	background-repeat: repeat-x;
 	background-position: center -84px;
-}
-
-.ShadowBlue .WindowBarCenter .FixHeight {
 	height: 20px;
 	padding-top: 9px;
 }
@@ -2006,9 +1918,6 @@
 	background-image: url('background/ShadowBlue.png');
 	background-repeat: repeat-x;
 	background-position: center top;
-}
-
-.ShadowBlue .BottomDecoratorCenter .FixHeight {
 	height: 28px;
 }
 
@@ -2052,7 +1961,6 @@
 	line-height: 16px;
 	overflow: hidden;
 	white-space: nowrap;
-	width: 100%;
 }
 
 .ShadowViolet .ArrowDownIcon {
@@ -2113,9 +2021,6 @@
 	background-image: url('background/ShadowViolet.png');
 	background-repeat: repeat-x;
 	background-position: center -84px;
-}
-
-.ShadowViolet .WindowBarCenter .FixHeight {
 	height: 20px;
 	padding-top: 9px;
 }
@@ -2156,9 +2061,6 @@
 	background-image: url('background/ShadowViolet.png');
 	background-repeat: repeat-x;
 	background-position: center top;
-}
-
-.ShadowViolet .BottomDecoratorCenter .FixHeight {
 	height: 28px;
 }
 
@@ -2202,7 +2104,6 @@
 	line-height: 16px;
 	overflow: hidden;
 	white-space: nowrap;
-	width: 100%;
 }
 
 .ShadowOrange .ArrowDownIcon {
@@ -2263,9 +2164,6 @@
 	background-image: url('background/ShadowOrange.png');
 	background-repeat: repeat-x;
 	background-position: center -84px;
-}
-
-.ShadowOrange .WindowBarCenter .FixHeight {
 	height: 19px;
 	padding-top: 10px;
 }
@@ -2306,9 +2204,6 @@
 	background-image: url('background/ShadowOrange.png');
 	background-repeat: repeat-x;
 	background-position: center top;
-}
-
-.ShadowOrange .BottomDecoratorCenter .FixHeight {
 	height: 28px;
 }
 
@@ -2353,7 +2248,6 @@
 	line-height: 16px;
 	overflow: hidden;
 	white-space: nowrap;
-	width: 100%;
 }
 
 .ShadowPink .ArrowDownIcon {
@@ -2414,9 +2308,6 @@
 	background-image: url('background/ShadowPink.png');
 	background-repeat: repeat-x;
 	background-position: center -84px;
-}
-
-.ShadowPink .WindowBarCenter .FixHeight {
 	height: 19px;
 	padding-top: 10px;
 }
@@ -2457,9 +2348,6 @@
 	background-image: url('background/ShadowPink.png');
 	background-repeat: repeat-x;
 	background-position: center top;
-}
-
-.ShadowPink .BottomDecoratorCenter .FixHeight {
 	height: 28px;
 }
 
@@ -2504,7 +2392,6 @@
 	line-height: 16px;
 	overflow: hidden;
 	white-space: nowrap;
-	width: 100%;
 }
 
 .ShadowGreen .ArrowDownIcon {
@@ -2565,9 +2452,6 @@
 	background-image: url('background/ShadowGreen.png');
 	background-repeat: repeat-x;
 	background-position: center -84px;
-}
-
-.ShadowGreen .WindowBarCenter .FixHeight {
 	height: 20px;
 	padding-top: 9px;
 }
@@ -2608,9 +2492,6 @@
 	background-image: url('background/ShadowGreen.png');
 	background-repeat: repeat-x;
 	background-position: center top;
-}
-
-.ShadowGreen .BottomDecoratorCenter .FixHeight {
 	height: 28px;
 }
 
@@ -2652,7 +2533,6 @@
 	color: #333333;
 	overflow: hidden;
 	white-space: nowrap;
-	width: 100%;
 }
 
 .SimpleBlue .ArrowDownIcon {
@@ -2706,9 +2586,6 @@
 
 .SimpleBlue .WindowBarCenter {
 	background: #b0c0f5;
-}
-
-.SimpleBlue .WindowBarCenter .FixHeight {
 	height: 18px;
 	line-height: 18px;
 }
@@ -2747,9 +2624,6 @@
 	border: 1px solid #4a67b1;
 	border-top: none;
 	background: white url('background/BGDecoratorCenter1x18.gif') repeat-x; 
-}
-
-.SimpleBlue .BottomDecoratorCenter .FixHeight {
 	height: 19px;
 }
 
@@ -2791,7 +2665,6 @@
 	color: #333333;
 	overflow: hidden;
 	white-space: nowrap;
-	width: 100%;
 }
 
 .SimpleViolet .ArrowDownIcon {
@@ -2845,9 +2718,6 @@
 
 .SimpleViolet .WindowBarCenter {
 	background: #c4a6ff;
-}
-
-.SimpleViolet .WindowBarCenter .FixHeight {
 	height: 18px;
 	line-height: 18px;
 }
@@ -2884,15 +2754,9 @@
 	border: 1px solid #5700a9;
 	border-top: none;
 	background: url('background/BGDecoratorCenter1x18.gif') repeat-x; 
-}
-
-.SimpleViolet .BottomDecoratorCenter .FixHeight {
 	height: 19px;
 }
 
-.UIPortlet .SimpleViolet .BottomDecoratorCenter {
-	height: 18px;
-}
 
 /*------------------------------ SimpleOrange -----------------------------------*/
 
@@ -2932,7 +2796,6 @@
 	color: #333333;
 	overflow: hidden;
 	white-space: nowrap;
-	width: 100%;
 }
 
 .SimpleOrange .ArrowDownIcon {
@@ -2986,9 +2849,6 @@
 
 .SimpleOrange .WindowBarCenter {
 	background: #ffd1a8;
-}
-
-.SimpleOrange .WindowBarCenter .FixHeight {
 	height: 18px;
 	line-height: 18px;
 }
@@ -3025,16 +2885,9 @@
 	border: 1px solid #b27a49;
 	border-top: none;
 	background: url('background/BGDecoratorCenter1x18.gif') repeat-x; 
-}
-
-.SimpleOrange .BottomDecoratorCenter .FixHeight {
 	height: 19px;
 }
 
-.UIPortlet .SimpleOrange .BottomDecoratorCenter {
-	height: 18px;
-}
-
 /*------------------------------ SimplePink -----------------------------------*/
 
 .SimplePink .WindowBarCenter .WindowPortletInfo {
@@ -3073,7 +2926,6 @@
 	color: #333333;
 	overflow: hidden;
 	white-space: nowrap;
-	width: 100%;
 }
 
 .SimplePink .ArrowDownIcon {
@@ -3127,9 +2979,6 @@
 
 .SimplePink .WindowBarCenter {
 	background: #fdd8f9;
-}
-
-.SimplePink .WindowBarCenter .FixHeight {
 	height: 18px;
 	line-height: 18px;
 }
@@ -3166,16 +3015,9 @@
 	border: 1px solid #9a5591;
 	border-top: none;
 	background: url('background/BGDecoratorCenter1x18.gif') repeat-x; 
-}
-
-.SimplePink .BottomDecoratorCenter .FixHeight {
 	height: 19px;
 }
 
-.UIPortlet .SimplePink .BottomDecoratorCenter {
-	height: 18px;
-}
-
 /*------------------------------ SimpleGreen -----------------------------------*/
 
 .SimpleGreen .WindowBarCenter .WindowPortletInfo {
@@ -3215,7 +3057,6 @@
 	color: #333333;
 	overflow: hidden;
 	white-space: nowrap;
-	width: 100%;
 }
 
 .SimpleGreen .ArrowDownIcon {
@@ -3269,9 +3110,6 @@
 
 .SimpleGreen .WindowBarCenter {
 	background: #a3d0ff;
-}
-
-.SimpleGreen .WindowBarCenter .FixHeight {
 	height: 18px;
 	line-height: 18px;
 }
@@ -3309,12 +3147,5 @@
 	border: 1px solid #4c717e;
 	border-top: none;
 	background: url('background/BGDecoratorCenter1x18.gif') repeat-x; 
-}
-
-.SimpleGreen .BottomDecoratorCenter .FixHeight {
 	height: 19px;
 }
-
-.UIPortlet .SimpleGreen .BottomDecoratorCenter {
-	height: 18px;	
-}

Modified:
portal/branches/dom/web/portal/src/main/webapp/groovy/portal/webui/application/UIPortlet.gtmpl
===================================================================
---
portal/branches/dom/web/portal/src/main/webapp/groovy/portal/webui/application/UIPortlet.gtmpl	2011-09-06
04:49:25 UTC (rev 7306)
+++
portal/branches/dom/web/portal/src/main/webapp/groovy/portal/webui/application/UIPortlet.gtmpl	2011-09-06
04:52:36 UTC (rev 7307)
@@ -33,13 +33,11 @@
 					<div class="LPortletLayoutDecorator">
 						<div class="RPortletLayoutDecorator">
 							<div class="CPortletLayoutDecorator">
-								<div class="FixHeight">
 									<%
 									if(hasPermission) {
 										print uicomponent.getDisplayTitle();
 									} else print "<div
class='ProtectedContent'>"+_ctx.appRes("UIPortlet.label.protectedContent")+"</div>";
 									%>
-								</div>
 							</div>
 						</div>
 					</div>
@@ -77,102 +75,82 @@
 				<div class="UIWindow $theme UIDragObject UIResizeObject"
id="UIWindow-${portletId}"	${cssStyle} >
 					<div class="WindowBarLeft">
 						<div class="WindowBarRight">
-							<div class="WindowBarCenter">
-								<div class="FixHeight ClearFix">
-										<%
-											
-											String restoreDown =
_ctx.appRes("UIPortlet.tooltip.MaximizeRestore");
-											String restore = _ctx.appRes("UIPortlet.tooltip.MinimizeRestore");
-											String miniTooltip = _ctx.appRes("UIPortlet.tooltip.Minimize");
-											String maxiTooltip = _ctx.appRes("UIPortlet.tooltip.Maximize");
-											String renderMaxi = maxiTooltip;
-											String renderMini = miniTooltip;
-											if(windowState == WindowState.MAXIMIZED) {
-												renderMaxi = restoreDown;
-											} else if(windowState == WindowState.MINIMIZED) {
-												renderMini = restore;
-											}
-											if(uicomponent.getShowWindowState()) {
-												String maximizedAction =
"eXo.portal.UIPortalControl.changeWindowState('"+portletId+"',
'maximized');";
-												String minimizedAction =
"eXo.portal.UIPortalControl.changeWindowState('"+portletId+"',
'minimized');";
-												String maximizedMode = "Maximized";
-												String minimizedMode = "Minimized";
-												if(windowState == WindowState.MAXIMIZED) {
-													maximizedAction =
"eXo.portal.UIPortalControl.changeWindowState('"+portletId+"',
'normal');";
-													maximizedMode = "Normal";
-												} else if(windowState == WindowState.MINIMIZED) {
-													minimizedAction =
"eXo.portal.UIPortalControl.changeWindowState('"+portletId+"',
'normal');";
-													minimizedMode = "Normal";
-												}
-										%>
-												<div class="ControlIcon ${maximizedMode}Icon"
title="$renderMaxi"	onclick="$maximizedAction"
onmouseover="$onControlOver"
onmouseout="$onControlOut"><span></span>
-														<div
style="display:none">{"normalTitle":"$maxiTooltip","modeTitle":"$restoreDown"}</div>
-												</div> 
-												<div class="ControlIcon ${minimizedMode}Icon"
title="$renderMini"	onclick="$minimizedAction"
onmouseover="$onControlOver"
onmouseout="$onControlOut"><span></span>
-														<div
style="display:none">{"normalTitle":"$miniTooltip","modeTitle":"$restore"}</div>
-												</div>
-										<%}		
-										
-										List supportModes = uicomponent.getSupportModes();
-											if(uicomponent.getShowPortletMode() && supportModes.size() > 0) {
-												String showCategory = "eXo.webui.UIPopupSelectCategory.show(this,
event);"
-										%>
-												<div class="ControlIcon ArrowDownIcon"
title="<%=_ctx.appRes("UIPortlet.tooltip.PortletMode");%>"
onclick="$showCategory" onmouseover="$onControlOver"
onmouseout="$onControlOut">
-													<% /*Begin Popup Menu*/ %>
-													<div style="position: relative; width: 100%">
-														<div class="UIPopupCategory" style="display:
none;">
-															<div class="PopupCategoryDecorator">
-																<div class="PopupCategoryTL">
-																	<div class="PopupCategoryTR">
-																		<div
class="PopupCategoryTC"><span></span></div>
-																	</div>
-																</div>
-																<div class="PopupCategoryML">
-																	<div class="PopupCategoryMR">
-																		<div class="PopupCategoryMC">
-																			<% 
-																				for(String mode in supportModes) {
-																					if(mode.equals("edit") &&
rcontext.getRemoteUser()==null) continue;
-																						String actionLink =
uicomponent.event("ChangePortletMode", mode);
-																						String modeLabel = _ctx.appRes("PortletMode.label." +
mode);
-																						String upper = mode.charAt(0).toString();
-																						mode = mode.replaceFirst(upper, upper.toUpperCase());
-																				%>
-																							<a class="CategoryItem" href="$actionLink"
title="$modeLabel">
-																								<div class="CategoryItemLabel"
>$modeLabel</div>
-																							</a>
-																				<%				
-																				}
-																				if(supportModes != null && supportModes.size() > 0
&& !supportModes.contains("view")) {
-																					String modeLabel = _ctx.appRes("PortletMode.label.view");
-																			%> 
-																						<a class="CategoryItem"
href="<%=uicomponent.event("ChangePortletMode",
"view")%>" title="$modeLabel">
-																							<div
class="CategoryItemLabel">$modeLabel</div>
-																						</a>												
-																			 <%}%> 	
-																		</div>
-																	</div>
-																</div>
-																<div class="PopupCategoryBL">
-																	<div class="PopupCategoryBR">
-																		<div
class="PopupCategoryBC"><span></span></div>
-																	</div>
-																</div>
-															</div>
-														</div>
+							<div class="WindowBarCenter ClearFix">
+								<%
+									
+									String restoreDown =
_ctx.appRes("UIPortlet.tooltip.MaximizeRestore");
+									String restore = _ctx.appRes("UIPortlet.tooltip.MinimizeRestore");
+									String miniTooltip = _ctx.appRes("UIPortlet.tooltip.Minimize");
+									String maxiTooltip = _ctx.appRes("UIPortlet.tooltip.Maximize");
+									String renderMaxi = maxiTooltip;
+									String renderMini = miniTooltip;
+									if(windowState == WindowState.MAXIMIZED) {
+										renderMaxi = restoreDown;
+									} else if(windowState == WindowState.MINIMIZED) {
+										renderMini = restore;
+									}
+									if(uicomponent.getShowWindowState()) {
+										String maximizedAction =
"eXo.portal.UIPortalControl.changeWindowState('"+portletId+"',
'maximized');";
+										String minimizedAction =
"eXo.portal.UIPortalControl.changeWindowState('"+portletId+"',
'minimized');";
+										String maximizedMode = "Maximized";
+										String minimizedMode = "Minimized";
+										if(windowState == WindowState.MAXIMIZED) {
+											maximizedAction =
"eXo.portal.UIPortalControl.changeWindowState('"+portletId+"',
'normal');";
+											maximizedMode = "Normal";
+										} else if(windowState == WindowState.MINIMIZED) {
+											minimizedAction =
"eXo.portal.UIPortalControl.changeWindowState('"+portletId+"',
'normal');";
+											minimizedMode = "Normal";
+										}
+								%>
+										<div class="ControlIcon ${maximizedMode}Icon"
title="$renderMaxi"	onclick="$maximizedAction"
onmouseover="$onControlOver"
onmouseout="$onControlOut"><span></span>
+												<div
style="display:none">{"normalTitle":"$maxiTooltip","modeTitle":"$restoreDown"}</div>
+										</div> 
+										<div class="ControlIcon ${minimizedMode}Icon"
title="$renderMini"	onclick="$minimizedAction"
onmouseover="$onControlOver"
onmouseout="$onControlOut"><span></span>
+												<div
style="display:none">{"normalTitle":"$miniTooltip","modeTitle":"$restore"}</div>
+										</div>
+								<%}		
+								
+								List supportModes = uicomponent.getSupportModes();
+									if(uicomponent.getShowPortletMode() && supportModes.size() > 0) {
+										String showCategory = "eXo.webui.UIPopupSelectCategory.show(this,
event);"
+								%>
+										<div class="ControlIcon ArrowDownIcon"
title="<%=_ctx.appRes("UIPortlet.tooltip.PortletMode");%>"
onclick="$showCategory" onmouseover="$onControlOver"
onmouseout="$onControlOut" style="position: relative;">
+											<% /*Begin Popup Menu*/ %>
+												<div class="UIPopupCategory" style="display:
none;">
+													<div class="PopupCategoryDecorator">
+														<% 
+															for(String mode in supportModes) {
+																if(mode.equals("edit") &&
rcontext.getRemoteUser()==null) continue;
+																	String actionLink = uicomponent.event("ChangePortletMode",
mode);
+																	String modeLabel = _ctx.appRes("PortletMode.label." + mode);
+																	String upper = mode.charAt(0).toString();
+																	mode = mode.replaceFirst(upper, upper.toUpperCase());
+															%>
+																		<a class="CategoryItem" href="$actionLink"
title="$modeLabel">
+																			$modeLabel
+																		</a>
+															<%				
+															}
+															if(supportModes != null && supportModes.size() > 0 &&
!supportModes.contains("view")) {
+																String modeLabel = _ctx.appRes("PortletMode.label.view");
+														%> 
+																	<a class="CategoryItem"
href="<%=uicomponent.event("ChangePortletMode",
"view")%>" title="$modeLabel">
+																		$modeLabel
+																	</a>												
+														 <%}%> 	
 													</div>
-													<% /*End Popup Menu*/ %>
 												</div>
-										<%}%>
-		
-										<%
-											/*TODO: modify: dang.tung - fixed icon themes*/
-											String portletIcon = uicomponent.getIcon();
-											if(portletIcon == null) portletIcon = "PortletIcon";
-										%>
-										<div class="$portletIcon WindowPortletIcon NovaPortletIcon
WindowPortletInfo"><div class="PortletName"><%=hasPermission ?
title :
_ctx.appRes("UIPortlet.label.protectedContent")%></div></div>
-									 
-								</div>
+											<% /*End Popup Menu*/ %>
+										</div>
+								<%}%>
+
+								<%
+									/*TODO: modify: dang.tung - fixed icon themes*/
+									String portletIcon = uicomponent.getIcon();
+									if(portletIcon == null) portletIcon = "PortletIcon";
+								%>
+								<div class="$portletIcon WindowPortletIcon NovaPortletIcon
WindowPortletInfo PortletName"><%=hasPermission ? title :
_ctx.appRes("UIPortlet.label.protectedContent")%></div>
+							 
 							</div>
 						</div>
 					</div>
@@ -198,11 +176,9 @@
 					<%//Begin Bottom Decorator %>
 					<div class="BottomDecoratorLeft">
 						<div class="BottomDecoratorRight">
-							<div class="BottomDecoratorCenter">
-								<div class="FixHeight ClearFix">
-									<div class="ResizeArea"
title="<%=_ctx.appRes("UIPortlet.tooltip.ResizeWindow");%>"><span></span></div>
+							<div class="BottomDecoratorCenter ClearFix">
+									<div class="ResizeArea"
title="<%=_ctx.appRes("UIPortlet.tooltip.ResizeWindow");%>"><span></span></div>
 									<div
class="Information"><%=_ctx.appRes("UIPortlet.lable.information");%></div>
-								</div>
 							</div>
 						</div>
 					</div>

Modified:
portal/branches/dom/web/portal/src/main/webapp/groovy/webui/form/UIFormInputThemeSelector.gtmpl
===================================================================
---
portal/branches/dom/web/portal/src/main/webapp/groovy/webui/form/UIFormInputThemeSelector.gtmpl	2011-09-06
04:49:25 UTC (rev 7306)
+++
portal/branches/dom/web/portal/src/main/webapp/groovy/webui/form/UIFormInputThemeSelector.gtmpl	2011-09-06
04:52:36 UTC (rev 7307)
@@ -11,7 +11,7 @@
 	def uiParentComponent = uicomponent.getParent() ;
 %>
 <div class="UIItemSelector UIFormInputThemeSelector"
id="$uicomponent.id">
-	<div class="LeftColumnStyle">
+	<div class="LeftColumnStyle ClearFix">
 		<div
class="ItemListContainer"><%uicomponent.renderChild(UIItemThemeSelector.class);%></div>

 		<div class="ItemDetailList">
 			<div class="ItemDetailTitle">
@@ -20,7 +20,6 @@
   	    <div class="SetDefault"
onclick="eXo.webui.UIFormInputThemeSelector.setDefaultTheme(this,'DefaultTheme')">
   	    	<a href="#"><%= _ctx.appRes(uiParentComponent.getId() +
"." + uicomponent.getId() + ".title.SetDefault") %></a>
   	    </div>
-  	    <div class="ClearBoth"><span></span></div>
     	</div>
 			<div class="DetailView">					
 					<%
@@ -31,16 +30,13 @@
 					<div class="UIThemeSelector $selectedThemeName">
 					  <div class="WindowBarLeft">
 					    <div class="WindowBarRight">
-					      <div class="WindowBarCenter">
-					      	<div class="FixHeight">
+					      <div class="WindowBarCenter ClearFix">
 					          <div class="ControlIcon
MaximizedIcon"><span></span></div>
 					          <div class="ControlIcon
RestoreIcon"><span></span></div>
 					          <div class="ControlIcon
MinimizedIcon"><span></span></div>
-					          <div class="PortletIcon WindowPortletIcon
WindowPortletInfo">
-					            <div class="PortletName">Title</div>
+					          <div class="PortletIcon WindowPortletIcon WindowPortletInfo
PortletName">
+					          	Title
 					          </div>
-						        <div
class="ClearBoth"><span></span></div>
-									</div>
 					      </div>
 					    </div>
 					  </div>
@@ -55,13 +51,10 @@
 					  
 					  <div class="BottomDecoratorLeft">
 					    <div class="BottomDecoratorRight">
-					      <div class="BottomDecoratorCenter">
-					      	<div class="FixHeight">
-										<div class="ResizeArea"
title="<%=_ctx.appRes("UIPortlet.tooltip.ResizeWindow");%>"><span></span></div>
+					      <div class="BottomDecoratorCenter ClearFix">
+								<div class="ResizeArea"
title="<%=_ctx.appRes("UIPortlet.tooltip.ResizeWindow");%>"><span></span></div>
 						        <div class="Information">Done</div>
-						        <div
class="ClearRight"><span></span></div>
-									</div>
-								</div>
+							</div>
 					    </div>
 					  </div>
 					  
@@ -70,6 +63,5 @@
 			
 			</div>
 		</div>
-		<div class="ClearLeft"></div>
 	</div>
 </div>
\ No newline at end of file

Modified:
portal/branches/dom/web/portal/src/main/webapp/groovy/webui/form/UIItemThemeSelector.gtmpl
===================================================================
---
portal/branches/dom/web/portal/src/main/webapp/groovy/webui/form/UIItemThemeSelector.gtmpl	2011-09-06
04:49:25 UTC (rev 7306)
+++
portal/branches/dom/web/portal/src/main/webapp/groovy/webui/form/UIItemThemeSelector.gtmpl	2011-09-06
04:52:36 UTC (rev 7307)
@@ -22,15 +22,12 @@
 
 				<div class="WindowBarLeft">
 					<div class="WindowBarRight">
-						<div class="WindowBarCenter">
-							<div class="FixHeight">
-								<div class="ControlIcon
MaximizedIcon"><span></span></div>
-								<div class="ControlIcon
RestoreIcon"><span></span></div>
-								<div class="ControlIcon
MinimizedIcon"><span></span></div>
-								<div class="PortletIcon WindowPortletIcon WindowPortletInfo">
-									<div class="PortletName">Title</div>
-								</div>
-								<div class="ClearBoth"><span></span></div>
+						<div class="WindowBarCenter ClearFix">
+							<div class="ControlIcon
MaximizedIcon"><span></span></div>
+							<div class="ControlIcon
RestoreIcon"><span></span></div>
+							<div class="ControlIcon
MinimizedIcon"><span></span></div>
+							<div class="PortletIcon WindowPortletIcon WindowPortletInfo
PortletName">
+								Title
 							</div>
 						</div>
 					</div>
@@ -46,12 +43,9 @@
 				
 				<div class="BottomDecoratorLeft">
 					<div class="BottomDecoratorRight">
-						<div class="BottomDecoratorCenter">
-							<div class="FixHeight">
-								<div class="ResizeArea"
title="<%=_ctx.appRes("UIPortlet.tooltip.ResizeWindow");%>"><span></span></div>
-								<div class="Information">Done</div>
-								<div class="ClearRight"><span></span></div>
-							</div>
+						<div class="BottomDecoratorCenter ClearFix">
+							<div class="ResizeArea"
title="<%=_ctx.appRes("UIPortlet.tooltip.ResizeWindow");%>"><span></span></div>
+							<div class="Information">Done</div>
 						</div>
 					</div>
 				</div>


    

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

[gatein-commits] gatein SVN: r7307 - in portal/branches/dom: web/eXoResources/src/main/webapp/skin/DefaultSkin/portal/webui/component/view/UIPortalComponent and 5 other directories.