12:03 p.m.
Author: ndkhoiits
Date: 2010-05-12 13:03:25 -0400 (Wed, 12 May 2010)
New Revision: 3066
Modified:
portal/trunk/portlet/dashboard/src/main/webapp/groovy/dashboard/webui/component/UITabPaneDashboard.gtmpl
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
Log:
GTNPORTAL-1095 Edit some CSS and set offsetwidth for UITab in Dashboard
Modified:
portal/trunk/portlet/dashboard/src/main/webapp/groovy/dashboard/webui/component/UITabPaneDashboard.gtmpl
===================================================================
---
portal/trunk/portlet/dashboard/src/main/webapp/groovy/dashboard/webui/component/UITabPaneDashboard.gtmpl 2010-05-12
12:07:57 UTC (rev 3065)
+++
portal/trunk/portlet/dashboard/src/main/webapp/groovy/dashboard/webui/component/UITabPaneDashboard.gtmpl 2010-05-12
17:03:25 UTC (rev 3066)
@@ -20,13 +20,14 @@
JavascriptManager jsManager = pcontext.getJavascriptManager();
jsManager.importJavascript("eXo.webui.UITabbedDashboard");
+ jsManager.addOnLoadJavascript("eXo.webui.UITabbedDashboard.buildTab");
%>
<div id="$uicomponent.id" class="UITabPaneDashboard">
<div class="LtTabDashboard">
<div class="RtTabDashboard">
<div class="CtTabDashboard">
- <div class="UIHorizontalTabs ClearFix">
+ <div class="UIHorizontalTabs">
<div class="TabsContainer ClearFix">
<% for(int i = 0;i < tabNbs;i++){
node = nodes.get(i);
@@ -56,7 +57,7 @@
<div class="NormalTab">
<div class="LeftTab">
<div class="RightTab">
- <div class="MiddleTab ClearFix">
+ <div class="MiddleTab">
<a href="<%= portalURI + node.getUri();
%>"><span>$tabLabel</span></a>
<a href="<%= uicomponent.url("DeleteTab",param);
%>">
<img class="CloseIcon"
src="/eXoResources/skin/sharedImages/Blank.gif" alt="DEL" />
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-12
12:07:57 UTC (rev 3065)
+++
portal/trunk/web/eXoResources/src/main/webapp/javascript/eXo/webui/UITabbedDashboard.js 2010-05-12
17:03:25 UTC (rev 3066)
@@ -21,6 +21,12 @@
init : function(){eXo.webui.UITabbedDashboard.isInRequest = false;},
+ buildTab : function() {
+ var uiWorkingWorkspace = document.getElementById("UIWorkingWorkspace");
+ var uiTabbedDashboardPortlet = eXo.core.DOMUtil.findDescendantById(uiWorkingWorkspace,
"UITabbedDashboardPortlet");
+ eXo.portal.UIPortalNavigation.buildMenu(uiTabbedDashboardPortlet);
+ },
+
renameTabLabel : function(e){
if(!e){
e = window.event;
@@ -145,7 +151,9 @@
inputElement.type = "text";
inputElement.value = "Tab_" + tabElements.length;
inputElement.style.border = "1px solid #b7b7b7";
- inputElement.style.width = "95px";
+ inputElement.style.width = "45px";
+// inputElement.style.height = "14px";
+// inputElement.style.fontSize = "15px";
inputElement.onkeypress = eXo.webui.UITabbedDashboard.createDashboardPage;
inputElement.onblur = eXo.webui.UITabbedDashboard.cancelTabDashboard;
inputElement.setAttribute('maxLength', 50);
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-12
12:07:57 UTC (rev 3065)
+++
portal/trunk/web/eXoResources/src/main/webapp/skin/DefaultSkin/portal/webui/component/view/UIDashboard/Stylesheet.css 2010-05-12
17:03:25 UTC (rev 3066)
@@ -97,15 +97,16 @@
}
.UITabPaneDashboard .UIHorizontalTabs .GrayTabStyle .NormalTab .MiddleTab,
+.UITabPaneDashboard .UIHorizontalTabs .GrayTabStyle .HighlightNavigationTab .MiddleTab,
.UITabPaneDashboard .UIHorizontalTabs .GrayTabStyle .SelectedTab .MiddleTab {
- padding: 0px;
+ padding: 0px 10px;
+ _padding: 3px 10px;
+ white-space:nowrap;
+ font-weight: normal;
}
-.UITabPaneDashboard .UIHorizontalTabs .UITab span {
- margin: 3px 10px;
- font-weight: bold;
-}
+
.UITabPaneDashboard .UIHorizontalTabs .UITab .CloseIcon {
background: url('background/IconClose.gif') no-repeat center;
width: 16px; height: 16px;
@@ -134,6 +135,21 @@
line-height: 22px;
}
+.UITabPaneDashboard .UIHorizontalTabs .GrayTabStyle .HighlightNavigationTab .LeftTab {
+ background: url(background/TabDashboard.gif) no-repeat left -44px;
+ padding-left: 4px;
+}
+
+.UITabPaneDashboard .UIHorizontalTabs .GrayTabStyle .HighlightNavigationTab .RightTab {
+ background: url(background/TabDashboard.gif) no-repeat right -44px;
+ padding-right: 4px;
+}
+
+.UITabPaneDashboard .UIHorizontalTabs .GrayTabStyle .HighlightNavigationTab .MiddleTab {
+ background: url(background/TabDashboard.gif) repeat-x left -66px;
+ line-height: 22px;
+}
+
.UITabPaneDashboard .UIHorizontalTabs .GrayTabStyle .SelectedTab .LeftTab {
background: url(background/TabDashboard.gif) no-repeat left top;
}
@@ -147,6 +163,21 @@
background: url(background/TabDashboard.gif) repeat-x left -22px;
line-height: 22px;
}
+
+.UITabPaneDashboard .UIHorizontalTabs .GrayTabStyle .EditnewTab .LeftTab {
+ background: url(background/TabDashboard.gif) no-repeat left top;
+}
+
+.UITabPaneDashboard .UIHorizontalTabs .GrayTabStyle .EditnewTab .RightTab {
+ background: url(background/TabDashboard.gif) no-repeat right top;
+ padding-right: 4px;
+}
+
+.UITabPaneDashboard .UIHorizontalTabs .GrayTabStyle .EditnewTab .MiddleTab {
+ background: url(background/TabDashboard.gif) repeat-x left -22px;
+ line-height: 22px;
+}
+
/*----------------------UIGadgetsSelectorForm-------------------*/
.UIDashboardSelectContainer {
@@ -182,6 +213,7 @@
.UIDashboardSelectContainer .DashboardItemContainer .InputContainer {
padding: 4px 0px 4px 10px;
+ _padding: 0px 10px;
background: #ececec;
}