portals-jetspeed-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From woon...@apache.org
Subject svn commit: r929047 - /portals/jetspeed-2/applications/j2-admin/trunk/src/main/webapp/WEB-INF/view/toolbox/toolbox.jsp
Date Tue, 30 Mar 2010 09:08:01 GMT
Author: woonsan
Date: Tue Mar 30 09:08:01 2010
New Revision: 929047

URL: http://svn.apache.org/viewvc?rev=929047&view=rev
Log:
JS2-1166: Fixing the problem: theme/layout selection box is not displayed with border.

Modified:
    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/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=929047&r1=929046&r2=929047&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
Tue Mar 30 09:08:01 2010
@@ -124,22 +124,21 @@ limitations under the License.
 	        <th class="portlet-section-header" colspan="2"></th>
 	    </tr>    
 	    <c:forEach var="layout" items="${layouts}"> 
+        <c:choose>
+            <c:when test="${layout.selected}">
+                <c:set var="borderStyle" value="solid"/>
+            </c:when>
+            <c:otherwise>
+                <c:set var="borderStyle" value="none"/>
+            </c:otherwise>
+        </c:choose>
 	    <tr>        
 	        <c:choose>
 	            <c:when test="${editAccess}">
-	                <td><a href='<portlet:actionURL><portlet:param name='layout'
value="${layout.layoutPortlet}"/></portlet:actionURL>'><img <c:if test="${!layout.selected}">
style='border-style: none' </c:if> 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='${portalContextPath}' value='/layouts/${layout.image}'/>"/></a></td>
 	            </c:when>
 	            <c:otherwise>
-	                <td>
-	                    <c:choose>
-	                        <c:when test="${layout.selected}">
-	                            <img style='border-style: solid' src='<c:url context="${portalContextPath}"
value="/layouts/${layout.image}"/>'>
-	                        </c:when>
-	                        <c:otherwise>
-	                            <img src='<c:url context="${portalContextPath}" value="/layouts/${layout.image}"/>'>
-	                        </c:otherwise>
-	                    </c:choose>
-	                </td>
+	                <td><img style="border-style: ${borderStyle}" src="<c:url context='${portalContextPath}'
value='/layouts/${layout.image}'/>"/></td>
 	            </c:otherwise>
 	        </c:choose>
 	        <td style="vertical-align: middle">${layout.title}</td>
@@ -153,14 +152,22 @@ limitations under the License.
 	    <tr>
 	        <th class="portlet-section-header" colspan="2"></th>
 	    </tr>    
-	    <c:forEach var="theme" items="${themes}">   
-	    <tr>        
+	    <c:forEach var="theme" items="${themes}">
+	    <c:choose>
+	        <c:when test="${theme.selected}">
+	            <c:set var="borderStyle" value="solid"/>
+	        </c:when>
+	        <c:otherwise>
+                <c:set var="borderStyle" value="none"/>
+	        </c:otherwise>
+	    </c:choose>
+	    <tr>
 	        <c:choose>
 	            <c:when test="${editAccess}">
-	                <td><a href='<portlet:actionURL><portlet:param name='theme'
value="${theme.name}"/></portlet:actionURL>'><img <c:if test="${!theme.selected}">
style='border-style: none' </c:if> 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='${portalContextPath}' value='/decorations/layout/${theme.name}/${theme.image}'/>"
/></a></td>
 	            </c:when>
 	            <c:otherwise>
-	                <td><img <c:if test="${theme.selected}"> style='border-style:
solid' </c:if> src='<c:url context="${portalContextPath}" value="/decorations/layout/${theme.name}/${theme.image}"/>'></td>
+	                <td><img style="border-style: ${borderStyle}" src="<c:url context='${portalContextPath}'
value='/decorations/layout/${theme.name}/${theme.image}'/>"/></td>
 	            </c:otherwise>
 	        </c:choose>
 	        <td style="vertical-align: middle">${theme.title}</td>



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