10:36 a.m.
Author: julien(a)jboss.com
Date: 2008-06-13 11:36:55 -0400 (Fri, 13 Jun 2008)
New Revision: 11047
Modified:
modules/portlet/tags/JBP_PORTLET_2_0_0/portal/src/main/resources/simple-portal-war/demo/wikipedia.jsp
modules/portlet/tags/JBP_PORTLET_2_0_0/portal/src/main/resources/simple-portal-war/layouts/nav/main.jsp
modules/portlet/tags/JBP_PORTLET_2_0_0/samples/src/main/java/org/jboss/portal/portlet/samples/remotecontroller/RemoteControllerPortlet.java
Log:
applying trunk fixes + comment the 301 link
Modified:
modules/portlet/tags/JBP_PORTLET_2_0_0/portal/src/main/resources/simple-portal-war/demo/wikipedia.jsp
===================================================================
---
modules/portlet/tags/JBP_PORTLET_2_0_0/portal/src/main/resources/simple-portal-war/demo/wikipedia.jsp 2008-06-13
15:34:50 UTC (rev 11046)
+++
modules/portlet/tags/JBP_PORTLET_2_0_0/portal/src/main/resources/simple-portal-war/demo/wikipedia.jsp 2008-06-13
15:36:55 UTC (rev 11047)
@@ -9,7 +9,7 @@
<portal:page>
<portal:pageparam namespaceURI="urn:jboss:portal:simple:google"
localName="zipcode" value="32080"/>
<div class="wiki-content full-width">
- <div class="third-width float-right">
+ <div class="two-third-width float-right">
<xportal:portlet name="GoogleMap"
applicationName="samples-google-portlet"/>
</div>
<h2 class="title">St. Augustine, Florida</h2>
Modified:
modules/portlet/tags/JBP_PORTLET_2_0_0/portal/src/main/resources/simple-portal-war/layouts/nav/main.jsp
===================================================================
---
modules/portlet/tags/JBP_PORTLET_2_0_0/portal/src/main/resources/simple-portal-war/layouts/nav/main.jsp 2008-06-13
15:34:50 UTC (rev 11046)
+++
modules/portlet/tags/JBP_PORTLET_2_0_0/portal/src/main/resources/simple-portal-war/layouts/nav/main.jsp 2008-06-13
15:36:55 UTC (rev 11047)
@@ -32,9 +32,11 @@
<li>
<a href="${pageContext.request.contextPath}/demo/demo4.jsp"
class="${fn:substringAfter(pageContext.request.servletPath, 'demo/') ==
'demo4.jsp' ? 'selected' : ''}">Demo4</a>
</li>
+ <%--
<li>
<a href="${pageContext.request.contextPath}/demo/jsr-301.jsp"
class="${fn:substringAfter(pageContext.request.servletPath, 'demo/') ==
'jsr-301.jsp' ? 'selected' : ''}">JSR-301 Demo</a>
</li>
+ --%>
</ul>
<br class="clear"/>
</div>
Modified:
modules/portlet/tags/JBP_PORTLET_2_0_0/samples/src/main/java/org/jboss/portal/portlet/samples/remotecontroller/RemoteControllerPortlet.java
===================================================================
---
modules/portlet/tags/JBP_PORTLET_2_0_0/samples/src/main/java/org/jboss/portal/portlet/samples/remotecontroller/RemoteControllerPortlet.java 2008-06-13
15:34:50 UTC (rev 11046)
+++
modules/portlet/tags/JBP_PORTLET_2_0_0/samples/src/main/java/org/jboss/portal/portlet/samples/remotecontroller/RemoteControllerPortlet.java 2008-06-13
15:36:55 UTC (rev 11047)
@@ -37,7 +37,7 @@
ResourceURL resource = renderResponse.createResourceURL();
printWriter.print(resource);
printWriter.print("')\">Open remote
control!</a></p>");
-}
+ }
@Override
public void serveResource(ResourceRequest resourceRequest, ResourceResponse
resourceResponse) throws PortletException, IOException
@@ -46,17 +46,17 @@
PrintWriter writer = resourceResponse.getWriter();
String namespace = resourceResponse.getNamespace();
writer.print("<html><head><script
type='text/javascript'>function
openLinkInParent(url){window.open(url,'"
- + namespace + "_parent');}</script>\n<link
rel=\"stylesheet\" href='" + resourceRequest.getContextPath() +
"/css/master.css'
type=\"text/css\"/></head><body>");
+ + namespace + "_parent');}</script>\n<link
rel=\"stylesheet\" href='/simple-portal/css/master.css'
type=\"text/css\"/></head><body>");
PortletURL url = resourceResponse.createRenderURL();
url.setWindowState(WindowState.MINIMIZED);
writer.print("<div
class=\"remote-container\"><ul><li><a href='#'
onclick=\"" + createParentURL(url) + "\"><img\n" +
- " src=\"" +
resourceRequest.getContextPath() + "/images/icon-minimize.gif\"
alt=\"\"/> minimize parent portlet</a></li>");
+ "
src=\"/simple-portal/images/icon-minimize.gif\" alt=\"\"/> minimize
parent portlet</a></li>");
url.setWindowState(WindowState.MAXIMIZED);
writer.print("<li><a href='#' onclick=\"" +
createParentURL(url) + "\"><img\n" +
- " src=\"" +
resourceRequest.getContextPath() + "/images/icon-maximize.gif\"
alt=\"\"/> maximize parent portlet</a></li>");
+ "
src=\"/simple-portal/images/icon-maximize.gif\" alt=\"\"/> maximize
parent portlet</a></li>");
url.setWindowState(WindowState.NORMAL);
writer.print("<li><a href='#' onclick=\"" +
createParentURL(url) + "\"><img\n" +
- " src=\"" +
resourceRequest.getContextPath() + "/images/icon-normal.gif\"
alt=\"\"/> make parent portlet
normal</a></li></ul>");
+ "
src=\"/simple-portal/images/icon-normal.gif\" alt=\"\"/> make
parent portlet normal</a></li></ul>");
writer.print("<br/><ul><li><b>'zipcode'</b>
public render parameter value: " + resourceRequest.getParameter(ZIPCODE) +
"<br/>");
writer.print("Set value of <b>'zipcode'</b> public render
parameter to:</li>");
url.setParameter(ZIPCODE, "80201");