Author: woonsan
Date: Sat Jul 17 02:27:36 2010
New Revision: 964997
URL: http://svn.apache.org/viewvc?rev=964997&view=rev
Log:
JS2-1200: Fixing the problem of wrong (double-slashed) urls when deployed to
root webapp.
Modified:
portals/jetspeed-2/applications/j2-admin/trunk/src/main/webapp/WEB-INF/security/chgpwd/change-password.jsp
portals/jetspeed-2/applications/j2-admin/trunk/src/main/webapp/WEB-INF/security/login/login-xhtmlbasic.jsp
portals/jetspeed-2/applications/j2-admin/trunk/src/main/webapp/WEB-INF/security/login/login.jsp
portals/jetspeed-2/applications/j2-admin/trunk/src/main/webapp/WEB-INF/security/login/portal-login.jsp
portals/jetspeed-2/applications/j2-admin/trunk/src/main/webapp/WEB-INF/view/mfa/enroll-login.jsp
portals/jetspeed-2/applications/j2-admin/trunk/src/main/webapp/WEB-INF/view/mfa/enroll.jsp
portals/jetspeed-2/applications/j2-admin/trunk/src/main/webapp/WEB-INF/view/mfa/loggedon.jsp
portals/jetspeed-2/applications/j2-admin/trunk/src/main/webapp/WEB-INF/view/mfa/login3.jsp
portals/jetspeed-2/applications/j2-admin/trunk/src/main/webapp/WEB-INF/view/spaces/spaces-manager.jsp
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/security/chgpwd/change-password.jsp
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/trunk/src/main/webapp/WEB-INF/security/chgpwd/change-password.jsp?rev=964997&r1=964996&r2=964997&view=diff
==============================================================================
---
portals/jetspeed-2/applications/j2-admin/trunk/src/main/webapp/WEB-INF/security/chgpwd/change-password.jsp
(original)
+++
portals/jetspeed-2/applications/j2-admin/trunk/src/main/webapp/WEB-INF/security/chgpwd/change-password.jsp
Sat Jul 17 02:27:36 2010
@@ -25,8 +25,9 @@ limitations under the License.
<fmt:setBundle
basename="org.apache.jetspeed.portlets.security.resources.ChgPwdResources" />
<c_rt:set var="requestContext"
value="<%=request.getAttribute(RequestContext.REQUEST_PORTALENV)%>"/>
<c:set var="portalContextPath" value="${requestContext.request.contextPath}"/>
-<c:if test="${empty portalContextPath}">
- <c:set var="portalContextPath" value="/"/>
+<c:set var="portalContextPathInUrlTag" value="${portalContextPath}"/>
+<c:if test="${empty portalContextPathInUrlTag}">
+ <c:set var="portalContextPathInUrlTag" value="/"/>
</c:if>
<div class="portlet-section-text">
<c:choose>
@@ -88,7 +89,7 @@ limitations under the License.
</c:when>
<c:otherwise>
<br/><br/>
- <a href='<c:url context="${portalContextPath}"
value="/login/logout"/>'><fmt:message key="chgpwd.label.Logout"/></a>
+ <a href='<c:url context="${portalContextPathInUrlTag}"
value="/login/logout"/>'><fmt:message key="chgpwd.label.Logout"/></a>
</c:otherwise>
</c:choose>
</c:if>
Modified:
portals/jetspeed-2/applications/j2-admin/trunk/src/main/webapp/WEB-INF/security/login/login-xhtmlbasic.jsp
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/trunk/src/main/webapp/WEB-INF/security/login/login-xhtmlbasic.jsp?rev=964997&r1=964996&r2=964997&view=diff
==============================================================================
---
portals/jetspeed-2/applications/j2-admin/trunk/src/main/webapp/WEB-INF/security/login/login-xhtmlbasic.jsp
(original)
+++
portals/jetspeed-2/applications/j2-admin/trunk/src/main/webapp/WEB-INF/security/login/login-xhtmlbasic.jsp
Sat Jul 17 02:27:36 2010
@@ -22,13 +22,14 @@ limitations under the License.
<fmt:setBundle
basename="org.apache.jetspeed.portlets.security.resources.LoginResources" />
<c_rt:set var="requestContext"
value="<%=request.getAttribute(RequestContext.REQUEST_PORTALENV)%>"/>
<c:set var="portalContextPath" value="${requestContext.request.contextPath}"/>
-<c:if test="${empty portalContextPath}">
- <c:set var="portalContextPath" value="/"/>
+<c:set var="portalContextPathInUrlTag" value="${portalContextPath}"/>
+<c:if test="${empty portalContextPathInUrlTag}">
+ <c:set var="portalContextPathInUrlTag" value="/"/>
</c:if>
<c:choose>
<c:when test="${pageContext.request.userPrincipal != null}">
<fmt:message key="login.label.Welcome"><fmt:param><c:out
value="${pageContext.request.userPrincipal.name}"/></fmt:param></fmt:message><br/>
- <a href='<c:url context="${portalContextPath}"
value="/login/logout?${loginDestination}=${requestContext.portalURL.basePath}"/>'><fmt:message
key="login.label.Logout"/></a>
+ <a href='<c:url context="${portalContextPathInUrlTag}"
value="/login/logout?${loginDestination}=${requestContext.portalURL.basePath}"/>'><fmt:message
key="login.label.Logout"/></a>
<br/>
<a href='<c:url context="/"
value="${requestContext.portalURL.basePath}/my-account.psml"/>'><fmt:message
key="login.label.ChangePassword"/></a>
</c:when>
@@ -47,7 +48,7 @@ limitations under the License.
</c:if>
</c:otherwise>
</c:choose>
- <form method="post" action='<c:url context="${portalContextPath}"
value="/login/proxy?${loginDestination}=${requestContext.portalURL.basePath}"/>'>
+ <form method="post" action='<c:url context="${portalContextPathInUrlTag}"
value="/login/proxy?${loginDestination}=${requestContext.portalURL.basePath}"/>'>
<div>
<fmt:message key="login.label.Username"/>
<c_rt:set var="userName"
value="<%=((RequestContext)request.getAttribute(RequestContext.REQUEST_PORTALENV)).getSessionAttribute(LoginConstants.USERNAME)%>"/>
Modified:
portals/jetspeed-2/applications/j2-admin/trunk/src/main/webapp/WEB-INF/security/login/login.jsp
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/trunk/src/main/webapp/WEB-INF/security/login/login.jsp?rev=964997&r1=964996&r2=964997&view=diff
==============================================================================
---
portals/jetspeed-2/applications/j2-admin/trunk/src/main/webapp/WEB-INF/security/login/login.jsp
(original)
+++
portals/jetspeed-2/applications/j2-admin/trunk/src/main/webapp/WEB-INF/security/login/login.jsp
Sat Jul 17 02:27:36 2010
@@ -25,27 +25,26 @@ limitations under the License.
<c_rt:set var="requestContext"
value="<%=request.getAttribute(RequestContext.REQUEST_PORTALENV)%>"/>
<c_rt:set var="loginDestination" value="<%=LoginConstants.DESTINATION%>"/>
<c:set var="portalContextPath" value="${requestContext.request.contextPath}"/>
-<c:if test="${empty portalContextPath}">
- <c:set var="portalContextPath" value="/"/>
+<c:set var="portalContextPathInUrlTag" value="${portalContextPath}"/>
+<c:if test="${empty portalContextPathInUrlTag}">
+ <c:set var="portalContextPathInUrlTag" value="/"/>
</c:if>
<c:set var="encoder"
value="${requestContext.request.parameterMap.encoder[0]}"/>
<c:set var="destLogin"
value="/login/proxy?${loginDestination}=${requestContext.portalURL.basePath}"/>
<c:set var="destLogout"
value="/login/logout?${loginDestination}=${requestContext.portalURL.basePath}"/>
<c:set var="destAccount"
value="${requestContext.portalURL.basePath}/my-account.psml"/>
-<c:set var="destContext" value="/"/>
<c:if test="${not empty encoder && encoder == 'desktop'}">
<c:set var="destLogin"
value="/login/proxy?${loginDestination}=${requestContext.request.contextPath}/desktop"/>
<c:set var="destLogout"
value="/login/logout?${loginDestination}=${requestContext.request.contextPath}/desktop"/>
<c:set var="destAccount"
value="/desktop/my-account.psml?${loginDestination}=${requestContext.request.contextPath}/desktop"/>
- <c:set var="destContext" value="${portalContextPath}"/>
</c:if>
<div class="portlet-section-text">
<c:choose>
<c:when test="${pageContext.request.userPrincipal != null}">
<fmt:message key="login.label.Welcome"><fmt:param><c:out
value="${pageContext.request.userPrincipal.name}"/></fmt:param></fmt:message><br>
- <a href='<c:url context="${portalContextPath}"
value="${destLogout}"/>'><fmt:message key="login.label.Logout"/></a>
+ <a href='<c:url context="${portalContextPathInUrlTag}"
value="${destLogout}"/>'><fmt:message key="login.label.Logout"/></a>
<br>
- <a href='<c:url context="${destContext}"
value="${destAccount}"/>'><fmt:message key="login.label.ChangePassword"/></a>
+ <a href='<c:url context="${portalContextPathInUrlTag}"
value="${destAccount}"/>'><fmt:message key="login.label.ChangePassword"/></a>
</c:when>
<c:otherwise>
<%-- backdoor access to the portal session to get the login error count
--%>
@@ -69,7 +68,7 @@ limitations under the License.
</c:if>
</c:otherwise>
</c:choose>
- <form method="POST" action='<c:url context="${portalContextPath}"
value="${destLogin}"/>'>
+ <form method="POST" action='<c:url context="${portalContextPathInUrlTag}"
value="${destLogin}"/>'>
<table border="0">
<tr>
<td><div class="portlet-form-field-label"><fmt:message
key="login.label.Username"/></div></td>
Modified:
portals/jetspeed-2/applications/j2-admin/trunk/src/main/webapp/WEB-INF/security/login/portal-login.jsp
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/trunk/src/main/webapp/WEB-INF/security/login/portal-login.jsp?rev=964997&r1=964996&r2=964997&view=diff
==============================================================================
---
portals/jetspeed-2/applications/j2-admin/trunk/src/main/webapp/WEB-INF/security/login/portal-login.jsp
(original)
+++
portals/jetspeed-2/applications/j2-admin/trunk/src/main/webapp/WEB-INF/security/login/portal-login.jsp
Sat Jul 17 02:27:36 2010
@@ -26,19 +26,18 @@ limitations under the License.
<c_rt:set var="requestContext"
value="<%=request.getAttribute(RequestContext.REQUEST_PORTALENV)%>"/>
<c_rt:set var="loginDestination" value="<%=LoginConstants.DESTINATION%>"/>
<c:set var="portalContextPath" value="${requestContext.request.contextPath}"/>
-<c:if test="${empty portalContextPath}">
- <c:set var="portalContextPath" value="/"/>
+<c:set var="portalContextPathInUrlTag" value="${portalContextPath}"/>
+<c:if test="${empty portalContextPathInUrlTag}">
+ <c:set var="portalContextPathInUrlTag" value="/"/>
</c:if>
<c:set var="encoder"
value="${requestContext.request.parameterMap.encoder[0]}"/>
<c:set var="destLogin"
value="/login/proxy?${loginDestination}=${requestContext.portalURL.basePath}"/>
<c:set var="destLogout"
value="/login/logout?${loginDestination}=${requestContext.portalURL.basePath}"/>
<c:set var="destAccount"
value="${requestContext.portalURL.basePath}/my-account.psml"/>
-<c:set var="destContext" value="/"/>
<c:if test="${not empty encoder && encoder == 'desktop'}">
<c:set var="destLogin"
value="/login/proxy?${loginDestination}=${requestContext.request.contextPath}/desktop"/>
<c:set var="destLogout"
value="/login/logout?${loginDestination}=${requestContext.request.contextPath}/desktop"/>
<c:set var="destAccount"
value="/desktop/my-account.psml?${loginDestination}=${requestContext.request.contextPath}/desktop"/>
- <c:set var="destContext" value="${portalContextPath}"/>
</c:if>
<c_rt:set var="contentType"
value="<%=renderRequest.getResponseContentType()%>"/>
@@ -68,7 +67,7 @@ limitations under the License.
<p>Username: <input name="username" value='admin'/></p>
<p>Password: <input name="password" value='blue'/></p>
<do type="accept" label="login">
- <go href="<c:url context="${portalContextPath}" value="/portal"/>"
method="post">
+ <go href="<c:url context="${portalContextPathInUrlTag}" value="/portal"/>"
method="post">
<postfield name="org.apache.jetspeed.login.username"
value="$(username)"/>
<postfield name="org.apache.jetspeed.login.password"
value="$(password)"/>
</go>
@@ -80,9 +79,9 @@ limitations under the License.
<c:choose>
<c:when test="${pageContext.request.userPrincipal != null}">
<fmt:message key="login.label.Welcome"><fmt:param><c:out
value="${pageContext.request.userPrincipal.name}"/></fmt:param></fmt:message><br>
- <a href='<c:url context="${portalContextPath}"
value="${destLogout}"/>'><fmt:message key="login.label.Logout"/></a>
+ <a href='<c:url context="${portalContextPathInUrlTag}"
value="${destLogout}"/>'><fmt:message key="login.label.Logout"/></a>
<br>
- <a href='<c:url context="${destContext}"
value="${destAccount}"/>'><fmt:message key="login.label.ChangePassword"/></a>
+ <a href='<c:url context="${portalContextPathInUrlTag}"
value="${destAccount}"/>'><fmt:message key="login.label.ChangePassword"/></a>
</c:when>
<c:otherwise>
<%-- backdoor access to the portal session to get the login error count
--%>
@@ -102,7 +101,7 @@ limitations under the License.
</c:if>
</c:otherwise>
</c:choose>
- <form method="POST" action='<c:url context="${portalContextPath}"
value="${destLogin}"/>'>
+ <form method="POST" action='<c:url context="${portalContextPathInUrlTag}"
value="${destLogin}"/>'>
<table border="0">
<tr>
<td><fmt:message key="login.label.Username"/></td>
Modified:
portals/jetspeed-2/applications/j2-admin/trunk/src/main/webapp/WEB-INF/view/mfa/enroll-login.jsp
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/trunk/src/main/webapp/WEB-INF/view/mfa/enroll-login.jsp?rev=964997&r1=964996&r2=964997&view=diff
==============================================================================
---
portals/jetspeed-2/applications/j2-admin/trunk/src/main/webapp/WEB-INF/view/mfa/enroll-login.jsp
(original)
+++
portals/jetspeed-2/applications/j2-admin/trunk/src/main/webapp/WEB-INF/view/mfa/enroll-login.jsp
Sat Jul 17 02:27:36 2010
@@ -39,8 +39,9 @@ limitations under the License.
<c:set var="requestContext"
value="<%=request.getAttribute(RequestContext.REQUEST_PORTALENV)%>"/>
<c:set var="loginDestination" value="<%=LoginConstants.DESTINATION%>"/>
<c:set var="portalContextPath" value="${requestContext.request.contextPath}"/>
-<c:if test="${empty portalContextPath}">
- <c:set var="portalContextPath" value="/"/>
+<c:set var="portalContextPathInUrlTag" value="${portalContextPath}"/>
+<c:if test="${empty portalContextPathInUrlTag}">
+ <c:set var="portalContextPathInUrlTag" value="/"/>
</c:if>
<c:set var="encoder"
value="${requestContext.request.parameterMap.encoder[0]}"/>
<c:set var="destLogin" value="/login/proxy"/>
@@ -99,7 +100,7 @@ if (statusMsg != null)
<td colspan="2"><input type="submit" class="portlet-form-button"
value="<fmt:message key="login.label.Login"/>"></td>
</tr>
</table>
- <input type='hidden' value='<c:url context="${portalContextPath}"
value="/"/>' name='redirect' id='redirect'/>
+ <input type='hidden' value='<c:url context="${portalContextPathInUrlTag}"
value="/"/>' name='redirect' id='redirect'/>
<input type='hidden' name='phase' id='phase' value='enroll-login'/>
</form>
<br/>
Modified:
portals/jetspeed-2/applications/j2-admin/trunk/src/main/webapp/WEB-INF/view/mfa/enroll.jsp
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/trunk/src/main/webapp/WEB-INF/view/mfa/enroll.jsp?rev=964997&r1=964996&r2=964997&view=diff
==============================================================================
---
portals/jetspeed-2/applications/j2-admin/trunk/src/main/webapp/WEB-INF/view/mfa/enroll.jsp
(original)
+++
portals/jetspeed-2/applications/j2-admin/trunk/src/main/webapp/WEB-INF/view/mfa/enroll.jsp
Sat Jul 17 02:27:36 2010
@@ -36,8 +36,9 @@ limitations under the License.
<c:set var="requestContext"
value="<%=request.getAttribute(RequestContext.REQUEST_PORTALENV)%>"/>
<c:set var="loginDestination" value="<%=LoginConstants.DESTINATION%>"/>
<c:set var="portalContextPath" value="${requestContext.request.contextPath}"/>
-<c:if test="${empty portalContextPath}">
- <c:set var="portalContextPath" value="/"/>
+<c:set var="portalContextPathInUrlTag" value="${portalContextPath}"/>
+<c:if test="${empty portalContextPathInUrlTag}">
+ <c:set var="portalContextPathInUrlTag" value="/"/>
</c:if>
<c:set var="encoder"
value="${requestContext.request.parameterMap.encoder[0]}"/>
<c:set var="destLogin" value="/login/proxy"/>
@@ -101,7 +102,7 @@ if (statusMsg != null)
This is not a password, but simply a method for you to be sure you are logging
into the correct system.</p>
<p>Passphrase: <input type="text" id="passphrase" name="passphrase"/></p>
<input type='hidden' id='phase' name='phase' value='enroll'/>
-<input type='hidden' value='<c:url context="${portalContextPath}" value="/"/>'
name='redirect' id='redirect'/>
+<input type='hidden' value='<c:url context="${portalContextPathInUrlTag}"
value="/"/>' name='redirect' id='redirect'/>
<input type="submit" />
</form>
<br/>
Modified:
portals/jetspeed-2/applications/j2-admin/trunk/src/main/webapp/WEB-INF/view/mfa/loggedon.jsp
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/trunk/src/main/webapp/WEB-INF/view/mfa/loggedon.jsp?rev=964997&r1=964996&r2=964997&view=diff
==============================================================================
---
portals/jetspeed-2/applications/j2-admin/trunk/src/main/webapp/WEB-INF/view/mfa/loggedon.jsp
(original)
+++
portals/jetspeed-2/applications/j2-admin/trunk/src/main/webapp/WEB-INF/view/mfa/loggedon.jsp
Sat Jul 17 02:27:36 2010
@@ -21,8 +21,9 @@ limitations under the License.
<c:set var="requestContext"
value="<%=request.getAttribute(RequestContext.REQUEST_PORTALENV)%>"/>
<c:set var="loginDestination" value="<%=LoginConstants.DESTINATION%>"/>
<c:set var="portalContextPath" value="${requestContext.request.contextPath}"/>
-<c:if test="${empty portalContextPath}">
- <c:set var="portalContextPath" value="/"/>
+<c:set var="portalContextPathInUrlTag" value="${portalContextPath}"/>
+<c:if test="${empty portalContextPathInUrlTag}">
+ <c:set var="portalContextPathInUrlTag" value="/"/>
</c:if>
<c:set var="encoder"
value="${requestContext.request.parameterMap.encoder[0]}"/>
<c:set var="destLogin" value="/login/proxy"/>
@@ -35,7 +36,7 @@ limitations under the License.
</c:if>
<div class="portlet-section-text">
Welcome <c:out value="${pageContext.request.userPrincipal.name}"/><br>
- <a href='<c:url context="${portalContextPath}"
value="${destLogout}"/>'>Logout</a>
+ <a href='<c:url context="${portalContextPathInUrlTag}"
value="${destLogout}"/>'>Logout</a>
<br>
- <a href='<c:url context="${portalContextPath}"
value="${destAccount}"/>'>Change Password</a>
+ <a href='<c:url context="${portalContextPathInUrlTag}"
value="${destAccount}"/>'>Change Password</a>
</div>
Modified:
portals/jetspeed-2/applications/j2-admin/trunk/src/main/webapp/WEB-INF/view/mfa/login3.jsp
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/trunk/src/main/webapp/WEB-INF/view/mfa/login3.jsp?rev=964997&r1=964996&r2=964997&view=diff
==============================================================================
---
portals/jetspeed-2/applications/j2-admin/trunk/src/main/webapp/WEB-INF/view/mfa/login3.jsp
(original)
+++
portals/jetspeed-2/applications/j2-admin/trunk/src/main/webapp/WEB-INF/view/mfa/login3.jsp
Sat Jul 17 02:27:36 2010
@@ -39,8 +39,9 @@ limitations under the License.
<c:set var="requestContext"
value="<%=request.getAttribute(RequestContext.REQUEST_PORTALENV)%>"/>
<c:set var="loginDestination" value="<%=LoginConstants.DESTINATION%>"/>
<c:set var="portalContextPath" value="${requestContext.request.contextPath}"/>
-<c:if test="${empty portalContextPath}">
- <c:set var="portalContextPath" value="/"/>
+<c:set var="portalContextPathInUrlTag" value="${portalContextPath}"/>
+<c:if test="${empty portalContextPathInUrlTag}">
+ <c:set var="portalContextPathInUrlTag" value="/"/>
</c:if>
<c:set var="encoder"
value="${requestContext.request.parameterMap.encoder[0]}"/>
<c:set var="destLogin" value="/login/proxy"/>
@@ -105,7 +106,7 @@ If it isn't, stop now and report to your
<td colspan="2"><input type="submit" class="portlet-form-button"
value="<fmt:message key="login.label.Login"/>"></td>
</tr>
</table>
- <input type='hidden' value='<c:url context="${portalContextPath}"
value="/"/>' name='redirect' id='redirect'/>
+ <input type='hidden' value='<c:url context="${portalContextPathInUrlTag}"
value="/"/>' name='redirect' id='redirect'/>
<input type='hidden' name='phase' id='phase' value='three'/>
</form>
<br/>
Modified:
portals/jetspeed-2/applications/j2-admin/trunk/src/main/webapp/WEB-INF/view/spaces/spaces-manager.jsp
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/trunk/src/main/webapp/WEB-INF/view/spaces/spaces-manager.jsp?rev=964997&r1=964996&r2=964997&view=diff
==============================================================================
---
portals/jetspeed-2/applications/j2-admin/trunk/src/main/webapp/WEB-INF/view/spaces/spaces-manager.jsp
(original)
+++
portals/jetspeed-2/applications/j2-admin/trunk/src/main/webapp/WEB-INF/view/spaces/spaces-manager.jsp
Sat Jul 17 02:27:36 2010
@@ -29,8 +29,9 @@ limitations under the License.
<fmt:setBundle
basename="org.apache.jetspeed.portlets.spaces.resources.SpacesResources" />
<c_rt:set var="requestContext"
value="<%=request.getAttribute(RequestContext.REQUEST_PORTALENV)%>"/>
<c:set var="portalContextPath" value="${requestContext.request.contextPath}"/>
-<c:if test="${empty portalContextPath}">
- <c:set var="portalContextPath" value="/"/>
+<c:set var="portalContextPathInUrlTag" value="${portalContextPath}"/>
+<c:if test="${empty portalContextPathInUrlTag}">
+ <c:set var="portalContextPathInUrlTag" value="/"/>
</c:if>
<c:set var="formDisplayble" value="false" />
@@ -90,7 +91,7 @@ limitations under the License.
<table>
<c:forEach var="theme" items="${themes}">
<tr>
- <td><img src='<c:url context="${portalContextPath}"
value="/decorations/layout/${theme.name}/${theme.image}"/>'></td>
+ <td><img src='<c:url
context="${portalContextPathInUrlTag}"
value="/decorations/layout/${theme.name}/${theme.image}"/>'></td>
<td style="vertical-align: middle"><input type="radio"
<c:if test="${theme.selected}"> checked </c:if> name="theme"
value="${theme.name}" /> ${theme.title}</td>
</tr>
</c:forEach>
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=964997&r1=964996&r2=964997&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
Sat Jul 17 02:27:36 2010
@@ -34,8 +34,9 @@ limitations under the License.
<c_rt:set var="requestContext"
value="<%=request.getAttribute(RequestContext.REQUEST_PORTALENV)%>"/>
<c:set var="portalContextPath" value="${requestContext.request.contextPath}"/>
-<c:if test="${empty portalContextPath}">
- <c:set var="portalContextPath" value="/"/>
+<c:set var="portalContextPathInUrlTag" value="${portalContextPath}"/>
+<c:if test="${empty portalContextPathInUrlTag}">
+ <c:set var="portalContextPathInUrlTag" value="/"/>
</c:if>
<c:set var="portalPagePath" value="${requestContext.portalURL.path}"/>
<c:if test="${empty portalPagePath}">
@@ -135,10 +136,10 @@ limitations under the License.
<tr>
<c:choose>
<c:when test="${editAccess}">
- <td><a href="<portlet:actionURL><portlet:param
name='layout' value='${layout.layoutPortlet}'/></portlet:actionURL>"><img
style="border-style: ${borderStyle}" src="<c:url context='${portalContextPath}'
value='/layouts/${layout.image}'/>"/></a></td>
+ <td><a href="<portlet:actionURL><portlet:param
name='layout' value='${layout.layoutPortlet}'/></portlet:actionURL>"><img
style="border-style: ${borderStyle}" src="<c:url
context='${portalContextPathInUrlTag}'
value='/layouts/${layout.image}'/>"/></a></td>
</c:when>
<c:otherwise>
- <td><img style="border-style: ${borderStyle}"
src="<c:url context='${portalContextPath}'
value='/layouts/${layout.image}'/>"/></td>
+ <td><img style="border-style: ${borderStyle}"
src="<c:url context='${portalContextPathInUrlTag}'
value='/layouts/${layout.image}'/>"/></td>
</c:otherwise>
</c:choose>
<td style="vertical-align: middle">${layout.title}</td>
@@ -164,10 +165,10 @@ limitations under the License.
<tr>
<c:choose>
<c:when test="${editAccess}">
- <td><a href="<portlet:actionURL><portlet:param
name='theme' value='${theme.name}'/></portlet:actionURL>"><img
style="border-style: ${borderStyle}" src="<c:url context='${portalContextPath}'
value='/decorations/layout/${theme.name}/${theme.image}'/>" /></a></td>
+ <td><a href="<portlet:actionURL><portlet:param
name='theme' value='${theme.name}'/></portlet:actionURL>"><img
style="border-style: ${borderStyle}" src="<c:url
context='${portalContextPathInUrlTag}'
value='/decorations/layout/${theme.name}/${theme.image}'/>" /></a></td>
</c:when>
<c:otherwise>
- <td><img style="border-style: ${borderStyle}"
src="<c:url context='${portalContextPath}'
value='/decorations/layout/${theme.name}/${theme.image}'/>"/></td>
+ <td><img style="border-style: ${borderStyle}"
src="<c:url context='${portalContextPathInUrlTag}'
value='/decorations/layout/${theme.name}/${theme.image}'/>"/></td>
</c:otherwise>
</c:choose>
<td style="vertical-align: middle">${theme.title}</td>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
