[gatein-commits] gatein SVN: r923 - in portal/trunk: web/eXoResources/src/main/webapp/skin/DefaultSkin/webui/component/UIToolbar and 3 other directories.
do-not-reply at jboss.org
do-not-reply at jboss.org
Fri Dec 4 04:00:39 EST 2009
Author: tan_pham_dinh
Date: 2009-12-04 04:00:39 -0500 (Fri, 04 Dec 2009)
New Revision: 923
Modified:
portal/trunk/portlet/exoadmin/src/main/webapp/groovy/applicationregistry/webui/component/UIApplicationRegistryPortlet.gtmpl
portal/trunk/web/eXoResources/src/main/webapp/skin/DefaultSkin/webui/component/UIToolbar/Stylesheet.css
portal/trunk/web/eXoResources/src/main/webapp/skin/DefaultSkin/webui/component/UIToolbar/background/BlueLargeToolbar.gif
portal/trunk/web/portal/src/main/webapp/groovy/portal/webui/portal/UIPortalComposer.gtmpl
portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageBody.java
Log:
GNTPORTAL-247: Cannot drag drop when page has maximized portlet
Modified: portal/trunk/portlet/exoadmin/src/main/webapp/groovy/applicationregistry/webui/component/UIApplicationRegistryPortlet.gtmpl
===================================================================
--- portal/trunk/portlet/exoadmin/src/main/webapp/groovy/applicationregistry/webui/component/UIApplicationRegistryPortlet.gtmpl 2009-12-04 08:14:40 UTC (rev 922)
+++ portal/trunk/portlet/exoadmin/src/main/webapp/groovy/applicationregistry/webui/component/UIApplicationRegistryPortlet.gtmpl 2009-12-04 09:00:39 UTC (rev 923)
@@ -19,31 +19,26 @@
<div class="ManagementIconContainer ClearFix">
<%
cssClass = "ItemButton";
- if(uicomponent.getChild(0).isRendered()) cssClass = "ItemButton SelectItemButton";
+ if(uicomponent.getChild(0).isRendered()) cssClass = "SelectItemButton";
%>
- <div onclick="<%=uicomponent.event("ViewChild", "UIApplicationOrganizer")%>" class="$cssClass">
- <div class="LablelIcon OrganizeIcon"><span></span></div>
- <a href="javascript:void(0);" class="ButtonLabel"><%=_ctx.appRes("UIToolbar.label.organize")%></a>
- </div>
+ <a onclick="<%=uicomponent.event("ViewChild", "UIApplicationOrganizer")%>" class="$cssClass ItemButton OrganizeIcon">
+ <%=_ctx.appRes("UIToolbar.label.organize")%>
+ </a>
<%
cssClass = "ItemButton";
if(uicomponent.getChild(2).isRendered()) cssClass = "ItemButton SelectItemButton";
%>
- <div onclick="<%=uicomponent.event("ViewChild", "UIGadgetManagement")%>" class="$cssClass" style="float: <%= isLT? "right" : "left" %>">
- <div class="LablelIcon GadgetIcon"><span></span></div>
- <a href="javascript:void(0)" class="ButtonLabel"><%=_ctx.appRes("UIToolbar.label.gadget")%></a>
- </div>
+ <a onclick="<%=uicomponent.event("ViewChild", "UIGadgetManagement")%>" class="$cssClass ItemButton GadgetIcon" style="float: <%= isLT? "right" : "left" %>">
+ <%=_ctx.appRes("UIToolbar.label.gadget")%>
+ </a>
<div class="HorizontalSeparator" style="float: <%= isLT? "right" : "left" %>"><span></span></div>
<%
cssClass = "ItemButton";
if(uicomponent.getChild(1).isRendered()) cssClass = "ItemButton SelectItemButton";
%>
- <div onclick="<%=uicomponent.event("ViewChild", "UIPortletManagement")%>" class="$cssClass" style="float: <%= isLT? "right" : "left" %>">
- <div class="LablelIcon PorletIcon"><span></span></div>
- <a href="javascript:void(0);" class="ButtonLabel"><%=_ctx.appRes("UIToolbar.label.portlet")%></a>
- </div>
- <div class="HorizontalSeparator" style="float: <%= isLT? "right" : "left" %>"><span></span></div>
-
+ <a onclick="<%=uicomponent.event("ViewChild", "UIPortletManagement")%>" class="$cssClass ItemButton PorletIcon" style="float: <%= isLT? "right" : "left" %>">
+ <%=_ctx.appRes("UIToolbar.label.portlet")%>
+ </a>
</div>
</div>
Modified: portal/trunk/web/eXoResources/src/main/webapp/skin/DefaultSkin/webui/component/UIToolbar/Stylesheet.css
===================================================================
--- portal/trunk/web/eXoResources/src/main/webapp/skin/DefaultSkin/webui/component/UIToolbar/Stylesheet.css 2009-12-04 08:14:40 UTC (rev 922)
+++ portal/trunk/web/eXoResources/src/main/webapp/skin/DefaultSkin/webui/component/UIToolbar/Stylesheet.css 2009-12-04 09:00:39 UTC (rev 923)
@@ -147,93 +147,88 @@
}
/*##############################- BlueLargeToolbar style -#########################*/
+.UIToolbar .BlueLargeToolbar {
+ height: 32px;
+}
+
+.UIToolbar .BlueLargeToolbar .LeftToolbar {
+ background: url('background/BlueLargeToolbar.gif') no-repeat left top;
+ padding-left: 5px;
+ border-bottom: 1px solid #9a9a9a;
+}
+
+.UIToolbar .BlueLargeToolbar .RightToolbar {
+ background: url('background/BlueLargeToolbar.gif') no-repeat right top;
+ padding-right: 5px;
+}
+
+.UIToolbar .BlueLargeToolbar .MiddleToolbar {
+ height: 32px;
+ background: url('background/BlueLargeToolbar.gif') repeat-x center -61px;
+}
+
+.UIToolbar .BlueLargeToolbar a {
+ color: #7e9bc9; font-weight: bold;
+ padding: 0px 5px 0px 5px;
+ cursor: pointer;
+}
+
+.UIToolbar .BlueLargeToolbar a:hover {
+ color: #003c7f;
+}
+
+.UIToolbar .BlueLargeToolbar .SelectItemButton .LablelIcon {
+ filter: alpha(opacity=100);
+ -moz-opacity: 1.0;
+}
+
+.UIToolbar .BlueLargeToolbar .SelectItemButton .ButtonLabel {
+ line-height: 18px;
+ color: #003c7f;
+}
+
+.UIToolbar .BlueLargeToolbar .HorizontalSeparator {
+ float: left; /* orientation=lt */
+ float: right; /* orientation=rt */
+ margin: 2px 8px 0px 10px;
+ margin: 2px 10px 0px 8px;
+ width: 2px;
+ height: 22px;
+ background: url('background/BlueLargeToolbar.gif') no-repeat -6px top;
+}
+
+.UIToolbar .BlueLargeToolbar .ManagementIconContainer {
+ padding-top: 4px;
+ margin-left: 5px;
+}
+
+.UIToolbar .BlueLargeToolbar .ItemButton {
+ float: left; /* orientation=lt */
+ float: right; /* orientation=rt */
+ padding-left: 35px; /* orientation=lt */
+ padding-right: 35px; /* orientation=rt */
+ margin: 0 10px; display: block;
+ background-image: url('background/BlueLargeToolbar.gif');
+ background-repeat: no-repeat;
+ height: 26px; line-height: 26px;
+ color: #363636;
+}
+
+.UIToolbar .BlueLargeToolbar .OrganizeIcon {
+ background-position: left -122px; /* orientation=lt */
+ background-position: right -122px; /* orientation=rt */
+}
+
+.UIToolbar .BlueLargeToolbar .PorletIcon {
+ background-position: left -148px; /* orientation=lt */
+ background-position: right -148px; /* orientation=rt */
+}
+
+.UIToolbar .BlueLargeToolbar .GadgetIcon {
+ background-position: left -174px; /* orientation=lt */
+ background-position: right -174px; /* orientation=rt */
+}
-.UIToolbar .BlueLargeToolbar {
- height: 61px;
-}
-
-.UIToolbar .BlueLargeToolbar .LeftToolbar {
- background: url('background/BlueLargeToolbar.gif') no-repeat left top;
- padding-left: 5px;
-}
-
-.UIToolbar .BlueLargeToolbar .RightToolbar {
- background: url('background/BlueLargeToolbar.gif') no-repeat right top;
- padding-right: 5px;
-}
-
-.UIToolbar .BlueLargeToolbar .MiddleToolbar {
- height: 61px;
- background: url('background/BlueLargeToolbar.gif') repeat-x center -61px;
-}
-
-.UIToolbar .BlueLargeToolbar a {
- color: #7e9bc9; font-weight: bold;
- padding: 0px 5px 0px 5px;
- cursor: pointer;
-}
-
-.UIToolbar .BlueLargeToolbar a:hover {
- color: #003c7f;
-}
-
-.UIToolbar .BlueLargeToolbar .SelectItemButton .LablelIcon {
- filter: alpha(opacity=100);
- -moz-opacity: 1.0;
-}
-
-.UIToolbar .BlueLargeToolbar .SelectItemButton .ButtonLabel {
- line-height: 18px;
- color: #003c7f;
-}
-
-.UIToolbar .BlueLargeToolbar .HorizontalSeparator {
- float: left; /* orientation=lt */
- float: right; /* orientation=rt */
- margin: 0px 8px 0px 10px;
- margin: 0px 10px 0px 8px;
- width: 2px;
- height: 48px;
- background: url('background/BlueLargeToolbar.gif') no-repeat -6px top;
-}
-
-.UIToolbar .BlueLargeToolbar .ButtonLabel {
- height: 20px;
- line-height: 20px;
-}
-
-.UIToolbar .BlueLargeToolbar .ManagementIconContainer {
- padding-top: 4px;
- margin-left: 5px;
-}
-
-.UIToolbar .BlueLargeToolbar .ItemButton {
- float: left; /* orientation=lt */
- float: right; /* orientation=rt */
- text-align: center;
- padding: 5px;
- width: 75px;
-}
-
-.UIToolbar .BlueLargeToolbar .LablelIcon {
- width: 32px; height: 26px;
- margin: auto;
- background-image: url('background/BlueLargeToolbar.gif');
- background-repeat: no-repeat;
-}
-
-.UIToolbar .BlueLargeToolbar .OrganizeIcon {
- background-position: center -122px;
-}
-
-.UIToolbar .BlueLargeToolbar .PorletIcon {
- background-position: center -148px;
-}
-
-.UIToolbar .BlueLargeToolbar .GadgetIcon {
- background-position: center -174px;
-}
-
/*
* minh.js.exo
*/
Modified: portal/trunk/web/eXoResources/src/main/webapp/skin/DefaultSkin/webui/component/UIToolbar/background/BlueLargeToolbar.gif
===================================================================
(Binary files differ)
Modified: portal/trunk/web/portal/src/main/webapp/groovy/portal/webui/portal/UIPortalComposer.gtmpl
===================================================================
--- portal/trunk/web/portal/src/main/webapp/groovy/portal/webui/portal/UIPortalComposer.gtmpl 2009-12-04 08:14:40 UTC (rev 922)
+++ portal/trunk/web/portal/src/main/webapp/groovy/portal/webui/portal/UIPortalComposer.gtmpl 2009-12-04 09:00:39 UTC (rev 923)
@@ -7,7 +7,7 @@
rcontext.getJavascriptManager().addJavascript("eXo.webui.UIPopupWindow.init('$popupId', true, true, true, false);");
rcontext.getJavascriptManager().addJavascript("eXo.webui.UIPopup.setAlign('$popupId', 2, 5, 5);");
%>
-<div class="UIPopupWindow UIDragObject UIPortalComposer" exo:minWidth="200" exo:minHeight="200" id="$uicomponent.id" style="width: 300px; display: block;">
+<div class="UIPopupWindow UIDragObject UIPortalComposer" exo:minWidth="200" exo:minHeight="200" id="$uicomponent.id" style="width: 320px; display: block;">
<div class="TLPortalComposer">
<div class="TRPortalComposer">
<div class="TCPortalComposer">
Modified: portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageBody.java
===================================================================
--- portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageBody.java 2009-12-04 08:14:40 UTC (rev 922)
+++ portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageBody.java 2009-12-04 09:00:39 UTC (rev 923)
@@ -120,8 +120,8 @@
{
uiPortal.setMaximizedUIComponent(null);
}
- UIComponent maximizedComponentInPageBody = this.getMaximizedUIComponent();
- if(maximizedComponentInPageBody !=null && maximizedComponentInPageBody instanceof UIPage){
+ maximizedComponent = this.getMaximizedUIComponent();
+ if(maximizedComponent !=null && maximizedComponent instanceof UIPage){
this.setMaximizedUIComponent(null);
}
}
@@ -137,11 +137,6 @@
public void processRender(WebuiRequestContext context) throws Exception
{
- if (maximizedUIComponent != null)
- {
- maximizedUIComponent.processRender((WebuiRequestContext)WebuiRequestContext.getCurrentInstance());
- return;
- }
if (uicomponent_ == null)
{
setPageBody(Util.getUIPortal().getSelectedNode(), Util.getUIPortal());
More information about the gatein-commits
mailing list