Author: phuong_vu
Date: 2011-09-30 08:04:51 -0400 (Fri, 30 Sep 2011)
New Revision: 7575
Modified:
portal/trunk/web/portal/src/main/webapp/groovy/portal/webui/container/UIColumnContainer.gtmpl
portal/trunk/web/portal/src/main/webapp/groovy/portal/webui/container/UITabContainer.gtmpl
portal/trunk/web/portal/src/main/webapp/groovy/portal/webui/container/UITableAutofitColumnContainer.gtmpl
portal/trunk/web/portal/src/main/webapp/groovy/portal/webui/container/UITableColumnContainer.gtmpl
portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/container/UIColumnContainer.java
Log:
GTNPORTAL-2114 It doesn't change portal composer save button after add column in
UITableColumnContainer or tab in UITabContainer
Modified:
portal/trunk/web/portal/src/main/webapp/groovy/portal/webui/container/UIColumnContainer.gtmpl
===================================================================
---
portal/trunk/web/portal/src/main/webapp/groovy/portal/webui/container/UIColumnContainer.gtmpl 2011-09-30
11:13:22 UTC (rev 7574)
+++
portal/trunk/web/portal/src/main/webapp/groovy/portal/webui/container/UIColumnContainer.gtmpl 2011-09-30
12:04:51 UTC (rev 7575)
@@ -73,10 +73,10 @@
<div class="UIPopupCategory" style="display:
none;">
<div class="PopupCategoryDecorator">
- <a class="CategoryItem" href="<%=
uicomponent.event("InsertColumn",
org.exoplatform.portal.webui.container.UIColumnContainer.INSERT_BEFORE) %>"
title="<%= _ctx.appRes("UIColumnContainer.tooltip.insertLeft")
%>">
+ <a class="CategoryItem" href="<%=
uicomponent.event("InsertColumn",
org.exoplatform.portal.webui.container.UIColumnContainer.INSERT_BEFORE)
%>;eXo.portal.UIPortal.changeComposerSaveButton()" title="<%=
_ctx.appRes("UIColumnContainer.tooltip.insertLeft") %>">
<div class="CategoryItemLabel"><%=
_ctx.appRes("UIColumnContainer.label.insertLeft") %></div>
</a>
- <a class="CategoryItem" href="<%=
uicomponent.event("InsertColumn",
org.exoplatform.portal.webui.container.UIColumnContainer.INSERT_AFTER) %>"
title="<%= _ctx.appRes("UIColumnContainer.tooltip.insertRight")
%>">
+ <a class="CategoryItem" href="<%=
uicomponent.event("InsertColumn",
org.exoplatform.portal.webui.container.UIColumnContainer.INSERT_AFTER)
%>;eXo.portal.UIPortal.changeComposerSaveButton()" title="<%=
_ctx.appRes("UIColumnContainer.tooltip.insertRight") %>">
<div class="CategoryItemLabel"><%=
_ctx.appRes("UIColumnContainer.label.insertRight") %></div>
</a>
Modified:
portal/trunk/web/portal/src/main/webapp/groovy/portal/webui/container/UITabContainer.gtmpl
===================================================================
---
portal/trunk/web/portal/src/main/webapp/groovy/portal/webui/container/UITabContainer.gtmpl 2011-09-30
11:13:22 UTC (rev 7574)
+++
portal/trunk/web/portal/src/main/webapp/groovy/portal/webui/container/UITabContainer.gtmpl 2011-09-30
12:04:51 UTC (rev 7575)
@@ -84,12 +84,12 @@
<div class="PopupCategoryMC">
<% if
(!tabState.equals(org.exoplatform.portal.webui.container.UITabContainer.FIRST_TAB))
{%>
<a class="CategoryItem">
- <div class="CategoryItemLabel"
onclick="$moveLeftAction"><%=
_ctx.appRes("UITabContainer.label.moveLeft") %></div>
+ <div class="CategoryItemLabel"
onclick="$moveLeftAction;eXo.portal.UIPortal.changeComposerSaveButton()"><%=
_ctx.appRes("UITabContainer.label.moveLeft") %></div>
</a>
<% } %>
<% if
(!tabState.equals(org.exoplatform.portal.webui.container.UITabContainer.LAST_TAB)) {
%>
<a class="CategoryItem">
- <div class="CategoryItemLabel"
onclick="$moveRightAction"><%=
_ctx.appRes("UITabContainer.label.moveRight") %></div>
+ <div class="CategoryItemLabel"
onclick="$moveRightAction;eXo.portal.UIPortal.changeComposerSaveButton()"><%=
_ctx.appRes("UITabContainer.label.moveRight") %></div>
</a>
<% } %>
</div>
@@ -120,7 +120,7 @@
<% String addTabLink = uicomponent.event("AddTab");
if (uicomponent.isShowEditControl()) {
%>
- <div class="AddTab" onclick="$addTabLink">
+ <div class="AddTab"
onclick="$addTabLink;eXo.portal.UIPortal.changeComposerSaveButton()">
<span></span>
</div>
<% } %>
Modified:
portal/trunk/web/portal/src/main/webapp/groovy/portal/webui/container/UITableAutofitColumnContainer.gtmpl
===================================================================
---
portal/trunk/web/portal/src/main/webapp/groovy/portal/webui/container/UITableAutofitColumnContainer.gtmpl 2011-09-30
11:13:22 UTC (rev 7574)
+++
portal/trunk/web/portal/src/main/webapp/groovy/portal/webui/container/UITableAutofitColumnContainer.gtmpl 2011-09-30
12:04:51 UTC (rev 7575)
@@ -55,7 +55,7 @@
<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>
+ <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()) :
@@ -63,8 +63,8 @@
%>
<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="EditIcon"
title="<%=_ctx.appRes("UIContainer.tooltip.editContainer")%>"><span></span></a>
- <a
href="<%=uicomponent.event("DeleteComponent","$uicomponent.id")%>"
class="DeleteIcon"
title="<%=_ctx.appRes("UIContainer.tooltip.closeContainer")%>"><span></span></a>
+ <a
href="<%=uicomponent.event("EditContainer","$uicomponent.id")%>;eXo.portal.UIPortal.changeComposerSaveButton()"
class="EditIcon"
title="<%=_ctx.appRes("UITableColumnContainer.tooltip.editContainer")%>"><span></span></a>
+ <a
href="<%=uicomponent.event("DeleteComponent","$uicomponent.id")%>"
class="DeleteIcon"
title="<%=_ctx.appRes("UITableColumnContainer.tooltip.closeContainer")%>"><span></span></a>
<%}%>
</div>
<%/*End InfoBar*/ %>
Modified:
portal/trunk/web/portal/src/main/webapp/groovy/portal/webui/container/UITableColumnContainer.gtmpl
===================================================================
---
portal/trunk/web/portal/src/main/webapp/groovy/portal/webui/container/UITableColumnContainer.gtmpl 2011-09-30
11:13:22 UTC (rev 7574)
+++
portal/trunk/web/portal/src/main/webapp/groovy/portal/webui/container/UITableColumnContainer.gtmpl 2011-09-30
12:04:51 UTC (rev 7575)
@@ -55,16 +55,16 @@
<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>
+ <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("UIContainer.title.Container");
+ _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")%>;eXo.portal.UIPortal.changeComposerSaveButton()"
class="EditIcon"
title="<%=_ctx.appRes("UIContainer.tooltip.editContainer")%>"></a>
- <a
href="<%=uicomponent.event("DeleteComponent","$uicomponent.id")%>"
class="DeleteIcon"
title="<%=_ctx.appRes("UIContainer.tooltip.closeContainer")%>"></a>
+ <a
href="<%=uicomponent.event("EditContainer","$uicomponent.id")%>;eXo.portal.UIPortal.changeComposerSaveButton()"
class="EditIcon"
title="<%=_ctx.appRes("UITableColumnContainer.tooltip.editContainer")%>"></a>
+ <a
href="<%=uicomponent.event("DeleteComponent","$uicomponent.id")%>"
class="DeleteIcon"
title="<%=_ctx.appRes("UITableColumnContainer.tooltip.closeContainer")%>"></a>
<%}%>
</div>
<%/*End InfoBar*/ %>
Modified:
portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/container/UIColumnContainer.java
===================================================================
---
portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/container/UIColumnContainer.java 2011-09-30
11:13:22 UTC (rev 7574)
+++
portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/container/UIColumnContainer.java 2011-09-30
12:04:51 UTC (rev 7575)
@@ -79,10 +79,7 @@
Util.showComponentLayoutMode(uiSelectedColumn.getClass());
PortalRequestContext pcontext = (PortalRequestContext)
event.getRequestContext();
- UIPortalApplication uiPortalApp =
uiParent.getAncestorOfType(UIPortalApplication.class);
- UIWorkingWorkspace uiWorkingWS =
uiPortalApp.getChildById(UIPortalApplication.UI_WORKING_WS_ID);
- pcontext.addUIComponentToUpdateByAjax(uiWorkingWS);
- pcontext.ignoreAJAXUpdateOnPortlets(true);
+ pcontext.addUIComponentToUpdateByAjax(uiParent);
}
}
Show replies by date