Author: woonsan
Date: Tue Dec 15 18:48:57 2009
New Revision: 890938
URL: http://svn.apache.org/viewvc?rev=890938&view=rev
Log:
JS2-1084: Fixing the error when maximizing a portlet window under /ui pipeline.
Modified:
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/jetui/yui/jetui.jsp
Modified:
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/jetui/yui/jetui.jsp
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/jetui/yui/jetui.jsp?rev=890938&r1=890937&r2=890938&view=diff
==============================================================================
---
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/jetui/yui/jetui.jsp
(original)
+++
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/jetui/yui/jetui.jsp
Tue Dec 15 18:48:57 2009
@@ -35,12 +35,28 @@
RequestContext rc =
(RequestContext)request.getAttribute(RequestContext.REQUEST_PORTALENV);
Map userInfo = jetui.getUserAttributes(rc);
ContentPage portalPage = rc.getPage();
+ ContentFragment maximized =
(ContentFragment)request.getAttribute(PortalReservedParameters.MAXIMIZED_FRAGMENT_ATTRIBUTE);
ColumnLayout columnLayout =
(ColumnLayout)request.getAttribute("columnLayout");
+
+ String navContent = null;
+ String tbContent = null;
+
ContentFragment pageNav = jetui.getContentFragment("jsPageNavigator", rc);
- String navContent = jetui.getRenderedContent(pageNav, rc);
ContentFragment toolbox = jetui.getContentFragment("jsToolbox", rc);
- String tbContent = jetui.getRenderedContent(toolbox, rc);
+
+ if (maximized != null)
+ {
+ navContent = jetui.renderPortletWindow(pageNav.getId(),
pageNav.getName(), rc);
+ tbContent = jetui.renderPortletWindow(toolbox.getId(),
pageNav.getName(), rc);
+ }
+ else
+ {
+ navContent = jetui.getRenderedContent(pageNav, rc);
+ tbContent = jetui.getRenderedContent(toolbox, rc);
+ }
+
String breadcrumbs = jetui.renderPortletWindow("jsBreadcrumbMenu",
"j2-admin::BreadcrumbMenu", rc);
+
String encoding = "text/html";
if (response.getCharacterEncoding() != null)
{
@@ -137,7 +153,6 @@
<div class="PContent"><span
style="line-height:0.005px;"> </span><%=breadcrumbs%></div>
<div id="jsFragments" class="portal-nested-layout
portal-nested-layout-TwoColumns">
<%
- ContentFragment maximized =
(ContentFragment)request.getAttribute(PortalReservedParameters.MAXIMIZED_FRAGMENT_ATTRIBUTE);
if (maximized != null)
{
String content = jetui.getRenderedContent(maximized, rc);
@@ -149,9 +164,9 @@
request.setAttribute("fragment", maximized);
request.setAttribute("coordinate",
columnLayout.getCoordinate(maximized));
%>
-<div id="column_id_0>"
+<div id="column_id_0"
class="portal-layout-column"
- locked='<%=maximized.isLocked() %>'>
+ locked="<%=maximized.isLocked()%>"
style="float:left; width:100%; background-color: #ffffff;">
<jsp:include page="jetui-portlet.jsp"/>
</div>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
