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

Author: phuong_vu Date: 2011-09-05 08:42:55 -0400 (Mon, 05 Sep 2011) New Revision: 7301 Added: portal/branches/dom/web/eXoResources/src/main/webapp/skin/DefaultSkin/portal/webui/component/view/UIPortalComponent/background/DefaultContainerIcon.gif portal/branches/dom/web/eXoResources/src/main/webapp/skin/DefaultSkin/portal/webui/component/view/UIPortalComponent/background/Earth.gif portal/branches/dom/web/eXoResources/src/main/webapp/skin/DefaultSkin/webui/component/UIBarDecorator/UIInfoBar/background/BlueRoundedStyle.png Removed: portal/branches/dom/web/eXoResources/src/main/webapp/skin/DefaultSkin/portal/webui/component/view/UIPortalComponent/background/BgContainerBlock.gif portal/branches/dom/web/eXoResources/src/main/webapp/skin/DefaultSkin/portal/webui/component/view/UIPortalComponent/background/BottomVTabSimpleStyle224x1.gif portal/branches/dom/web/eXoResources/src/main/webapp/skin/DefaultSkin/portal/webui/component/view/UIPortalComponent/background/ContainerIcon.gif portal/branches/dom/web/eXoResources/src/main/webapp/skin/DefaultSkin/portal/webui/component/view/UIPortalComponent/background/LineBlock.gif portal/branches/dom/web/eXoResources/src/main/webapp/skin/DefaultSkin/portal/webui/component/view/UIPortalComponent/background/Pen.png portal/branches/dom/web/eXoResources/src/main/webapp/skin/DefaultSkin/portal/webui/component/view/UIPortalComponent/background/PortalBackground4x4.gif portal/branches/dom/web/eXoResources/src/main/webapp/skin/DefaultSkin/portal/webui/component/view/UIPortalComponent/background/PortletLayoutDecoratorHidden.gif portal/branches/dom/web/eXoResources/src/main/webapp/skin/DefaultSkin/portal/webui/component/view/UIPortalComponent/background/close.png portal/branches/dom/web/eXoResources/src/main/webapp/skin/DefaultSkin/webui/component/UIBarDecorator/UIInfoBar/background/BlueRoundedStyle.gif portal/branches/dom/web/eXoResources/src/main/webapp/skin/DefaultSkin/webui/component/UIBarDecorator/UIInfoBar/background/DefaultContainerIcon.gif portal/branches/dom/web/eXoResources/src/main/webapp/skin/DefaultSkin/webui/component/UIBarDecorator/UIInfoBar/background/Earth.gif portal/branches/dom/web/eXoResources/src/main/webapp/skin/DefaultSkin/webui/component/UIBarDecorator/UIInfoBar/background/ViewBlockBar.png Modified: portal/branches/dom/web/eXoResources/src/main/webapp/skin/DefaultSkin/portal/webui/component/view/UIPage/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/UIBarDecorator/UIInfoBar/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/portal/webui/container/UIContainer.gtmpl portal/branches/dom/web/portal/src/main/webapp/groovy/portal/webui/container/UITableAutofitColumnContainer.gtmpl portal/branches/dom/web/portal/src/main/webapp/groovy/portal/webui/container/UITableColumnContainer.gtmpl portal/branches/dom/web/portal/src/main/webapp/groovy/portal/webui/container/UIToolbarContainer.gtmpl Log: [DOM] UIContainer optimization, UITabContainer optimization, UIPortlet.gtmpl optimization, UITableColumnContainer optimization, UIToolbarContainer optimization, UITableAutofitColumnContainer optimization, change HTML&CSS of all UIInforBar Modified: portal/branches/dom/web/eXoResources/src/main/webapp/skin/DefaultSkin/portal/webui/component/view/UIPage/Stylesheet.css =================================================================== --- portal/branches/dom/web/eXoResources/src/main/webapp/skin/DefaultSkin/portal/webui/component/view/UIPage/Stylesheet.css 2011-09-05 11:06:45 UTC (rev 7300) +++ portal/branches/dom/web/eXoResources/src/main/webapp/skin/DefaultSkin/portal/webui/component/view/UIPage/Stylesheet.css 2011-09-05 12:42:55 UTC (rev 7301) @@ -17,125 +17,120 @@ * 02110-1301 USA, or see the FSF site: http://www.fsf.org. */ -/*##############################-Page Layout Decorator-################################*/ +/*##############################-Page Layout Decorator-################################*/ .LAYOUT-BLOCK .PageLayoutDecorator { cursor: move; } -.UIPageBody .PageLayoutDecorator { - padding: 0px; +.UIPageBody .PageLayoutDecorator { + padding: 0px; margin: 0px 2px auto 2px; - overflow: hidden; -} - -.UIPageBody .PageLayoutDecorator .MiddlePageBG { - background: white; - height: 80px; -} - -.UIPageBody .PageLayoutDecorator .TopLeftPage { - background: url('background/ViewPage.gif') no-repeat left -113px; /* orientation=lt */ - background: url('background/ViewPage-rt.gif') no-repeat right -113px; /* orientation=rt */ - padding: 0px 0px 0px 143px; /* orientation=lt */ - padding: 0px 143px 0px 0px; /* orientation=rt */ -} - -.UIPageBody .PageLayoutDecorator .TopRightPage { - background: url('background/ViewPage.gif') no-repeat right -226px; /* orientation=lt */ - background: url('background/ViewPage-rt.gif') no-repeat left -226px; /* orientation=rt */ - padding: 0px 47px 0px 0px; /* orientation=lt */ - padding: 0px 0px 0px 47px; /* orientation=rt */ -} - -.UIPageBody .PageLayoutDecorator .TopCenterPage { - height: 112px; line-height: 98px; - background: url('background/ViewPage.gif') repeat-x center top; - color: #525252; text-align: center; - font-weight: bold; - padding: 0px; white-space: nowrap; -} - -.UIPageBody .PageLayoutDecorator .MiddleLeftPage { - background: url('background/ViewPageRepeat.gif') repeat-y left; /* orientation=lt */ - background: url('background/ViewPageRepeat-rt.gif') repeat-y right; /* orientation=rt */ - padding: 0px 0px 0px 22px; /* orientation=lt */ - padding: 0px 22px 0px 0px; /* orientation=rt */ -} - -.UIPageBody .PageLayoutDecorator .MiddleRightPage { - background: url('background/ViewPageRepeat.gif') repeat-y right; /* orientation=lt */ - background: url('background/ViewPageRepeat-rt.gif') repeat-y left; /* orientation=rt */ - padding: 0px 23px 0px 0px; /* orientation=lt */ - padding: 0px 0px 0px 23px; /* orientation=rt */ -} - -.UIPageBody .PageLayoutDecorator .BottomLeftPage { - background: url('background/ViewPage.gif') no-repeat left -378px; /* orientation=lt */ - background: url('background/ViewPage-rt.gif') no-repeat right -378px; /* orientation=rt */ - padding: 0px 0px 0px 46px; /* orientation=lt */ - padding: 0px 46px 0px 0px; /* orientation=rt */ -} - -.UIPageBody .PageLayoutDecorator .BottomRightPage { - background: url('background/ViewPage.gif') no-repeat right -378px; /* orientation=lt */ - background: url('background/ViewPage-rt.gif') no-repeat left -378px; /* orientation=rt */ - padding: 0px 35px 0px 0px; /* orientation=lt */ - padding: 0px 0px 0px 35px; /* orientation=rt */ -} - -.UIPageBody .PageLayoutDecorator .BottomCenterPage { - line-height: 38px; - background: url('background/ViewPage.gif') repeat-x center -339px; -} - -.UIPageBody .PageLayoutDecorator .BottomCenterPage .FixBug { - height: 38px; -} - -.UIPageBody .VIEW-PAGEBODY .UIPage { - padding: 0px 8px; -} - -.UIPageBody .VIEW-PAGEBODY .UIPage .UIComponentBlock { +} + +.UIPageBody .PageLayoutDecorator .MiddlePageBG { background: white; - height: 100%; -} - -.UIPageBody .BLPagebody { - background: url('background/BgPagebody.gif') no-repeat left top; - padding-left: 6px; - height: 16px; -} - -.UIPageBody .BRPagebody { - background: url('background/BgPagebody.gif') no-repeat right top; - padding-right: 6px; - height: 16px; -} - -.UIPageBody .BMPagebody { - background: url('background/BgPagebody.gif') repeat-x center bottom; - height: 16px; -} - -.UIPage .UIRowContainer { - padding: 0px; -} - -.BottomDecoratorHome .BottomDecoratorLeft{ - background: url('background/BottomDecoratorHome.gif') no-repeat left; - padding-left: 7px; - height: 7px; -} - -.BottomDecoratorHome .BottomDecoratorRight{ - background: url('background/BottomDecoratorHome.gif') no-repeat right; - padding-right: 7px; - height: 7px; -} - -.BottomDecoratorHome .BottomDecoratorMiddle{ - background: white; - height: 7px; + height: 80px; +} + +.UIPageBody .PageLayoutDecorator .TopLeftPage { + background: url('background/ViewPage.gif') no-repeat left -113px; /* orientation=lt */ + background: url('background/ViewPage-rt.gif') no-repeat right -113px; /* orientation=rt */ + padding: 0px 0px 0px 143px; /* orientation=lt */ + padding: 0px 143px 0px 0px; /* orientation=rt */ +} + +.UIPageBody .PageLayoutDecorator .TopRightPage { + background: url('background/ViewPage.gif') no-repeat right -226px; /* orientation=lt */ + background: url('background/ViewPage-rt.gif') no-repeat left -226px; /* orientation=rt */ + padding: 0px 47px 0px 0px; /* orientation=lt */ + padding: 0px 0px 0px 47px; /* orientation=rt */ +} + +.UIPageBody .PageLayoutDecorator .TopCenterPage { + height: 112px; line-height: 98px; + background: url('background/ViewPage.gif') repeat-x center top; + color: #525252; text-align: center; + font-weight: bold; + padding: 0px; white-space: nowrap; +} + +.UIPageBody .PageLayoutDecorator .MiddleLeftPage { + background: url('background/ViewPageRepeat.gif') repeat-y left; /* orientation=lt */ + background: url('background/ViewPageRepeat-rt.gif') repeat-y right; /* orientation=rt */ + padding: 0px 0px 0px 22px; /* orientation=lt */ + padding: 0px 22px 0px 0px; /* orientation=rt */ +} + +.UIPageBody .PageLayoutDecorator .MiddleRightPage { + background: url('background/ViewPageRepeat.gif') repeat-y right; /* orientation=lt */ + background: url('background/ViewPageRepeat-rt.gif') repeat-y left; /* orientation=rt */ + padding: 0px 23px 0px 0px; /* orientation=lt */ + padding: 0px 0px 0px 23px; /* orientation=rt */ +} + +.UIPageBody .PageLayoutDecorator .BottomLeftPage { + background: url('background/ViewPage.gif') no-repeat left -378px; /* orientation=lt */ + background: url('background/ViewPage-rt.gif') no-repeat right -378px; /* orientation=rt */ + padding: 0px 0px 0px 46px; /* orientation=lt */ + padding: 0px 46px 0px 0px; /* orientation=rt */ +} + +.UIPageBody .PageLayoutDecorator .BottomRightPage { + background: url('background/ViewPage.gif') no-repeat right -378px; /* orientation=lt */ + background: url('background/ViewPage-rt.gif') no-repeat left -378px; /* orientation=rt */ + padding: 0px 35px 0px 0px; /* orientation=lt */ + padding: 0px 0px 0px 35px; /* orientation=rt */ +} + +.UIPageBody .PageLayoutDecorator .BottomCenterPage { + line-height: 38px; + background: url('background/ViewPage.gif') repeat-x center -339px; +} + +.UIPageBody .PageLayoutDecorator .BottomCenterPage .FixBug { + height: 38px; +} + +.UIPageBody .VIEW-PAGEBODY .UIPage { + padding: 0px 8px; +} + +.UIPageBody .VIEW-PAGEBODY .UIPage .UIComponentBlock { + background: white; + height: 100%; +} + +.UIPageBody .BLPagebody { + background: url('background/BgPagebody.gif') no-repeat left top; + padding-left: 6px; + height: 16px; +} + +.UIPageBody .BRPagebody { + background: url('background/BgPagebody.gif') no-repeat right top; + padding-right: 6px; + height: 16px; +} + +.UIPageBody .BMPagebody { + background: url('background/BgPagebody.gif') repeat-x center bottom; + height: 16px; +} + +.BottomDecoratorHome .BottomDecoratorLeft{ + background: url('background/BottomDecoratorHome.gif') no-repeat left; + padding-left: 7px; + height: 7px; +} + +.BottomDecoratorHome .BottomDecoratorRight{ + background: url('background/BottomDecoratorHome.gif') no-repeat right; + padding-right: 7px; + height: 7px; +} + +.BottomDecoratorHome .BottomDecoratorMiddle{ + background: white; + height: 7px; } \ No newline at end of file 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-05 11:06:45 UTC (rev 7300) +++ portal/branches/dom/web/eXoResources/src/main/webapp/skin/DefaultSkin/portal/webui/component/view/UIPortalComponent/Stylesheet.css 2011-09-05 12:42:55 UTC (rev 7301) @@ -17,200 +17,76 @@ * 02110-1301 USA, or see the FSF site: http://www.fsf.org. */ -.UIPortlet .LAYOUT-BLOCK { - padding: 5px; -} - -.UIPortlet .CONTROL-PORTLET { - left: 0; /* orientation=lt */ - right: 0; /* orientation=rt */ -} - -.UIPortlet .CONTROL-PORTLET .Login { - background: url('/eXoResources/skin/DefaultSkin/skinIcons/16x16/icons/ToolIcons/Key.gif') no-repeat center; -} - -.UIPortlet .CONTROL-PORTLET .DragControlArea { - float: left; /* orientation=lt */ - float: right; /* orientation=rt */ - width: 7px; height: 13px; - margin: 5px 0px 0px 3px; /* orientation=lt */ - margin: 5px 3px 0px 0px; /* orientation=rt */ - background: url('background/DragBg2x2.gif'); - cursor: move; -} - -.UIPortlet .ViewPortletIcon { - float: right; /* orientation=lt */ - float: left; /* orientation=rt */ - width: 16px; height: 16px; - margin: 4px 5px 0px 0px; /* orientation=lt */ - margin: 4px 0px 0px 5px; /* orientation=rt */ - background: url('background/BlueBoxLight.gif') no-repeat; - cursor: pointer; -} - -.UIPortlet .EditPortletPropertiesIcon { - float: left; /* orientation=lt */ - float: right; /* orientation=rt */ - width: 20px; height: 20px; - background: url('background/Pen.gif') no-repeat top; - margin: 4px 0px 0px 5px; /* orientation=lt */ - margin: 4px 5px 0px 0px; /* orientation=rt */ -} - -.UIPortlet .DeletePortletIcon { - float: left; /* orientation=lt */ - float: right; /* orientation=rt */ - width: 20px; height:20px; - background: url('background/Close.gif') no-repeat bottom; - margin: 0px 0px 0px 2px; /* orientation=lt */ - margin: 0px 2px 0px 0px; /* orientation=rt */ -} - -.UIPortlet .SelectedContainerBlock { +.UIPortal .LAYOUT-PORTAL { background: white; - border-top: 1px solid #91bcdd; + padding: 8px; + _padding: 8px 0px; /* orientation=rt */ + margin: auto; + _margin: 0px; /* orientation=rt */ + _width: 99%; /* orientation=rt */ } -.UIPortlet .SelectedContainerBlock .LeftContainerBlock { - background: url('background/BgContainerBlock.gif') no-repeat left top; - padding-left: 1px; +.DragAndDropPreview { + width: auto; height: 80px; + background: url('background/DragAndDropPreview4x4.gif'); + border: 1px solid #c4c4c4; + margin: 0px 12px 10px 12px; } -.UIPortlet .SelectedContainerBlock .RightContainerBlock { - background: url('background/BgContainerBlock.gif') no-repeat right top; - padding: 4px; -} +/************** style for EDITION-BLOCK *****************/ -.UIPortlet .NewLayer { - background: #d1dce5; - filter: alpha(opacity=80); - opacity: 0.8; - width: 100%; height: 100%; +.EDITION-BLOCK .CONTROL-BLOCK { + position: absolute; + top: -5px; + left: 4px; /* orientation=lt */ + right: 4px; /* orientation=rt */ + white-space: nowrap; } -/*##############################- PortletLayoutDecorator -################################*/ - -.PortletLayoutDecorator { -} - -.PortletLayoutDecorator .LPortletLayoutDecorator { - background: url('background/PortletLayoutDecorator.gif') no-repeat left top; - padding: 0px 0px 0px 12px; -} - -.PortletLayoutDecorator .RPortletLayoutDecorator { - background: url('background/PortletLayoutDecorator.gif') no-repeat right top; - padding-right: 12px; -} - -.PortletLayoutDecorator .CPortletLayoutDecorator { - background: url('background/PortletLayoutDecorator.gif') repeat-x center -89px; -} - -.PortletLayoutDecorator .FixHeight { - height: 69px; - padding: 10px 0; -} -.ProtectedPortlet .PortletLayoutDecorator { - background: white; -} -.ProtectedPortlet .PortletLayoutDecorator .LPortletLayoutDecorator { - opacity: 0.3; - filter: alpha(opacity=30); -} -/*############### End Decorator ###################################################*/ - -.LAYOUT-CONTAINER .UIContainer { - _height: 100%; - /* - fix bug dragdrop in IE6 - */ -} - -.LAYOUT-CONTAINER .TDContainer { - padding: 0px 2px; -} - -.UIContainer .LAYOUT-BLOCK .UIRowContainer { - min-height: 86px; - _height: 86px; -} - -.UIContainer .VIEW-BLOCK .EmptyContainer { - height: 82px; -} - -.UIContainer .NewLayer { +.EDITION-BLOCK .NewLayer { background: #93c0e2; filter: alpha(opacity=40); opacity: 0.4; width: 100%; height: 100%; } -/* -.UIContainer .LAYOUT-CONTAINER { - background: #f5f5f5; - border: solid 1px #38acf3; - padding: 5px; - margin: 0px 1px; - min-height: 60px; -} - -* html .UIContainer .LAYOUT-CONTAINER { - height: 60px; -} - -.UIContainer .UIInfoBar .BlueRoundedStyle { - padding: 0px; margin: 0px; - height: 22px; -} -*/ - -.UIContainer .CONTROL-CONTAINER .DragControlArea { +.EDITION-BLOCK .DragControlArea { float: left; /* orientation=lt */ float: right; /* orientation=rt */ width: 7px; height: 13px; background: url('background/DragBg2x2.gif'); cursor: move; - margin: 5px 0px 0px 2px; /* orientation=lt */ - margin: 5px 2px 0px 0px; /* orientation=rt */ + margin: 3px 0px 0px 2px; /* orientation=lt */ + margin: 3px 2px 0px 0px; /* orientation=rt */ } -.UIContainer .LAYOUT-CONTAINER .UITableColumnContainer { - background: none; - border: none; - margin: auto; -} - -.UIContainer .EditContainerIcon { +.EDITION-BLOCK .EditIcon { float: left; /* orientation=lt */ float: right; /* orientation=rt */ width: 22px; height: 16px; background: url('background/Pen.gif') no-repeat top; - margin: 4px 0px 0px 2px; /* orientation=lt */ - margin: 4px 2px 0px 0px; /* orientation=rt */ + margin: 2px 2px 0px 0px; /* orientation=lt */ + margin: 2px 0px 0px 2px; /* orientation=rt */ } -.UIContainer .DeleteContainerIcon { +.EDITION-BLOCK .DeleteIcon { float: left; /* orientation=lt */ float: right; /* orientation=rt */ width: 22px; height: 16px; background: url('background/Close.gif') no-repeat bottom; - margin: 4px 0px 0px 0px; /* orientation=lt */ - margin: 4px 0px 0px 0px; /* orientation=rt */ + margin: 2px 0px 0px 0px; /* orientation=lt */ + margin: 2px 0px 0px 0px; /* orientation=rt */ } -.UIContainer .ContainerIcon { +.EDITION-BLOCK .ContainerIcon { float: left; /* orientation=lt */ float: right; /* orientation=rt */ - height: 16px; line-height: 16px; padding-left: 24px; /* orientation=lt */ padding-right: 24px; /* orientation=rt */ - margin: 3px 0px 0px 5px; /* orientation=lt */ - margin: 3px 5px 0px 0px; /* orientation=rt */ - background: url('background/DefaultContainerIcon.png') no-repeat; + margin: 0px 0px 0px 5px; /* orientation=lt */ + margin: 0px 5px 0px 0px; /* orientation=rt */ + background: url('background/DefaultContainerIcon.gif') no-repeat left 3px; /* orientation=lt */ + background: url('background/DefaultContainerIcon.gif') no-repeat right 1px; /* orientation=rt */ } .UIColumnContainer .ControlIcon { @@ -236,27 +112,31 @@ margin: 4px 2px 0px 0px; /* orientation=rt */ } -.UIPortal .LAYOUT-PORTAL { - /* background: url('background/PortalBackground4x4.gif');*/ - background: white; - padding: 8px; - _padding: 8px 0px; /* orientation=rt */ - margin: auto; - _margin: 0px; /* orientation=rt */ - _width: 99%; /* orientation=rt */ +.EDITION-BLOCK .PortletIcon { + background: url('background/Earth.gif') no-repeat left center; /* orientation=lt */ + background: url('background/Earth.gif') no-repeat right center; /* orientation=rt */ + float: left; /* orientation=lt */ + float: right; /* orientation=rt */ + text-overflow: ellipsis; + width: auto; + line-height: 19px; + padding-left: 25px; /* orientation=lt */ + padding-right: 25px; /* orientation=rt */ + margin: 0px 0px 0px 6px; /* orientation=lt */ + margin: 0px 6px 0px 0px; /* orientation=rt */ + color: black; } -.DragAndDropPreview { - width: auto; height: 80px; - background: url('background/DragAndDropPreview4x4.gif'); - border: 1px solid #c4c4c4; - margin: 0px 12px 10px 12px; +/****************** edit Application *********************/ +.UIPortlet .LAYOUT-BLOCK { + padding: 2px; } -.PortletBlockDecorator { - +.UIPortlet .CONTROL-PORTLET .Login { + background: url('/eXoResources/skin/DefaultSkin/skinIcons/16x16/icons/ToolIcons/Key.gif') no-repeat center; } +/****************** edit Container *********************/ .EdittingContainer { padding: 3px; } @@ -265,44 +145,57 @@ background: white; border: 1px dashed #a2a2a2; height: 100%; + padding: 2px; } +.EdittingContainer .OverContainerBlock { + border: 1px solid #b8babf; + background: white; + height: 100%; + padding: 2px; +} -.EdittingContainer .NormalContainerBlock .LeftContainerBlock, -.EdittingContainer .OverContainerBlock .NormalContainerBlock .LeftContainerBlock { - background: none; +.EdittingContainer .LAYOUT-BLOCK .UIRowContainer { + min-height: 86px; + _height: 86px; } -.EdittingContainer .NormalContainerBlock .RightContainerBlock, -.EdittingContainer .OverContainerBlock .NormalContainerBlock .RightContainerBlock { - padding: 2px; - background: none; +.EdittingContainer .VIEW-BLOCK .EmptyContainer { + height: 82px; } -.UIContainer .UIPortlet { - padding: 0px; +.EdittingContainer .LAYOUT-CONTAINER .UIContainer { + height: 100%; + /* + fix bug dragdrop in IE6 + */ } -.UIPortletMask { - opacity: 0; - filter: alpha(opacity=0); - background: #ffffff; +/*##############################- PortletLayoutDecorator -################################*/ + +.PortletLayoutDecorator { } -.EdittingContainer .OverContainerBlock { - border: 1px solid #b8babf; - background: none; - height: 100%; +.PortletLayoutDecorator .LPortletLayoutDecorator { + background: url('background/PortletLayoutDecorator.gif') no-repeat left top; + padding: 0px 0px 0px 12px; } -.EdittingContainer .OverContainerBlock .LeftContainerBlock { - background: white; +.PortletLayoutDecorator .RPortletLayoutDecorator { + background: url('background/PortletLayoutDecorator.gif') no-repeat right top; + padding-right: 12px; } -.EdittingContainer .OverContainerBlock .RightContainerBlock { - background: none; - padding: 2px; +.PortletLayoutDecorator .CPortletLayoutDecorator { + background: url('background/PortletLayoutDecorator.gif') repeat-x center -89px; } +.PortletLayoutDecorator .FixHeight { + height: 69px; + padding: 10px 0; +} + +/*############### End Decorator ###################################################*/ + .ProtectedContainer .ProtectedContent { opacity: 0.3; filter: alpha(opacity=80); @@ -310,6 +203,21 @@ padding: 6px 10px; } +.ProtectedPortlet .PortletLayoutDecorator { + background: white; +} + +.ProtectedPortlet .PortletLayoutDecorator .LPortletLayoutDecorator { + opacity: 0.3; + filter: alpha(opacity=30); +} + +.UIPortletMask { + opacity: 0; + filter: alpha(opacity=0); + background: #ffffff; +} + .UIPageBodyMask { opacity: 0; filter: alpha(opacity=0); Deleted: portal/branches/dom/web/eXoResources/src/main/webapp/skin/DefaultSkin/portal/webui/component/view/UIPortalComponent/background/BgContainerBlock.gif =================================================================== (Binary files differ) Deleted: portal/branches/dom/web/eXoResources/src/main/webapp/skin/DefaultSkin/portal/webui/component/view/UIPortalComponent/background/BottomVTabSimpleStyle224x1.gif =================================================================== (Binary files differ) Deleted: portal/branches/dom/web/eXoResources/src/main/webapp/skin/DefaultSkin/portal/webui/component/view/UIPortalComponent/background/ContainerIcon.gif =================================================================== (Binary files differ) Added: portal/branches/dom/web/eXoResources/src/main/webapp/skin/DefaultSkin/portal/webui/component/view/UIPortalComponent/background/DefaultContainerIcon.gif =================================================================== (Binary files differ) Property changes on: portal/branches/dom/web/eXoResources/src/main/webapp/skin/DefaultSkin/portal/webui/component/view/UIPortalComponent/background/DefaultContainerIcon.gif ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: portal/branches/dom/web/eXoResources/src/main/webapp/skin/DefaultSkin/portal/webui/component/view/UIPortalComponent/background/Earth.gif =================================================================== (Binary files differ) Property changes on: portal/branches/dom/web/eXoResources/src/main/webapp/skin/DefaultSkin/portal/webui/component/view/UIPortalComponent/background/Earth.gif ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Deleted: portal/branches/dom/web/eXoResources/src/main/webapp/skin/DefaultSkin/portal/webui/component/view/UIPortalComponent/background/LineBlock.gif =================================================================== (Binary files differ) Deleted: portal/branches/dom/web/eXoResources/src/main/webapp/skin/DefaultSkin/portal/webui/component/view/UIPortalComponent/background/Pen.png =================================================================== (Binary files differ) Deleted: portal/branches/dom/web/eXoResources/src/main/webapp/skin/DefaultSkin/portal/webui/component/view/UIPortalComponent/background/PortalBackground4x4.gif =================================================================== (Binary files differ) Deleted: portal/branches/dom/web/eXoResources/src/main/webapp/skin/DefaultSkin/portal/webui/component/view/UIPortalComponent/background/PortletLayoutDecoratorHidden.gif =================================================================== (Binary files differ) Deleted: portal/branches/dom/web/eXoResources/src/main/webapp/skin/DefaultSkin/portal/webui/component/view/UIPortalComponent/background/close.png =================================================================== (Binary files differ) Modified: portal/branches/dom/web/eXoResources/src/main/webapp/skin/DefaultSkin/webui/component/UIBarDecorator/UIInfoBar/Stylesheet.css =================================================================== --- portal/branches/dom/web/eXoResources/src/main/webapp/skin/DefaultSkin/webui/component/UIBarDecorator/UIInfoBar/Stylesheet.css 2011-09-05 11:06:45 UTC (rev 7300) +++ portal/branches/dom/web/eXoResources/src/main/webapp/skin/DefaultSkin/webui/component/UIBarDecorator/UIInfoBar/Stylesheet.css 2011-09-05 12:42:55 UTC (rev 7301) @@ -17,108 +17,69 @@ * 02110-1301 USA, or see the FSF site: http://www.fsf.org. */ -.UIInfoBar { -} - -/*######################-Blue Rounded Style-######################*/ - -.UIInfoBar .BlueRoundedStyle { - padding: 0px; margin: 0px; -} - -.UIInfoBar .BlueRoundedStyle .LeftBar { - background: url('background/ViewBlockBar.png') no-repeat left top; /* orientation=lt */ - background: url('background/ViewBlockBar-rt.png') no-repeat left -26px; /* orientation=rt */ - padding-left: 5px; /* orientation=lt */ - padding-left: 9px; /* orientation=rt */ -} - -.UIInfoBar .BlueRoundedStyle .RightBar { - background: url('background/ViewBlockBar.png') no-repeat right -26px; /* orientation=lt */ - background: url('background/ViewBlockBar-rt.png') no-repeat right top; /* orientation=rt */ - padding-right: 9px; /* orientation=lt */ - padding-right: 5px; /* orientation=rt */ -} - -.UIInfoBar .BlueRoundedStyle .MiddleBar { - background: url('background/ViewBlockBar.png') repeat-x center -52px; -} - -.UIInfoBar .BlueRoundedStyle .FixHeight { - height: 26px; - white-space: nowrap; -} - -.UIInfoBar .BlueRoundedStyle .PortletIcon { - background: url('background/Earth.gif') no-repeat left center; /* orientation=lt */ - background: url('background/Earth.gif') no-repeat right center; /* orientation=rt */ - float: left; /* orientation=lt */ - float: right; /* orientation=rt */ - text-overflow: ellipsis; - width: auto; - line-height: 23px; - padding-left: 25px; /* orientation=lt */ - padding-right: 25px; /* orientation=rt */ - margin: 0px 0px 0px 6px; /* orientation=lt */ - margin: 0px 6px 0px 0px; /* orientation=rt */ - color: black; -} - -.UIInfoBar .BlueRoundedStyle .ContainerIcon { - background: url('background/DefaultContainerIcon.gif') no-repeat left center; /* orientation=lt */ - background: url('background/DefaultContainerIcon.gif') no-repeat right center; /* orientation=rt */ - float: left; /* orientation=lt */ - float: right; /* orientation=rt */ - text-overflow: ellipsis; - width: auto; - line-height: 23px; - padding-left: 25px; /* orientation=lt */ - padding-right: 25px; /* orientation=rt */ - margin: 0px 0px 0px 6px; /* orientation=lt */ - margin: 0px 6px 0px 0px; /* orientation=rt */ - height: auto; - color: black; -} - -/*######################-Polygon Navyblue Style-######################*/ - -.UIInfoBar .PolygonNavyBlueStyle { - height: 26px; -} - -.UIInfoBar .PolygonNavyBlueStyle .LeftBar { - background: url('background/PolygonNavyBlueStyle.gif') no-repeat left top; - padding: 0px 0px 0px 3px; -} - -.UIInfoBar .PolygonNavyBlueStyle .RightBar { - background: url('background/PolygonNavyBlueStyle.gif') no-repeat right top; - padding: 0px 3px 0px 0px; -} - -.UIInfoBar .PolygonNavyBlueStyle .MiddleBar { - height: 26px; - background: url('background/PolygonNavyBlueStyle.gif') repeat-x center bottom; - padding: 0px 0px 0px 2px; -} - -/*######################-Smooth Style 26 -######################*/ - -.UIInfoBar .SmoothStyle26 { - height: 26px; -} - -.UIInfoBar .SmoothStyle26 .LeftBar { - background: url('background/SmoothStyle26.gif') no-repeat left top; - padding: 0px 0px 0px 1px; -} - -.UIInfoBar .SmoothStyle26 .RightBar { - background: url('background/SmoothStyle26.gif') no-repeat right top; - padding: 0px 1px 0px 0px; -} - -.UIInfoBar .SmoothStyle26 .MiddleBar { - height: 26px; - background: url('background/SmoothStyle26.gif') repeat-x center bottom; +.UIInfoBar { } + +/*######################-Blue Rounded Style-######################*/ + +.UIInfoBar .BlueRoundedStyle { + padding: 0px 3px; margin: 0px; + background: url('background/BlueRoundedStyle.png') repeat-x center; + height: 19px; line-height: 19px; + border: 1px solid #b8babf; + -moz-border-radius: 0 0 5px 0; + -webkit-border-radius: 0 0 5px 0; + border-radius: 0 0 5px 0; + -moz-box-shadow: 1px 0px rgba(255, 255, 255, 0.6), -1px 0px rgba(255, 255, 255, 0.6), + 0px 1px rgba(255, 255, 255, 0.6), 0px -1px rgba(255, 255, 255, 0.6), + 2px 2px 2px rgba(0, 0, 0, 0.3); + -webkit-box-shadow: 1px 0px rgba(255, 255, 255, 0.6), -1px 0px rgba(255, 255, 255, 0.6), + 0px 1px rgba(255, 255, 255, 0.6), 0px -1px rgba(255, 255, 255, 0.6), + 2px 2px 2px rgba(0, 0, 0, 0.3); + box-shadow: 1px 0px rgba(255, 255, 255, 0.6), -1px 0px rgba(255, 255, 255, 0.6), + 0px 1px rgba(255, 255, 255, 0.6), 0px -1px rgba(255, 255, 255, 0.6), + 2px 2px 2px rgba(0, 0, 0, 0.3); +} + +/*######################-Polygon Navyblue Style-######################*/ + +.UIInfoBar .PolygonNavyBlueStyle { + height: 26px; +} + +.UIInfoBar .PolygonNavyBlueStyle .LeftBar { + background: url('background/PolygonNavyBlueStyle.gif') no-repeat left top; + padding: 0px 0px 0px 3px; +} + +.UIInfoBar .PolygonNavyBlueStyle .RightBar { + background: url('background/PolygonNavyBlueStyle.gif') no-repeat right top; + padding: 0px 3px 0px 0px; +} + +.UIInfoBar .PolygonNavyBlueStyle .MiddleBar { + height: 26px; + background: url('background/PolygonNavyBlueStyle.gif') repeat-x center bottom; + padding: 0px 0px 0px 2px; +} + +/*######################-Smooth Style 26 -######################*/ + +.UIInfoBar .SmoothStyle26 { + height: 26px; +} + +.UIInfoBar .SmoothStyle26 .LeftBar { + background: url('background/SmoothStyle26.gif') no-repeat left top; + padding: 0px 0px 0px 1px; +} + +.UIInfoBar .SmoothStyle26 .RightBar { + background: url('background/SmoothStyle26.gif') no-repeat right top; + padding: 0px 1px 0px 0px; +} + +.UIInfoBar .SmoothStyle26 .MiddleBar { + height: 26px; + background: url('background/SmoothStyle26.gif') repeat-x center bottom; +} Deleted: portal/branches/dom/web/eXoResources/src/main/webapp/skin/DefaultSkin/webui/component/UIBarDecorator/UIInfoBar/background/BlueRoundedStyle.gif =================================================================== (Binary files differ) Added: portal/branches/dom/web/eXoResources/src/main/webapp/skin/DefaultSkin/webui/component/UIBarDecorator/UIInfoBar/background/BlueRoundedStyle.png =================================================================== (Binary files differ) Property changes on: portal/branches/dom/web/eXoResources/src/main/webapp/skin/DefaultSkin/webui/component/UIBarDecorator/UIInfoBar/background/BlueRoundedStyle.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Deleted: portal/branches/dom/web/eXoResources/src/main/webapp/skin/DefaultSkin/webui/component/UIBarDecorator/UIInfoBar/background/DefaultContainerIcon.gif =================================================================== (Binary files differ) Deleted: portal/branches/dom/web/eXoResources/src/main/webapp/skin/DefaultSkin/webui/component/UIBarDecorator/UIInfoBar/background/Earth.gif =================================================================== (Binary files differ) Deleted: portal/branches/dom/web/eXoResources/src/main/webapp/skin/DefaultSkin/webui/component/UIBarDecorator/UIInfoBar/background/ViewBlockBar.png =================================================================== (Binary files differ) 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-05 11:06:45 UTC (rev 7300) +++ portal/branches/dom/web/portal/src/main/webapp/groovy/portal/webui/application/UIPortlet.gtmpl 2011-09-05 12:42:55 UTC (rev 7301) @@ -24,260 +24,247 @@ %> <div class="UIPortlet <%=hasPermission?"":"ProtectedPortlet"%>" id="UIPortlet-$portletId" onmouseover="eXo.portal.UIPortal.blockOnMouseOver(event, this, true);" onmouseout="eXo.portal.UIPortal.blockOnMouseOver(event, this, false);" style="top: 0px; left:0px;"> - <div class="UIComponentBlock"> - - <%if(portalMode == uiPortalApp.CONTAINER_BLOCK_EDIT_MODE || portalMode == uiPortalApp.APP_BLOCK_EDIT_MODE) { %> - <div class="LAYOUT-BLOCK LAYOUT-PORTLET"> - <div class="PortletLayoutDecorator"> - <%/*Begin Middle Portlet Layout Decorator*/%> - <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 class="UIComponentBlock"> + + <%if(portalMode == uiPortalApp.CONTAINER_BLOCK_EDIT_MODE || portalMode == uiPortalApp.APP_BLOCK_EDIT_MODE) { %> + <div class="LAYOUT-BLOCK LAYOUT-PORTLET"> + <div class="PortletLayoutDecorator"> + <%/*Begin Middle Portlet Layout Decorator*/%> + <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> - <%} else { %> - <div class="VIEW-BLOCK VIEW-PORTLET" id="VIEW-${portletId}"> - <%} %> - <% - } - - if(portalMode != uiPortalApp.CONTAINER_BLOCK_EDIT_MODE && portalMode != uiPortalApp.APP_BLOCK_EDIT_MODE) { - if(uicomponent.getShowInfoBar()) { - String title = uicomponent.getDisplayTitle(); - if(title == null || title.trim().length() < 1) - title = portletId; - /*Begin Window Portlet Bar*/ - String visibility = "visible"; - String appDisplay = "block"; - String appZIndex = ""; - String windowWidth = uicomponent.getWidth(); - if(windowWidth!= null && !windowWidth.contains("%") && !windowWidth.contains("px")) windowWidth += "px"; - String windowHeight = uicomponent.getHeight(); - if(windowHeight != null && !windowHeight.contains("%") && !windowHeight.contains("px")) windowHeight += "px"; - String cssStyle = "style=\""; - cssStyle += "visibility: "+ visibility +";"; - cssStyle += "display: "+ appDisplay +";"; - cssStyle += "z-index: "+ appZIndex +";"; - cssStyle += "width: "+ windowWidth +";"; - //cssStyle += "height: "+ windowHeight +";"; - cssStyle += "\""; - String theme = uicomponent.getSuitedTheme(null); - %> - <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> + <%} else { %> + <div class="VIEW-BLOCK VIEW-PORTLET" id="VIEW-${portletId}"> + <%} %> +<% + } + + if(portalMode != uiPortalApp.CONTAINER_BLOCK_EDIT_MODE && portalMode != uiPortalApp.APP_BLOCK_EDIT_MODE) { + if(uicomponent.getShowInfoBar()) { + String title = uicomponent.getDisplayTitle(); + if(title == null || title.trim().length() < 1) + title = portletId; + /*Begin Window Portlet Bar*/ + String visibility = "visible"; + String appDisplay = "block"; + String appZIndex = ""; + String windowWidth = uicomponent.getWidth(); + if(windowWidth!= null && !windowWidth.contains("%") && !windowWidth.contains("px")) windowWidth += "px"; + String windowHeight = uicomponent.getHeight(); + if(windowHeight != null && !windowHeight.contains("%") && !windowHeight.contains("px")) windowHeight += "px"; + String cssStyle = "style=\""; + cssStyle += "visibility: "+ visibility +";"; + cssStyle += "display: "+ appDisplay +";"; + cssStyle += "z-index: "+ appZIndex +";"; + cssStyle += "width: "+ windowWidth +";"; + //cssStyle += "height: "+ windowHeight +";"; + cssStyle += "\""; + String theme = uicomponent.getSuitedTheme(null); + %> + <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 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="PopupCategoryBL"> + <div class="PopupCategoryBR"> + <div class="PopupCategoryBC"><span></span></div> + </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"><div class="PortletName"><%=hasPermission ? title : _ctx.appRes("UIPortlet.label.protectedContent")%></div></div> - - </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"><div class="PortletName"><%=hasPermission ? title : _ctx.appRes("UIPortlet.label.protectedContent")%></div></div> + </div> </div> - <%/*End Window Portlet Bar*/ %> - - <div class="MiddleDecoratorLeft"> - <div class="MiddleDecoratorRight"> - <div class="MiddleDecoratorCenter"> - <div id="<%=portalMode == UIPortalApplication.NORMAL_MODE ? portletId : "EditMode-"+ portletId%>" style="width: 100%"> - <div class="PORTLET-FRAGMENT UIResizableBlock UIApplication" style="width: 100%; height: $windowHeight;"> - <% - if(windowState != WindowState.MINIMIZED) { - if(hasPermission) println portletContent; - else println "<div class='ProtectedContent'>"+_ctx.appRes("UIPortlet.label.protectedContent")+"</div>"; - } - %> - </div> - </div> - </div> + </div> + </div> + <%/*End Window Portlet Bar*/ %> + + <div class="MiddleDecoratorLeft"> + <div class="MiddleDecoratorRight"> + <div class="MiddleDecoratorCenter"> + <div id="<%=portalMode == UIPortalApplication.NORMAL_MODE ? portletId : "EditMode-"+ portletId%>" style="width: 100%"> + <div class="PORTLET-FRAGMENT UIResizableBlock UIApplication" style="width: 100%; height: $windowHeight;"> + <% + if(windowState != WindowState.MINIMIZED) { + if(hasPermission) println portletContent; + else println "<div class='ProtectedContent'>"+_ctx.appRes("UIPortlet.label.protectedContent")+"</div>"; + } + %> + </div> </div> </div> - - <%//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="Information"><%=_ctx.appRes("UIPortlet.lable.information");%></div> - </div> - </div> - </div> - </div> </div> - <%//End Bottom Decorator %> - <% - } else { - if(windowState != WindowState.MINIMIZED) { - String windowWidth = uicomponent.getWidth(); - if(windowWidth!= null && !windowWidth.contains("%") && !windowWidth.contains("px")) windowWidth += "px"; - String windowHeight = uicomponent.getHeight(); - if(windowHeight != null && !windowHeight.contains("%") && !windowHeight.contains("px")) windowHeight += "px"; - String cssStyle = "style=\""; - cssStyle += "width: "+ windowWidth +";"; - cssStyle += "height: "+ windowHeight +";"; - cssStyle += "\""; - %> - <div id="<%=portalMode == UIPortalApplication.NORMAL_MODE ? portletId : "EditMode-"+ portletId%>"> - <div class="PORTLET-FRAGMENT" ${cssStyle}> - <% - if(hasPermission) println portletContent; - else println "<div class='ProtectedContent'>"+_ctx.appRes("UIPortlet.label.protectedContent")+"</div>"; - %> - </div> - </div> - <% - } - } - } - if(uiPortalApp.isEditing()) { - if(portalMode != uiPortalApp.CONTAINER_BLOCK_EDIT_MODE && portalMode != uiPortalApp.APP_BLOCK_EDIT_MODE) { - %> - <div class="UIPortletMaskParent" style="height: 0px;position:relative;"> - <div class="UIPortlet-$portletId UIPortletMask" style="position: absolute;"><span></span></div> - </div> </div> - <%} %> - - <div class="EDITION-BLOCK EDITION-PORTLET" style="display: none;"> - <div style="position: relative; z-index: 999;"> - <div style="position: absolute; top: -86px;"> - <div class="NewLayer"><span></span></div> - <div class="CONTROL-PORTLET CONTROL-BLOCK" style="position: absolute; top: -6px;"> - <%/*Begin InfoBar*/%> - <div class="UIInfoBar"> - <div class="BlueRoundedStyle"> - <div class="LeftBar"> - <div class="RightBar"> - <div class="MiddleBar"> - <div class="FixHeight ClearFix"> - <div class="DragControlArea" title="<%=_ctx.appRes("UIPortlet.tooltip.DragControl");%>" onmousedown="eXo.portal.PortalDragDrop.init.call(this,event);"><span></span></div> - <% - String portletIcon = uicomponent.getIcon(); - if(portletIcon == null) portletIcon = "PortletIcon"; - - String title = uicomponent.getDisplayTitle(); - if(title.length() > 30) title = title.substring(0,27) + "..."; - %> - <div class="PortletIcon $portletIcon"><%=hasPermission ? title : _ctx.appRes("UIPortlet.label.protectedContent")%></div> - <%if(hasPermission) {%> - <a href="<%=uicomponent.event("EditPortlet","$uicomponent.id")%>;" class="EditPortletPropertiesIcon" title="<%=_ctx.appRes("UIPortlet.tooltip.editPortlet");%>"></a> - <a href="<%=uicomponent.event("DeleteComponent","$uicomponent.id")%>" class="DeletePortletIcon" title="<%=_ctx.appRes("UIPortlet.tooltip.deletePortlet");%>"></a> - <%}%> - </div> - </div> - </div> - </div> - </div> - </div> - <%/*End InfoBar*/ %> + + <%//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="Information"><%=_ctx.appRes("UIPortlet.lable.information");%></div> </div> </div> </div> </div> - </div> +<%//End Bottom Decorator %> +<% + } else { + if(windowState != WindowState.MINIMIZED) { + String windowWidth = uicomponent.getWidth(); + if(windowWidth!= null && !windowWidth.contains("%") && !windowWidth.contains("px")) windowWidth += "px"; + String windowHeight = uicomponent.getHeight(); + if(windowHeight != null && !windowHeight.contains("%") && !windowHeight.contains("px")) windowHeight += "px"; + String cssStyle = "style=\""; + cssStyle += "width: "+ windowWidth +";"; + cssStyle += "height: "+ windowHeight +";"; + cssStyle += "\""; +%> + <div id="<%=portalMode == UIPortalApplication.NORMAL_MODE ? portletId : "EditMode-"+ portletId%>"> + <div class="PORTLET-FRAGMENT" ${cssStyle}> + <% + if(hasPermission) println portletContent; + else println "<div class='ProtectedContent'>"+_ctx.appRes("UIPortlet.label.protectedContent")+"</div>"; + %> + </div> + </div> +<% + } + } +} + if(uiPortalApp.isEditing()) { + if(portalMode != uiPortalApp.CONTAINER_BLOCK_EDIT_MODE && portalMode != uiPortalApp.APP_BLOCK_EDIT_MODE) { +%> + <div class="UIPortletMaskParent" style="height: 0px;position:relative;"> + <div class="UIPortlet-$portletId UIPortletMask" style="position: absolute;"><span></span></div> + </div> + </div> + <%} %> + + <div class="EDITION-BLOCK EDITION-PORTLET" style="display: none;position: relative; z-index: 999;"> + <div style="position: absolute; top: -86px;"> + <div class="NewLayer"><span></span></div> + <div class="CONTROL-PORTLET CONTROL-BLOCK UIInfoBar"> + <%/*Begin InfoBar*/%> + <div class="BlueRoundedStyle ClearFix"> + <div class="DragControlArea" title="<%=_ctx.appRes("UIPortlet.tooltip.DragControl");%>" onmousedown="eXo.portal.PortalDragDrop.init.call(this,event);"><span></span></div> + <% + String portletIcon = uicomponent.getIcon(); + if(portletIcon == null) portletIcon = "PortletIcon"; + + String title = uicomponent.getDisplayTitle(); + if(title.length() > 30) title = title.substring(0,27) + "..."; + %> + <div class="PortletIcon $portletIcon"><%=hasPermission ? title : _ctx.appRes("UIPortlet.label.protectedContent")%></div> + <%if(hasPermission) {%> + <a href="<%=uicomponent.event("EditPortlet","$uicomponent.id")%>;eXo.portal.UIPortal.changeComposerSaveButton()" class="EditIcon" title="<%=_ctx.appRes("UIPortlet.tooltip.editPortlet");%>"></a> + <a href="<%=uicomponent.event("DeleteComponent","$uicomponent.id")%>" class="DeleteIcon" title="<%=_ctx.appRes("UIPortlet.tooltip.deletePortlet");%>"></a> + <%}%> + </div> + <%/*End InfoBar*/ %> + </div> + </div> + </div> + </div> </div> <%}%> \ No newline at end of file Modified: portal/branches/dom/web/portal/src/main/webapp/groovy/portal/webui/container/UIContainer.gtmpl =================================================================== --- portal/branches/dom/web/portal/src/main/webapp/groovy/portal/webui/container/UIContainer.gtmpl 2011-09-05 11:06:45 UTC (rev 7300) +++ portal/branches/dom/web/portal/src/main/webapp/groovy/portal/webui/container/UIContainer.gtmpl 2011-09-05 12:42:55 UTC (rev 7301) @@ -29,9 +29,7 @@ id="${uicomponent.id}" ${cssStyle} onmouseover="eXo.portal.UIPortal.blockOnMouseOver(event, this, true);" onmouseout="eXo.portal.UIPortal.blockOnMouseOver(event, this, false);"> - <div class="NormalContainerBlock"> - <div class="LeftContainerBlock"> - <div class="RightContainerBlock UIComponentBlock"> + <div class="NormalContainerBlock UIComponentBlock"> <% int portalMode = uiPortalApp.getModeState(); @@ -42,8 +40,8 @@ <div class="VIEW-CONTAINER VIEW-BLOCK"> <%} %> <%if(hasPermission) {%> - <div> - <div class="UIRowContainer <%=(portalMode != UIPortalApplication.NORMAL_MODE && uicomponent.getChildren().size() == 0) ? "EmptyContainer" : ""%>"> + <div class="UIRowContainer <%=(portalMode != UIPortalApplication.NORMAL_MODE && uicomponent.getChildren().size() == 0) ? "EmptyContainer" : ""%>"> + <div> <%uicomponent.renderChildren();%> </div> </div> @@ -51,47 +49,29 @@ </div> <%if(portalMode != UIPortalApplication.NORMAL_MODE){%> - <div class="EDITION-BLOCK EDITION-CONTAINER" style="display: none;"> - <div style="position: relative;"> - <div style="position: absolute; top: -86px;"> - - <div class="NewLayer" style="display: none; visibility: hidden;"><span></span></div> - <div class="CONTROL-CONTAINER CONTROL-BLOCK" style="position: absolute; top: -6px;"> - <%/*Begin InfoBar*/%> - <div class="UIInfoBar"> - <div class="BlueRoundedStyle"> - <div class="LeftBar"> - <div class="RightBar"> - <div class="MiddleBar"> - <div class="FixHeight ClearFix"> - <div class="DragControlArea" title="<%=_ctx.appRes("UIContainer.title.DragControlArea")%>" onmousedown="eXo.portal.PortalDragDrop.init.call(this,event);"><span></span></div> - <% - String strTitle = uicomponent.getTitle() != null ? - ExpressionUtil.getExpressionValue(res, uicomponent.getTitle()) : - _ctx.appRes("UIContainer.title.Container"); - %> - <div class="ContainerIcon"><%=hasPermission ? strTitle : _ctx.appRes("UIPortlet.label.protectedContent")%></div> - <%if(hasPermission) {%> - <a href="<%=uicomponent.event("EditContainer")%>" class="EditContainerIcon" title="<%=_ctx.appRes("UIContainer.tooltip.editContainer")%>"><span></span></a> - <a href="<%=uicomponent.event("DeleteComponent")%>" class="DeleteContainerIcon" title="<%=_ctx.appRes("UIContainer.tooltip.closeContainer")%>"><span></span></a> - <%}%> - - </div> - </div> - </div> - </div> - </div> - </div> - <%/*End InfoBar*/ %> - </div> - - </div> + <div class="EDITION-BLOCK EDITION-CONTAINER" style="display: none;position: relative;"> + <div style="position: absolute; top: -86px;"> + <div class="NewLayer" style="display: none; visibility: hidden;"><span></span></div> + <div class="CONTROL-CONTAINER CONTROL-BLOCK UIInfoBar"> + <%/*Begin InfoBar*/%> + + <div class="BlueRoundedStyle ClearFix"> + <div class="DragControlArea" title="<%=_ctx.appRes("UIContainer.title.DragControlArea")%>" onmousedown="eXo.portal.PortalDragDrop.init.call(this,event);"><span></span></div> + <% + String strTitle = uicomponent.getTitle() != null ? + ExpressionUtil.getExpressionValue(res, uicomponent.getTitle()) : + _ctx.appRes("UIContainer.title.Container"); + %> + <div class="ContainerIcon"><%=hasPermission ? strTitle : _ctx.appRes("UIPortlet.label.protectedContent")%></div> + <%if(hasPermission) {%> + <a href="<%=uicomponent.event("EditContainer")%>;eXo.portal.UIPortal.changeComposerSaveButton()" class="EditContainerIcon" title="<%=_ctx.appRes("UIContainer.tooltip.editContainer")%>"></a> + <a href="<%=uicomponent.event("DeleteComponent")%>" class="DeleteContainerIcon" title="<%=_ctx.appRes("UIContainer.tooltip.closeContainer")%>"><span></span></a> + <%}%> + </div> + <%/*End InfoBar*/ %> </div> </div> - <%} %> - - </div> - </div> - </div> -</div> - + </div> + <%} %> + </div> +</div> \ No newline at end of file Modified: portal/branches/dom/web/portal/src/main/webapp/groovy/portal/webui/container/UITableAutofitColumnContainer.gtmpl =================================================================== --- portal/branches/dom/web/portal/src/main/webapp/groovy/portal/webui/container/UITableAutofitColumnContainer.gtmpl 2011-09-05 11:06:45 UTC (rev 7300) +++ portal/branches/dom/web/portal/src/main/webapp/groovy/portal/webui/container/UITableAutofitColumnContainer.gtmpl 2011-09-05 12:42:55 UTC (rev 7301) @@ -20,10 +20,7 @@ id="${uicomponent.id}" onmouseover="eXo.portal.UIPortal.blockOnMouseOver(event, this, true);" onmouseout="eXo.portal.UIPortal.blockOnMouseOver(event, this, false);"> - <div class="NormalContainerBlock"> - <div class="LeftContainerBlock"> - <div class="RightContainerBlock UIComponentBlock"> - + <div class="NormalContainerBlock UIComponentBlock"> <% int portalMode = uiPortalApp.getModeState(); String style = ""; @@ -39,10 +36,10 @@ <%} %> <div> <%if(hasPermission) {%> - <table class="UITableColumn" margin: 0px auto; $style"> + <table class="UITableColumnContainer" style="margin: 0px auto; $style"> <tr class="TRContainer"> <% for(uiChild in uicomponent.getChildren()) {%> - <td class="${uiChild.id}TDContainer" <% if(uiChild.getWidth()) { %> width="<%= uiChild.getWidth(); %>" <% } %>><% uicomponent.renderUIComponent(uiChild) %></td> + <td class="${uiChild.id}TDContainer TDContainer" <% if(uiChild.getWidth()) { %> width="<%= uiChild.getWidth(); %>" <% } %>><% uicomponent.renderUIComponent(uiChild) %></td> <% } %> </tr> </table> @@ -52,46 +49,28 @@ <%/*Debug On IE -----For DND */%> <%if(portalMode != UIPortalApplication.NORMAL_MODE){%> - <div class="EDITION-BLOCK EDITION-CONTAINER" style="display: none;"> - <div style="position: relative;"> - <div style="position: absolute; top: -86px;"> - - <div class="NewLayer" style="display: none; visibility: hidden;"><span></span></div> - <div class="CONTROL-CONTAINER CONTROL-BLOCK" style="position: absolute; top: -6px;"> - <%/*Begin InfoBar*/%> - <div class="UIInfoBar"> - <div class="BlueRoundedStyle"> - <div class="LeftBar"> - <div class="RightBar"> - <div class="MiddleBar"> - <div class="FixHeight ClearFix"> - <div class="DragControlArea" title="<%=_ctx.appRes("UITableColumnContainer.title.DragControlArea")%>" onmousedown="eXo.portal.PortalDragDrop.init.call(this,event);"><span></span></div> - <% - String strTitle = uicomponent.getTitle() != null ? - ExpressionUtil.getExpressionValue(res, uicomponent.getTitle()) : - _ctx.appRes("UITableColumnContainer.title.Container"); - %> - <div class="ContainerIcon DefaultContainer16x16Icon"><%=hasPermission ? strTitle : _ctx.appRes("UIPortlet.label.protectedContent")%></div> - <%if(hasPermission) {%> - <a href="<%=uicomponent.event("EditContainer","$uicomponent.id")%>" class="EditContainerIcon" title="<%=_ctx.appRes("UITableColumnContainer.tooltip.editContainer")%>"><span></span></a> - <a href="<%=uicomponent.event("DeleteComponent","$uicomponent.id")%>" class="DeleteContainerIcon" title="<%=_ctx.appRes("UITableColumnContainer.tooltip.closeContainer")%>"><span></span></a> - <%}%> - </div> - </div> - </div> - </div> - </div> - </div> - <%/*End InfoBar*/ %> - </div> - - </div> + <div class="EDITION-BLOCK EDITION-CONTAINER" style="display: none; position: relative;"> + <div style="position: absolute; top: -86px;"> + <div class="NewLayer" style="display: none; visibility: hidden;"><span></span></div> + <div class="CONTROL-CONTAINER CONTROL-BLOCK UIInfoBar"> + <%/*Begin InfoBar*/%> + <div class="BlueRoundedStyle ClearFix"> + <div class="DragControlArea" title="<%=_ctx.appRes("UIContainer.tooltip.drag")%>" onmousedown="eXo.portal.PortalDragDrop.init.call(this,event);"><span></span></div> + <% + String strTitle = uicomponent.getTitle() != null ? + ExpressionUtil.getExpressionValue(res, uicomponent.getTitle()) : + _ctx.appRes("UIContainer.title.Container"); + %> + <div class="ContainerIcon DefaultContainer16x16Icon"><%=hasPermission ? strTitle : _ctx.appRes("UIPortlet.label.protectedContent")%></div> + <%if(hasPermission) {%> + <a href="<%=uicomponent.event("EditContainer","$uicomponent.id")%>;eXo.portal.UIPortal.changeComposerSaveButton()" class="EditContainerIcon" title="<%=_ctx.appRes("UIContainer.tooltip.editContainer")%>"><span></span></a> + <a href="<%=uicomponent.event("DeleteComponent","$uicomponent.id")%>" class="DeleteContainerIcon" title="<%=_ctx.appRes("UIContainer.tooltip.closeContainer")%>"><span></span></a> + <%}%> </div> + <%/*End InfoBar*/ %> </div> - <%} %> - </div> </div> + <%} %> </div> - </div> \ No newline at end of file Modified: portal/branches/dom/web/portal/src/main/webapp/groovy/portal/webui/container/UITableColumnContainer.gtmpl =================================================================== --- portal/branches/dom/web/portal/src/main/webapp/groovy/portal/webui/container/UITableColumnContainer.gtmpl 2011-09-05 11:06:45 UTC (rev 7300) +++ portal/branches/dom/web/portal/src/main/webapp/groovy/portal/webui/container/UITableColumnContainer.gtmpl 2011-09-05 12:42:55 UTC (rev 7301) @@ -19,11 +19,8 @@ <div class="UIContainer UITableColumnContainer <%=uiPortalApp.isEditing()?"EdittingContainer":""%> <%=hasPermission?"":"ProtectedContainer"%>" id="${uicomponent.id}" onmouseover="eXo.portal.UIPortal.blockOnMouseOver(event, this, true);" - onmouseout="eXo.portal.UIPortal.blockOnMouseOver(event, this, false);"> - <div class="NormalContainerBlock"> - <div class="LeftContainerBlock"> - <div class="RightContainerBlock UIComponentBlock"> - + onmouseout="eXo.portal.UIPortal.blockOnMouseOver(event, this, false);"> + <div class="NormalContainerBlock UIComponentBlock"> <% int portalMode = uiPortalApp.getModeState(); String style = ""; @@ -39,59 +36,41 @@ <%} %> <div> <%if(hasPermission) {%> - <table class="UITableColumn" style="table-layout: fixed; margin: 0px auto; $style"> + <table class="UITableColumnContainer" style="table-layout: fixed; margin: 0px auto; $style"> <tr class="TRContainer"> <% for(uiChild in uicomponent.getChildren()) {%> - <td class="${uiChild.id}TDContainer" <% if(uiChild.getWidth()) { %> width="<%= uiChild.getWidth(); %>" <% } %>><% uicomponent.renderUIComponent(uiChild) %></td> + <td class="${uiChild.id}TDContainer TDContainer" <% if(uiChild.getWidth()) { %> width="<%= uiChild.getWidth(); %>" <% } %>><% uicomponent.renderUIComponent(uiChild) %></td> <% } %> - </tr> - </table> + </tr> + </table> <%} else {print "<div class='ProtectedContent'>"+_ctx.appRes("UIPortlet.label.protectedContent")+"</div>";}%> </div> </div> <%/*Debug On IE -----For DND */%> <%if(portalMode != UIPortalApplication.NORMAL_MODE){%> - <div class="EDITION-BLOCK EDITION-CONTAINER" style="display: none;"> - <div style="position: relative;"> - <div style="position: absolute; top: -86px;"> - - <div class="NewLayer" style="display: none; visibility: hidden;"><span></span></div> - <div class="CONTROL-CONTAINER CONTROL-BLOCK" style="position: absolute; top: -6px;"> - <%/*Begin InfoBar*/%> - <div class="UIInfoBar"> - <div class="BlueRoundedStyle"> - <div class="LeftBar"> - <div class="RightBar"> - <div class="MiddleBar"> - <div class="FixHeight ClearFix"> - <div class="DragControlArea" title="<%=_ctx.appRes("UITableColumnContainer.title.DragControlArea")%>" onmousedown="eXo.portal.PortalDragDrop.init.call(this,event);"><span></span></div> - <% - String strTitle = uicomponent.getTitle() != null ? - ExpressionUtil.getExpressionValue(res, uicomponent.getTitle()) : - _ctx.appRes("UITableColumnContainer.title.Container"); - %> - <div class="ContainerIcon DefaultContainer16x16Icon"><%=hasPermission ? strTitle : _ctx.appRes("UIPortlet.label.protectedContent")%></div> - <%if(hasPermission) {%> - <a href="<%=uicomponent.event("EditContainer","$uicomponent.id")%>" class="EditContainerIcon" title="<%=_ctx.appRes("UITableColumnContainer.tooltip.editContainer")%>"><span></span></a> - <a href="<%=uicomponent.event("DeleteComponent","$uicomponent.id")%>" class="DeleteContainerIcon" title="<%=_ctx.appRes("UITableColumnContainer.tooltip.closeContainer")%>"><span></span></a> - <%}%> - </div> - </div> - </div> - </div> - </div> - </div> - <%/*End InfoBar*/ %> - </div> - - </div> + <div class="EDITION-BLOCK EDITION-CONTAINER" style="display: none;position: relative;"> + <div style="position: absolute; top: -86px;"> + <div class="NewLayer" style="display: none; visibility: hidden;"><span></span></div> + <div class="CONTROL-CONTAINER CONTROL-BLOCK UIInfoBar"> + <%/*Begin InfoBar*/%> + <div class="BlueRoundedStyle ClearFix"> + <div class="DragControlArea" title="<%=_ctx.appRes("UIContainer.tooltip.drag")%>" onmousedown="eXo.portal.PortalDragDrop.init.call(this,event);"><span></span></div> + <% + String strTitle = uicomponent.getTitle() != null ? + ExpressionUtil.getExpressionValue(res, uicomponent.getTitle()) : + _ctx.appRes("UIContainer.title.Container"); + %> + <div class="ContainerIcon DefaultContainer16x16Icon"><%=hasPermission ? strTitle : _ctx.appRes("UIPortlet.label.protectedContent")%></div> + <%if(hasPermission) {%> + <a href="<%=uicomponent.event("EditContainer","$uicomponent.id")%>;eXo.portal.UIPortal.changeComposerSaveButton()" class="EditContainerIcon" title="<%=_ctx.appRes("UIContainer.tooltip.editContainer")%>"></a> + <a href="<%=uicomponent.event("DeleteComponent","$uicomponent.id")%>" class="DeleteContainerIcon" title="<%=_ctx.appRes("UIContainer.tooltip.closeContainer")%>"></a> + <%}%> </div> + <%/*End InfoBar*/ %> </div> - <%} %> - </div> </div> - </div> - + <%} %> + </div> </div> \ No newline at end of file Modified: portal/branches/dom/web/portal/src/main/webapp/groovy/portal/webui/container/UIToolbarContainer.gtmpl =================================================================== --- portal/branches/dom/web/portal/src/main/webapp/groovy/portal/webui/container/UIToolbarContainer.gtmpl 2011-09-05 11:06:45 UTC (rev 7300) +++ portal/branches/dom/web/portal/src/main/webapp/groovy/portal/webui/container/UIToolbarContainer.gtmpl 2011-09-05 12:42:55 UTC (rev 7301) @@ -48,40 +48,26 @@ </div> <%/*Debug On IE -----For DND */%> - <%if(portalMode != UIPortalApplication.NORMAL_MODE){%> - <div class="EDITION-BLOCK EDITION-CONTAINER" style="display: none;"> - <div style="position: relative;"> - <div style="position: absolute; top: -86px;"> - - <div class="NewLayer" style="display: none; visibility: hidden;"><span></span></div> - <div class="CONTROL-CONTAINER CONTROL-BLOCK" style="position: absolute; top: -6px;"> - <%/*Begin InfoBar*/%> - <div class="UIInfoBar"> - <div class="BlueRoundedStyle"> - <div class="LeftBar"> - <div class="RightBar"> - <div class="MiddleBar"> - <div class="FixHeight ClearFix"> - <div class="DragControlArea" title="<%=_ctx.appRes("UIContainer.tooltip.drag")%>" onmousedown="eXo.portal.PortalDragDrop.init.call(this,event);"><span></span></div> - <% - String strTitle = uicomponent.getTitle() != null ? - ExpressionUtil.getExpressionValue(res, uicomponent.getTitle()) : - _ctx.appRes("UIContainer.title.Container"); - %> - <div class="ContainerIcon DefaultContainer16x16Icon"><%=hasPermission ? strTitle : _ctx.appRes("UIPortlet.label.protectedContent")%></div> - <%if(hasPermission) {%> - <a href="<%=uicomponent.event("EditContainer","$uicomponent.id")%>;" class="EditContainerIcon" title="<%=_ctx.appRes("UIContainer.tooltip.editContainer")%>"><span></span></a> - <a href="<%=uicomponent.event("DeleteComponent","$uicomponent.id")%>" class="DeleteContainerIcon" title="<%=_ctx.appRes("UIContainer.tooltip.closeContainer")%>"><span></span></a> - <%}%> - </div> - </div> - </div> - </div> - </div> - </div> - <%/*End InfoBar*/ %> + <%if(portalMode != UIPortalApplication.NORMAL_MODE){%> + <div class="EDITION-BLOCK EDITION-CONTAINER" style="display: none;position: relative;"> + <div style="position: absolute; top: -86px;"> + <div class="NewLayer" style="display: none; visibility: hidden;"><span></span></div> + <div class="CONTROL-CONTAINER CONTROL-BLOCK UIInfoBar"> + <%/*Begin InfoBar*/%> + <div class="BlueRoundedStyle"> + <div class="DragControlArea" title="<%=_ctx.appRes("UIContainer.tooltip.drag")%>" onmousedown="eXo.portal.PortalDragDrop.init.call(this,event);"><span></span></div> + <% + String strTitle = uicomponent.getTitle() != null ? + ExpressionUtil.getExpressionValue(res, uicomponent.getTitle()) : + _ctx.appRes("UIContainer.title.Container"); + %> + <div class="ContainerIcon DefaultContainer16x16Icon"><%=hasPermission ? strTitle : _ctx.appRes("UIPortlet.label.protectedContent")%></div> + <%if(hasPermission) {%> + <a href="<%=uicomponent.event("EditContainer","$uicomponent.id")%>;eXo.portal.UIPortal.changeComposerSaveButton()" class="EditContainerIcon" title="<%=_ctx.appRes("UIContainer.tooltip.editContainer")%>"><span></span></a> + <a href="<%=uicomponent.event("DeleteComponent","$uicomponent.id")%>" class="DeleteContainerIcon" title="<%=_ctx.appRes("UIContainer.tooltip.closeContainer")%>"><span></span></a> + <%}%> </div> - + <%/*End InfoBar*/ %> </div> </div> </div>