portals-jetspeed-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From woon...@apache.org
Subject svn commit: r1102159 - /portals/jetspeed-2/applications/j2-admin/trunk/src/main/webapp/WEB-INF/view/toolbox/toolbox.jsp
Date Thu, 12 May 2011 02:52:22 GMT
Author: woonsan
Date: Thu May 12 02:52:21 2011
New Revision: 1102159

URL: http://svn.apache.org/viewvc?rev=1102159&view=rev
Log:
JS2-1232: Fixing UI issue of portlet clone popup window.
Popup url should have "_inheritdeco" parameter for inherited style psml pages
since jetui.jsp is not aware of decorations and it needs an explicit parameter.

Modified:
    portals/jetspeed-2/applications/j2-admin/trunk/src/main/webapp/WEB-INF/view/toolbox/toolbox.jsp

Modified: portals/jetspeed-2/applications/j2-admin/trunk/src/main/webapp/WEB-INF/view/toolbox/toolbox.jsp
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/trunk/src/main/webapp/WEB-INF/view/toolbox/toolbox.jsp?rev=1102159&r1=1102158&r2=1102159&view=diff
==============================================================================
--- portals/jetspeed-2/applications/j2-admin/trunk/src/main/webapp/WEB-INF/view/toolbox/toolbox.jsp
(original)
+++ portals/jetspeed-2/applications/j2-admin/trunk/src/main/webapp/WEB-INF/view/toolbox/toolbox.jsp
Thu May 12 02:52:21 2011
@@ -45,6 +45,13 @@ limitations under the License.
 
 <c:set var="portletPageSize" value="${prefs['Rows'][0]}"/>
 
+<c:set var="pageDeco" value="" />
+<c:forEach var="theme" items="${themes}">
+  <c:if test="${theme.selected}">
+    <c:set var="pageDeco" value="${theme.name}" />
+  </c:if>
+</c:forEach>
+
 <ul id="<portlet:namespace/>tabActions" class="default-tabs">
   <li class="not-selected"><a href="#" id="<portlet:namespace/>portletsTabAction"
title="<fmt:message key='toolbox.label.portlets'/>"><fmt:message key="toolbox.label.portlets"/></a></li>
   <li class="not-selected"><a href="#" id="<portlet:namespace/>layoutTabAction"
title="<fmt:message key='toolbox.label.layout'/>"><fmt:message key="toolbox.label.layout"/></a></li>
@@ -689,7 +696,7 @@ YUI().use('jetui-portal', 'io', 'json', 
         var portal = (JETUI_YUI ? JETUI_YUI.getPortalInstance() : null);
         if (portal) {
             var iframe = Y.Node.one("#<portlet:namespace/>portletCloneModalBodyIFrame");
-            iframe.set("src", "${requestContext.portalURL.basePath}/system/prm/cloneportlet.psml?portlet="
+ portletUniqueName);
+            iframe.set("src", "${requestContext.portalURL.basePath}/system/prm/cloneportlet.psml?_inheritdeco=${pageDeco}&portlet="
+ portletUniqueName);
             portal.showModalPanel("#<portlet:namespace/>portletCloneModalHeader", "#<portlet:namespace/>portletCloneModalBody",
"#<portlet:namespace/>portletCloneModalFooter", modalFeatures);
         }
         e.halt();



---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@portals.apache.org
For additional commands, e-mail: jetspeed-dev-help@portals.apache.org


Mime
View raw message