continuum-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From batkin...@apache.org
Subject svn commit: r1679062 - /continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/releases.jsp
Date Tue, 12 May 2015 20:37:09 GMT
Author: batkinson
Date: Tue May 12 20:37:09 2015
New Revision: 1679062

URL: http://svn.apache.org/r1679062
Log:
Migrated distributed releases page from jstl to struts tags.

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

Modified: continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/releases.jsp
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/releases.jsp?rev=1679062&r1=1679061&r2=1679062&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/releases.jsp (original)
+++ continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/releases.jsp Tue May 12 20:37:09
2015
@@ -19,8 +19,6 @@
 
 <%@ taglib uri="/struts-tags" prefix="s" %>
 <%@ taglib uri="http://www.extremecomponents.org" prefix="ec" %>
-<%@ taglib uri='http://java.sun.com/jsp/jstl/core' prefix='c'%>
-
 <html>
   <s:i18n name="localization.Continuum">
     <head>
@@ -29,13 +27,16 @@
     <body>
       <div id="h3">
         <h3><s:text name="releases.section.title"/></h3>
-        <c:if test="${!empty actionErrors}">
+        <s:if test="hasActionErrors()">
           <div class="errormessage">
-            <s:iterator value="actionErrors">
-              <p><s:text name="<s:property/>" /></p>
-            </s:iterator>
+            <s:actionerror/>
+          </div>
+        </s:if>
+        <s:if test="hasActionMessages()">
+          <div class="warningmessage">
+            <s:actionmessage/>
           </div>
-        </c:if>
+        </s:if>
         <s:set name="releasesSummary" value="releasesSummary" scope="request"/>
         <ec:table items="releasesSummary"
                   var="releaseSummary"
@@ -48,11 +49,11 @@
           <ec:row>
             <ec:column property="releaseId" title="releaseSummary.table.releaseId">
               <s:url id="viewReleaseUrl" action="releaseInProgress">
-                <s:param name="releaseId"><c:out value="${pageScope.releaseSummary.releaseId}"/></s:param>
-                <s:param name="projectId"><c:out value="${pageScope.releaseSummary.projectId}"/></s:param>
-                <s:param name="releaseGoal"><c:out value="${pageScope.releaseSummary.releaseGoal}"/></s:param>
+                <s:param name="releaseId" value="#attr.releaseSummary.releaseId"/>
+                <s:param name="projectId" value="#attr.releaseSummary.projectId"/>
+                <s:param name="releaseGoal" value="#attr.releaseSummary.releaseGoal"/>
               </s:url>
-              <s:a href="%{viewReleaseUrl}"><c:out value="${pageScope.releaseSummary.releaseId}"/></s:a>
+              <s:a href="%{viewReleaseUrl}"><s:property value="#attr.releaseSummary.releaseId"/></s:a>
             </ec:column>
             <ec:column property="releaseGoal" title="releaseSummary.table.releaseGoal"/>
             <ec:column property="buildAgentUrl" title="releaseSummary.table.buildAgentUrl"/>



Mime
View raw message