Author: thanh.do Date: 2010-05-14 07:23:14 -0400 (Fri, 14 May 2010) New Revision: 3094 Modified: portal/trunk/web/eXoResources/src/main/webapp/javascript/eXo/webui/UITabbedDashboard.js portal/trunk/web/eXoResources/src/main/webapp/skin/DefaultSkin/portal/webui/component/view/UIDashboard/Stylesheet.css portal/trunk/web/eXoResources/src/main/webapp/skin/DefaultSkin/portal/webui/component/view/UIDashboard/background/AddDashboard.gif portal/trunk/web/eXoResources/src/main/webapp/skin/DefaultSkin/portal/webui/component/view/UIDashboard/background/TabDashboard.gif portal/trunk/web/eXoResources/src/main/webapp/skin/DefaultSkin/portal/webui/component/view/UIPortalComponent/Stylesheet.css Log: GTNPORTAL-1045:Cant drag & drop application into container when click switch view mode Modified: portal/trunk/web/eXoResources/src/main/webapp/javascript/eXo/webui/UITabbedDashboard.js =================================================================== --- portal/trunk/web/eXoResources/src/main/webapp/javascript/eXo/webui/UITabbedDashboard.js 2010-05-14 10:38:42 UTC (rev 3093) +++ portal/trunk/web/eXoResources/src/main/webapp/javascript/eXo/webui/UITabbedDashboard.js 2010-05-14 11:23:14 UTC (rev 3094) @@ -91,6 +91,11 @@ prNode.replaceChild(inputElement, selectedElement); inputElement.focus(); + + //find Middle tab of MiddleTab + var DOMUtil = eXo.core.DOMUtil; + var middleTab = DOMUtil.findAncestorByClass(inputElement, "MiddleTab"); + middleTab.className = "MiddleTab EditTab"; }, createDashboardPage : function(e){ @@ -163,6 +168,10 @@ spanElement.parentNode.replaceChild(inputElement, spanElement); DOMUtil.findNextElementByTagName(inputElement, "a").href = "#"; - inputElement.focus(); + inputElement.focus(); + + //find Middle tab of MiddleTab + var middleTab = DOMUtil.findAncestorByClass(inputElement, "MiddleTab"); + middleTab.className = "MiddleTab EditTab"; } } \ No newline at end of file Modified: portal/trunk/web/eXoResources/src/main/webapp/skin/DefaultSkin/portal/webui/component/view/UIDashboard/Stylesheet.css =================================================================== --- portal/trunk/web/eXoResources/src/main/webapp/skin/DefaultSkin/portal/webui/component/view/UIDashboard/Stylesheet.css 2010-05-14 10:38:42 UTC (rev 3093) +++ portal/trunk/web/eXoResources/src/main/webapp/skin/DefaultSkin/portal/webui/component/view/UIDashboard/Stylesheet.css 2010-05-14 11:23:14 UTC (rev 3094) @@ -85,7 +85,7 @@ } .UITabPaneDashboard .UIHorizontalTabs { - padding: 1px 0 5px; + padding-top: 1px; } .UITabPaneDashboard .UIHorizontalTabs .TabsContainer { @@ -93,16 +93,17 @@ } .UITabPaneDashboard .UIHorizontalTabs .GrayTabStyle { - margin: 4px 2px 0 0; + margin: 3px 2px 0 0; } .UITabPaneDashboard .UIHorizontalTabs .GrayTabStyle .NormalTab .MiddleTab, .UITabPaneDashboard .UIHorizontalTabs .GrayTabStyle .HighlightNavigationTab .MiddleTab, .UITabPaneDashboard .UIHorizontalTabs .GrayTabStyle .SelectedTab .MiddleTab { - padding: 0px 10px; - _padding: 3px 10px; + padding: 0px 5px; + _padding: 4px 5px; white-space:nowrap; font-weight: normal; + line-height: 24px; } @@ -115,39 +116,37 @@ .UITabPaneDashboard .UIHorizontalTabs .AddDashboard { background: url('background/AddDashboard.gif') no-repeat bottom; - width: 34px; height: 22px; + width: 34px; height: 24px; float: left; /* orientation=lt */ float: right; /* orientation=rt */ cursor: pointer; - margin-top: 4px; + margin-top: 3px; } .UITabPaneDashboard .UIHorizontalTabs .GrayTabStyle .NormalTab .LeftTab { - background: url(background/TabDashboard.gif) no-repeat left -44px; + background: url(background/TabDashboard.gif) no-repeat left -48px; } .UITabPaneDashboard .UIHorizontalTabs .GrayTabStyle .NormalTab .RightTab { - background: url(background/TabDashboard.gif) no-repeat right -44px; + background: url(background/TabDashboard.gif) no-repeat right -48px; } .UITabPaneDashboard .UIHorizontalTabs .GrayTabStyle .NormalTab .MiddleTab { - background: url(background/TabDashboard.gif) repeat-x left -66px; - line-height: 22px; + background: url(background/TabDashboard.gif) repeat-x left -72px; } .UITabPaneDashboard .UIHorizontalTabs .GrayTabStyle .HighlightNavigationTab .LeftTab { - background: url(background/TabDashboard.gif) no-repeat left -44px; + background: url(background/TabDashboard.gif) no-repeat left -48px; padding-left: 4px; } .UITabPaneDashboard .UIHorizontalTabs .GrayTabStyle .HighlightNavigationTab .RightTab { - background: url(background/TabDashboard.gif) no-repeat right -44px; + background: url(background/TabDashboard.gif) no-repeat right -48px; padding-right: 4px; } .UITabPaneDashboard .UIHorizontalTabs .GrayTabStyle .HighlightNavigationTab .MiddleTab { - background: url(background/TabDashboard.gif) repeat-x left -66px; - line-height: 22px; + background: url(background/TabDashboard.gif) repeat-x left -72px; } .UITabPaneDashboard .UIHorizontalTabs .GrayTabStyle .SelectedTab .LeftTab { @@ -160,8 +159,7 @@ } .UITabPaneDashboard .UIHorizontalTabs .GrayTabStyle .SelectedTab .MiddleTab { - background: url(background/TabDashboard.gif) repeat-x left -22px; - line-height: 22px; + background: url(background/TabDashboard.gif) repeat-x left -24px; } .UITabPaneDashboard .UIHorizontalTabs .GrayTabStyle .EditnewTab .LeftTab { @@ -174,12 +172,16 @@ } .UITabPaneDashboard .UIHorizontalTabs .GrayTabStyle .EditnewTab .MiddleTab { - background: url(background/TabDashboard.gif) repeat-x left -22px; + background: url(background/TabDashboard.gif) repeat-x left -24px; line-height: 22px; vertical-align: middle; padding-top: 0; } +.UITabPaneDashboard .UIHorizontalTabs .GrayTabStyle .SelectedTab .EditTab { + _padding: 2px 5px; +} + .UITabPaneDashboard .UIHorizontalTabs .GrayTabStyle .MiddleTab span { margin-top: 1px; } Modified: portal/trunk/web/eXoResources/src/main/webapp/skin/DefaultSkin/portal/webui/component/view/UIDashboard/background/AddDashboard.gif =================================================================== (Binary files differ) Modified: portal/trunk/web/eXoResources/src/main/webapp/skin/DefaultSkin/portal/webui/component/view/UIDashboard/background/TabDashboard.gif =================================================================== (Binary files differ) Modified: portal/trunk/web/eXoResources/src/main/webapp/skin/DefaultSkin/portal/webui/component/view/UIPortalComponent/Stylesheet.css =================================================================== --- portal/trunk/web/eXoResources/src/main/webapp/skin/DefaultSkin/portal/webui/component/view/UIPortalComponent/Stylesheet.css 2010-05-14 10:38:42 UTC (rev 3093) +++ portal/trunk/web/eXoResources/src/main/webapp/skin/DefaultSkin/portal/webui/component/view/UIPortalComponent/Stylesheet.css 2010-05-14 11:23:14 UTC (rev 3094) @@ -133,12 +133,16 @@ padding: 0px 2px; } - .UIContainer .LAYOUT-BLOCK .UIRowContainer { min-height: 86px; _height: 86px; } +.UIContainer .VIEW-BLOCK .UIRowContainer { + min-height: 86px; + _height: 86px; +} + .UIContainer .NewLayer { background: #93c0e2; filter: alpha(opacity=40); @@ -240,11 +244,13 @@ border: 1px dashed #a2a2a2; } -.EdittingContainer .NormalContainerBlock .LeftContainerBlock, .EdittingContainer .OverContainerBlock .NormalContainerBlock .LeftContainerBlock { +.EdittingContainer .NormalContainerBlock .LeftContainerBlock, +.EdittingContainer .OverContainerBlock .NormalContainerBlock .LeftContainerBlock { background: none; } -.EdittingContainer .NormalContainerBlock .RightContainerBlock, .EdittingContainer .OverContainerBlock .NormalContainerBlock .RightContainerBlock { +.EdittingContainer .NormalContainerBlock .RightContainerBlock, +.EdittingContainer .OverContainerBlock .NormalContainerBlock .RightContainerBlock { padding: 2px; background: none; }