[gatein-commits] gatein SVN: r8048 - in epp/portal/branches/EPP_5_2_Branch: portlet/web/src/main/webapp/skin/portal/webui/component/UIBannerPortlet and 4 other directories.
do-not-reply at jboss.org
do-not-reply at jboss.org
Fri Nov 11 20:59:37 EST 2011
Author: mwringe
Date: 2011-11-11 20:59:35 -0500 (Fri, 11 Nov 2011)
New Revision: 8048
Modified:
epp/portal/branches/EPP_5_2_Branch/portlet/exoadmin/src/main/webapp/groovy/admintoolbar/webui/component/UIAdminToolbarPortlet.gtmpl
epp/portal/branches/EPP_5_2_Branch/portlet/exoadmin/src/main/webapp/groovy/admintoolbar/webui/component/UIUserToolBarDashboardPortlet.gtmpl
epp/portal/branches/EPP_5_2_Branch/portlet/exoadmin/src/main/webapp/groovy/admintoolbar/webui/component/UIUserToolBarGroupPortlet.gtmpl
epp/portal/branches/EPP_5_2_Branch/portlet/exoadmin/src/main/webapp/groovy/admintoolbar/webui/component/UIUserToolBarSitePortlet.gtmpl
epp/portal/branches/EPP_5_2_Branch/portlet/web/src/main/webapp/skin/portal/webui/component/UIBannerPortlet/DefaultStylesheet.css
epp/portal/branches/EPP_5_2_Branch/portlet/web/src/main/webapp/skin/portal/webui/component/UINavigationPortlet/DefaultStylesheet.css
epp/portal/branches/EPP_5_2_Branch/web/eXoResources/src/main/webapp/skin/DefaultSkin/portal/webui/component/view/UIToolbarContainer/Stylesheet.css
epp/portal/branches/EPP_5_2_Branch/web/eXoResources/src/main/webapp/skin/DefaultSkin/webui/component/UIBreadcumbs/Stylesheet.css
epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_cs.properties
epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_en.properties
epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_fr.properties
epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_it.properties
epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_vi.properties
Log:
JBEPP-1258: tweak some of the css to fix some of the display issues in IE6. Still needs some more fixing :(
Updated the locale settings since a value had its name change.
Modified: epp/portal/branches/EPP_5_2_Branch/portlet/exoadmin/src/main/webapp/groovy/admintoolbar/webui/component/UIAdminToolbarPortlet.gtmpl
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/portlet/exoadmin/src/main/webapp/groovy/admintoolbar/webui/component/UIAdminToolbarPortlet.gtmpl 2011-11-11 15:43:02 UTC (rev 8047)
+++ epp/portal/branches/EPP_5_2_Branch/portlet/exoadmin/src/main/webapp/groovy/admintoolbar/webui/component/UIAdminToolbarPortlet.gtmpl 2011-11-12 01:59:35 UTC (rev 8048)
@@ -30,7 +30,7 @@
String accountSetting = "javascript:if(document.getElementById('UIMaskWorkspace')) ajaxGet(eXo.env.server.createPortalURL('UIPortal', 'AccountSettings', true));"
%>
<ul class="UIAdminToolbarPortlet UIHorizontalTabs" id="$uicomponent.id" >
- <li class="UITab NormalToolbarTab portlet-menu-item">
+ <li class="UITab portlet-menu-item">
<a class="EditorIcon TBIcon" href="#">$editorLabel</a>
<ul class="MenuItemContainer portlet-menu-cascade" style="display:none;">
<% if(userCouldEditNavigation){ %>
Modified: epp/portal/branches/EPP_5_2_Branch/portlet/exoadmin/src/main/webapp/groovy/admintoolbar/webui/component/UIUserToolBarDashboardPortlet.gtmpl
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/portlet/exoadmin/src/main/webapp/groovy/admintoolbar/webui/component/UIUserToolBarDashboardPortlet.gtmpl 2011-11-11 15:43:02 UTC (rev 8047)
+++ epp/portal/branches/EPP_5_2_Branch/portlet/exoadmin/src/main/webapp/groovy/admintoolbar/webui/component/UIUserToolBarDashboardPortlet.gtmpl 2011-11-12 01:59:35 UTC (rev 8048)
@@ -96,7 +96,7 @@
String createDashboardLink = nodeURL.setResource(new NavigationResource(SiteType.USER, rcontext.getRemoteUser(), null)).toString();
%>
<ul class="UIUserToolBarDashboardPortlet UIHorizontalTabs" id="$uicomponent.id">
- <li class="UITab NormalToolbarTab">
+ <li class="UITab">
<a class="DashboardIcon TBIcon" href="<%= createDashboardLink%>">Dashboard</a>
</li>
</ul>
@@ -105,7 +105,7 @@
String link = nodeURL.setResource(new NavigationResource(SiteType.USER, rcontext.getRemoteUser(), null)).toString();
%>
<ul class="UIUserToolBarDashboardPortlet UIHorizontalTabs" id="$uicomponent.id" >
- <li class="UITab NormalToolbarTab">
+ <li class="UITab">
<a class="DashboardIcon TBIcon" href="<%= link%>">Dashboard</a>
<% renderDashboards(nodeURL, pcontext, userNodes); %>
</li>
Modified: epp/portal/branches/EPP_5_2_Branch/portlet/exoadmin/src/main/webapp/groovy/admintoolbar/webui/component/UIUserToolBarGroupPortlet.gtmpl
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/portlet/exoadmin/src/main/webapp/groovy/admintoolbar/webui/component/UIUserToolBarGroupPortlet.gtmpl 2011-11-11 15:43:02 UTC (rev 8047)
+++ epp/portal/branches/EPP_5_2_Branch/portlet/exoadmin/src/main/webapp/groovy/admintoolbar/webui/component/UIUserToolBarGroupPortlet.gtmpl 2011-11-12 01:59:35 UTC (rev 8048)
@@ -92,7 +92,7 @@
def currentPortal = pcontext.getPortalOwner();
%>
<ul class="UIUserToolBarGroupPortlet UIHorizontalTabs" id="$uicomponent.id" >
- <li class="UITab NormalToolbarTab portlet-menu-item">
+ <li class="UITab portlet-menu-item">
<a class="GroupIcon TBIcon" href="<%=nodeURL.setResource(new NavigationResource(SiteType.PORTAL, currentPortal, "groupnavigation")).toString() %>"><%=_ctx.appRes("UIUserToolBarGroupPortlet.header.group")%></a>
<% if (!groupNavigations.isEmpty()) { %>
<ul style="display:none" class="MenuItemContainer portlet-menu-cascade">
Modified: epp/portal/branches/EPP_5_2_Branch/portlet/exoadmin/src/main/webapp/groovy/admintoolbar/webui/component/UIUserToolBarSitePortlet.gtmpl
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/portlet/exoadmin/src/main/webapp/groovy/admintoolbar/webui/component/UIUserToolBarSitePortlet.gtmpl 2011-11-11 15:43:02 UTC (rev 8047)
+++ epp/portal/branches/EPP_5_2_Branch/portlet/exoadmin/src/main/webapp/groovy/admintoolbar/webui/component/UIUserToolBarSitePortlet.gtmpl 2011-11-12 01:59:35 UTC (rev 8048)
@@ -136,7 +136,7 @@
%>
<ul class="UIUserToolBarSitePortlet UIHorizontalTabs" id="$uicomponent.id" >
- <li class="UITab NormalToolbarTab portlet-menu-item">
+ <li class="UITab portlet-menu-item">
<a class="SitesIcon TBIcon" href="<%= nodeURL.setResource(new NavigationResource(SiteType.PORTAL, currentPortal, "portalnavigation")).toString() %>">
<%=_ctx.appRes("UIUserToolBarSitePortlet.header.site")%>
</a>
Modified: epp/portal/branches/EPP_5_2_Branch/portlet/web/src/main/webapp/skin/portal/webui/component/UIBannerPortlet/DefaultStylesheet.css
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/portlet/web/src/main/webapp/skin/portal/webui/component/UIBannerPortlet/DefaultStylesheet.css 2011-11-11 15:43:02 UTC (rev 8047)
+++ epp/portal/branches/EPP_5_2_Branch/portlet/web/src/main/webapp/skin/portal/webui/component/UIBannerPortlet/DefaultStylesheet.css 2011-11-12 01:59:35 UTC (rev 8048)
@@ -8,6 +8,7 @@
background: url('DefaultSkin/background/banner-bg.jpg') repeat-x; /* orientation=rt */
border-left: 1px solid #b4b4b4;
border-right: 1px solid #b4b4b4;
+ _height: 0;
}
.UIBannerPortlet .LeftBanner {
Modified: epp/portal/branches/EPP_5_2_Branch/portlet/web/src/main/webapp/skin/portal/webui/component/UINavigationPortlet/DefaultStylesheet.css
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/portlet/web/src/main/webapp/skin/portal/webui/component/UINavigationPortlet/DefaultStylesheet.css 2011-11-11 15:43:02 UTC (rev 8047)
+++ epp/portal/branches/EPP_5_2_Branch/portlet/web/src/main/webapp/skin/portal/webui/component/UINavigationPortlet/DefaultStylesheet.css 2011-11-12 01:59:35 UTC (rev 8048)
@@ -36,6 +36,7 @@
border-top: 1px solid #b4b4b4;
border-left: 1px solid #b4b4b4;
border-right: 1px solid #b4b4b4;
+ _height: 0;
}
.UINavigationPortlet .UINavigationBar {
@@ -106,12 +107,19 @@
cursor: pointer;
}
+.UINavigationPortlet .UINavigationBar .NormalNavigationTab {
+ line-height: 31px;
+}
+
.UINavigationPortlet .NormalNavigationTab a.TabIcon {
color: #fff;
}
/*###########################-Hightlight-NavigationTabTab--############################*/
+.UINavigationPortlet .UINavigationBar .HighlightNavigationTab {
+ line-height: 31px;
+}
.UINavigationPortlet .HighlightNavigationTab .UITab {
Modified: epp/portal/branches/EPP_5_2_Branch/web/eXoResources/src/main/webapp/skin/DefaultSkin/portal/webui/component/view/UIToolbarContainer/Stylesheet.css
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/web/eXoResources/src/main/webapp/skin/DefaultSkin/portal/webui/component/view/UIToolbarContainer/Stylesheet.css 2011-11-11 15:43:02 UTC (rev 8047)
+++ epp/portal/branches/EPP_5_2_Branch/web/eXoResources/src/main/webapp/skin/DefaultSkin/portal/webui/component/view/UIToolbarContainer/Stylesheet.css 2011-11-12 01:59:35 UTC (rev 8048)
@@ -9,8 +9,13 @@
padding:0;
margin:0;
list-style:none;
+ _height: 32px;
}
+.UIToolbarContainer ul li a {
+ _height: 0;
+}
+
.UIToolbarContainer .UserInfoPortletTDContainer {
float: right; /* orientation=lt */
float: left; /* orientation=rt */
@@ -53,6 +58,7 @@
padding: 0px 35px 0px 5px; /* orientation=rt */
white-space: nowrap;
color: #540306;
+/* TODO: figure out how to make this work with browsers other than ie6 :( float: left; */
}
.UIToolbarContainer .UITab a:hover {
@@ -105,7 +111,7 @@
position: absolute;
border: 1px solid #9e9fa3;
display: none;
- z-index: 1;
+ z-index: 1;
}
.UIToolbarContainer .MenuItemContainer li{
@@ -231,7 +237,8 @@
padding: 0px 25px 0px 10px; /* orientation=rt */
color: #e66a1f; font-weight:bold; cursor:pointer;
display: block;
- line-height: 32px;
+ line-height: 32px;
+ float: right;
}
.UIToolbarContainer .Name a:hover {
Modified: epp/portal/branches/EPP_5_2_Branch/web/eXoResources/src/main/webapp/skin/DefaultSkin/webui/component/UIBreadcumbs/Stylesheet.css
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/web/eXoResources/src/main/webapp/skin/DefaultSkin/webui/component/UIBreadcumbs/Stylesheet.css 2011-11-11 15:43:02 UTC (rev 8047)
+++ epp/portal/branches/EPP_5_2_Branch/web/eXoResources/src/main/webapp/skin/DefaultSkin/webui/component/UIBreadcumbs/Stylesheet.css 2011-11-12 01:59:35 UTC (rev 8048)
@@ -9,7 +9,8 @@
.UIBreadcumbs {
line-height: 25px;
border-left: 1px solid #b4b4b4;
- border-right: 1px solid #b4b4b4;
+ border-right: 1px solid #b4b4b4;
+ _height: 0;
}
.UIBreadcumbs a {
@@ -51,4 +52,4 @@
float: left; /* orientation=lt */
float: right; /* orientation=rt */
margin: 5px 0px 0px 0px;
-}
\ No newline at end of file
+}
Modified: epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_cs.properties
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_cs.properties 2011-11-11 15:43:02 UTC (rev 8047)
+++ epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_cs.properties 2011-11-12 01:59:35 UTC (rev 8048)
@@ -1029,7 +1029,7 @@
UIUserSelector.msg.empty=Pr\u00E1zdn\u00E9 \u00FAdaje
UIUserSelector.msg.user-required=Za\u0161krtn\u011Bte pros\u00EDm alespo\u0148 jednoho u\u017Eivatele.
-UIUserToolBarDashboard.page.ClickAndType=Klikn\u011Bte & upravte n\u00E1zev str\u00E1nky
+UIUserToolBarDashboard.page.Tab_Default=Klikn\u011Bte & upravte n\u00E1zev str\u00E1nky
UIVTabInputSet.label.personalInfo=Osobn\u00ED informace
@@ -2110,7 +2110,7 @@
UIUserSelector.msg.empty=Pr\u00e1zdn\u00e9 \u00fadaje
UIUserSelector.msg.user-required=Za\u0161krtn\u011bte pros\u00edm alespo\u0148 jednoho u\u017eivatele.
-UIUserToolBarDashboard.page.ClickAndType=Klikn\u011bte & upravte n\u00e1zev str\u00e1nky
+UIUserToolBarDashboard.page.Tab_Default=Klikn\u011bte & upravte n\u00e1zev str\u00e1nky
UIVTabInputSet.label.personalInfo=Osobn\u00ed informace
Modified: epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_en.properties
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_en.properties 2011-11-11 15:43:02 UTC (rev 8047)
+++ epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_en.properties 2011-11-12 01:59:35 UTC (rev 8048)
@@ -1404,7 +1404,7 @@
UIListPermissionSelectorPopup.title.ListPermissionSelector=Select Permission
-UIUserToolBarDashboard.page.ClickAndType=Click & Type Page Name
+UIUserToolBarDashboard.page.Tab_Default=Click & Type Page Name
#######################################################################
# org.exoplatform.webui.core.UIConfirmation #
Modified: epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_fr.properties
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_fr.properties 2011-11-11 15:43:02 UTC (rev 8047)
+++ epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_fr.properties 2011-11-12 01:59:35 UTC (rev 8048)
@@ -1263,7 +1263,7 @@
UIGadget.tooltip.editGadget=Editer la Gadget
UIGadget.tooltip.deleteGadget=Supprimer la Gadget
-UIUserToolBarDashboard.page.ClickAndType=Cliquez pour renommer
+UIUserToolBarDashboard.page.Tab_Default=Cliquez pour renommer
Locale.zh_CN=Chinois simplifié
Locale.zh_TW=Chinois traditionnel
Modified: epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_it.properties
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_it.properties 2011-11-11 15:43:02 UTC (rev 8047)
+++ epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_it.properties 2011-11-12 01:59:35 UTC (rev 8048)
@@ -1379,7 +1379,7 @@
UIListPermissionSelectorPopup.title.ListPermissionSelector=Seleziona il Permesso
-UIUserToolBarDashboard.page.ClickAndType=Clicca e inserisci il nome della pagina
+UIUserToolBarDashboard.page.Tab_Default=Clicca e inserisci il nome della pagina
#######################################################################
# org.exoplatform.webui.core.UIConfirmation #
Modified: epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_vi.properties
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_vi.properties 2011-11-11 15:43:02 UTC (rev 8047)
+++ epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_vi.properties 2011-11-12 01:59:35 UTC (rev 8048)
@@ -1305,4 +1305,4 @@
UIGadget.tooltip.deleteGadget=Xóa Gadget
UIListPermissionSelectorPopup.title.ListPermissionSelector=Lựa chọn quyền
-UIUserToolBarDashboard.page.ClickAndType=Nhấp chuột và điền tên trang
+UIUserToolBarDashboard.page.Tab_Default=Nhấp chuột và điền tên trang
More information about the gatein-commits
mailing list