continuum-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From batkin...@apache.org
Subject svn commit: r1669268 - /continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/parallelbuilds.jsp
Date Thu, 26 Mar 2015 03:12:31 GMT
Author: batkinson
Date: Thu Mar 26 03:12:31 2015
New Revision: 1669268

URL: http://svn.apache.org/r1669268
Log:
Unified tag usage by using struts rather than JSTL standard tags.

Modified:
    continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/parallelbuilds.jsp

Modified: continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/parallelbuilds.jsp
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/parallelbuilds.jsp?rev=1669268&r1=1669267&r2=1669268&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/parallelbuilds.jsp
(original)
+++ continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/parallelbuilds.jsp
Thu Mar 26 03:12:31 2015
@@ -17,7 +17,6 @@
   ~ under the License.
   --%>
 
-<%@ taglib uri='http://java.sun.com/jsp/jstl/core' prefix='c'%>
 <%@ taglib uri="/struts-tags" prefix="s" %>
 <%@ taglib uri="http://www.extremecomponents.org" prefix="ec" %>
 <%@ taglib uri="http://plexus.codehaus.org/redback/taglib-1.0" prefix="redback" %>
@@ -33,7 +32,7 @@
         <s:text name="parallel.build.queues.section.title"/>
       </h3>
       
-      <c:if test="${not empty buildQueueList}">
+      <s:if test="buildQueueList.size() > 0">
       <ec:table items="buildQueueList"
               var="buildQueue"
               autoIncludeParameters="false"
@@ -46,26 +45,26 @@
         <ec:column property="name" title="Name" style="white-space: nowrap" />
            
         <ec:column property="id" title="&nbsp;" width="1%">
-          <c:if test="${buildQueue.id != 1}">
+          <s:if test="#attr['buildQueue'].id != 1">
             <s:set var="tname" value="'delToken' + #attr['buildQueue'].id" scope="page"/>
             <s:token name="%{#attr['tname']}"/>
             <s:url id="deleteBuildQueueUrl" action="deleteBuildQueue">
-              <s:param name="buildQueue.id"><c:out value="${pageScope.buildQueue.id}"/></s:param>
-              <s:param name="buildQueue.name"><c:out value="${pageScope.buildQueue.name}"/></s:param>
+              <s:param name="buildQueue.id" value="#attr['buildQueue'].id"/>
+              <s:param name="buildQueue.name" value="#attr['buildQueue'].name"/>
               <s:param name="struts.token.name" value="#attr['tname']"/>
               <s:param name="%{#attr['tname']}" value="#session['struts.tokens.' + #attr['tname']]"/>
             </s:url>          
             <s:a href="%{deleteBuildQueueUrl}">
               <img src="<s:url value='/images/delete.gif' includeParams="none"/>"
alt="<s:text name='delete'/>" title="<s:text name='delete'/>" border="0" />
             </s:a>
-          </c:if>
-          <c:if test="${buildQueue.id == 1}">
+          </s:if>
+          <s:if test="#attr['buildQueue'].id == 1">
               <img src="<s:url value='/images/delete_disabled.gif' includeParams="none"/>"
alt="<s:text name='delete'/>" title="<s:text name='delete'/>" border="0" />
-          </c:if>
+          </s:if>
         </ec:column>             
         </ec:row>
         </ec:table>
-      </c:if>
+      </s:if>
       
        <div class="functnbar3">
         <s:form action="addBuildQueue" method="post">



Mime
View raw message