portals-jetspeed-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From woon...@apache.org
Subject svn commit: r907709 - in /portals/jetspeed-2/applications/j2-admin/trunk/src/main/webapp/WEB-INF/view: spaces/spaces-manager.jsp toolbox/toolbox.jsp
Date Mon, 08 Feb 2010 16:01:17 GMT
Author: woonsan
Date: Mon Feb  8 16:01:17 2010
New Revision: 907709

URL: http://svn.apache.org/viewvc?rev=907709&view=rev
Log:
JS2-1057: clean ups in space navigator view page.

Modified:
    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/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=907709&r1=907708&r2=907709&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
Mon Feb  8 16:01:17 2010
@@ -33,28 +33,22 @@
   <c:set var="portalContextPath" value="/"/>
 </c:if>
 
-<%
-	SpaceBean space = ((SpaceBean)renderRequest.getAttribute("space"));
-	String readonly = (space.isPersisted()) ? "readonly" : "";
-	String persisted = (space.isPersisted()) ? "true" : "false";
-%>
-
 <form id='jsSpacesManagement' method="POST" action='<portlet:actionURL/>'>
-<input type='hidden' name='spacePersisted' value='<%=persisted%>'/>
+<input type='hidden' name='spacePersisted' value='${space.persisted}'/>
 <table width="100%">
 	<tr>
 	<td>
 	<table>
     <tr>
 	<td class="portlet-section-subheader"><fmt:message key="spaces.label.name"/></td>
-	<td class="portlet-section-subheader"><input type="text" <%=readonly%> name="spaceName"
size="30" value="${space.name}" /></td>
-	</tr>
-<% if (space.isPersisted()) { %>
-    <tr>
-	<td class="portlet-section-subheader"><fmt:message key="spaces.label.owner"/></td>
-	<td class="portlet-section-subheader"><input type="text" readonly name="spaceOwner"
size="30" value="${space.owner}" /></td>
+	<td class="portlet-section-subheader"><input type="text" <c:if test="${space.persisted}">readonly</c:if>
name="spaceName" size="30" value="${space.name}" /></td>
 	</tr>
-<% } %>
+    <c:if test="${space.persisted}">
+      <tr>
+	    <td class="portlet-section-subheader"><fmt:message key="spaces.label.owner"/></td>
+	    <td class="portlet-section-subheader"><input type="text" readonly name="spaceOwner"
size="30" value="${space.owner}" /></td>
+	  </tr>
+    </c:if>
     <tr>
 	<td class="portlet-section-subheader"><fmt:message key="spaces.label.title"/></td>
 	<td class="portlet-section-subheader"><input type="text" name="spaceTitle" size="30"
value="${space.title}" /></td>
@@ -66,12 +60,12 @@
 	<tr>
 	<td class="portlet-section-subheader"><fmt:message key="spaces.label.security"/></td>
 	<td class="portlet-section-subheader">
-          <select name="securityConstraintRef">
-   <c:forEach items="${constraints}" var="constraint">
+      <select name="securityConstraintRef">
+        <c:forEach items="${constraints}" var="constraint">
           <option value="${constraint}" <c:if test="${space.securityConstraint == constraint}">
selected </c:if>>${constraint}</option>
-	</c:forEach>                 
-          </select>
-		</td>
+        </c:forEach>                 
+      </select>
+    </td>
 	</tr>
     <tr>
 	<td class="portlet-section-subheader"><fmt:message key="spaces.label.theme"/></td>
@@ -94,11 +88,14 @@
 	</tr>
 	<tr>
       <td colspan='2' style="text-align: center" class="portlet-section-subheader">
-        <% if (space.isPersisted()) { %>
-          <input type="submit" value="<fmt:message key='spaces.label.update'/>"
/>
-        <% } else { %>
-          <input type="submit" value="<fmt:message key='spaces.label.add'/>" />
-        <% } %>
+        <c:choose>
+          <c:when test="${space.persisted}">
+            <input type="submit" value="<fmt:message key='spaces.label.update'/>"
/>
+          </c:when>
+          <c:otherwise>
+            <input type="submit" value="<fmt:message key='spaces.label.add'/>" />
+          </c:otherwise>
+        </c:choose>
       </td>
 	</tr>
 	<tr>
@@ -106,4 +103,3 @@
 	</tr>
 </table>
 </form>
-    

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=907709&r1=907708&r2=907709&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
Mon Feb  8 16:01:17 2010
@@ -34,6 +34,9 @@
 
 <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:if>
 <c:set var="portalPagePath" value="${requestContext.portalURL.path}"/>
 <c:if test="${empty portalPagePath}">
   <c:set var="portalPagePath" value="/"/>



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