portals-jetspeed-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From woon...@apache.org
Subject svn commit: r917648 - /portals/jetspeed-2/applications/j2-admin/trunk/src/main/webapp/WEB-INF/view/spaces/page-navigator.jsp
Date Mon, 01 Mar 2010 18:52:11 GMT
Author: woonsan
Date: Mon Mar  1 18:52:11 2010
New Revision: 917648

URL: http://svn.apache.org/viewvc?rev=917648&view=rev
Log:
JS2-1113: Passing "_inheritdeco" parameter when opening a popup window.

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

Modified: portals/jetspeed-2/applications/j2-admin/trunk/src/main/webapp/WEB-INF/view/spaces/page-navigator.jsp
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/trunk/src/main/webapp/WEB-INF/view/spaces/page-navigator.jsp?rev=917648&r1=917647&r2=917648&view=diff
==============================================================================
--- portals/jetspeed-2/applications/j2-admin/trunk/src/main/webapp/WEB-INF/view/spaces/page-navigator.jsp
(original)
+++ portals/jetspeed-2/applications/j2-admin/trunk/src/main/webapp/WEB-INF/view/spaces/page-navigator.jsp
Mon Mar  1 18:52:11 2010
@@ -21,6 +21,7 @@
 <%@page import="java.text.NumberFormat"%>
 <%@page import="javax.portlet.RenderRequest"%>
 <%@page import="javax.portlet.RenderResponse"%>
+<%@page import="org.apache.jetspeed.decoration.Theme" %>
 <%@page import="org.apache.jetspeed.portlets.spaces.SpaceBean"%>
 <%@page import="org.apache.jetspeed.om.page.Page"%>
 <%@page import="org.apache.jetspeed.om.page.Link"%>
@@ -123,6 +124,7 @@
 PageNavigator pageNavigator = (PageNavigator) renderRequest.getAttribute("PageNavigator");
 List<MenuElement> menuElements = (List<MenuElement>) renderRequest.getAttribute("spaceMenuElements");
 List<MenuElement> linkElements = (List<MenuElement>) renderRequest.getAttribute("spaceLinkElements");
+Theme theme = (Theme) rc.getRequest().getAttribute("org.apache.jetspeed.theme");
 %>
 
 <form id='jsPages' method="POST" action='<portlet:actionURL/>'>
@@ -324,9 +326,10 @@
             });
         }
 
+        var inheritDecoName = "<%=theme.getPageLayoutDecoration().getName()%>";
         var nodeType = "page";
         var nodePath = menuitem.getAttribute("path");
-        var src = "<%=basePath%>/system/sitemanager/nodeeditor.psml?_jssmnodetype="
+ nodeType + "&_jssmnodepath=" + nodePath;
+        var src = "<%=basePath%>/system/sitemanager/nodeeditor.psml?_inheritdeco="
+ inheritDecoName + "&_jssmnodetype=" + nodeType + "&_jssmnodepath=" + nodePath;
         var offsetWidth = 700;
         var offsetHeight = 500;
         var nodwViewWindow = Y.Node.create("<iframe width='" + offsetWidth + "' height='"
+ offsetHeight + "' frameborder='0' scrolling='auto' align='bottom' marginwidth='0' marginheight='0'
src='" + src + "'></iframe>");



---------------------------------------------------------------------
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