You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@continuum.apache.org by ba...@apache.org on 2015/05/12 22:36:30 UTC
svn commit: r1679052 -
/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/buildResult.jsp
Author: batkinson
Date: Tue May 12 20:36:29 2015
New Revision: 1679052
URL: http://svn.apache.org/r1679052
Log:
Migrated build result page from jstl to struts tags.
Modified:
continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/buildResult.jsp
Modified: continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/buildResult.jsp
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/buildResult.jsp?rev=1679052&r1=1679051&r2=1679052&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/buildResult.jsp (original)
+++ continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/buildResult.jsp Tue May 12 20:36:29 2015
@@ -19,7 +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'%>
<%@ taglib prefix="c1" uri="continuum" %>
<%@ taglib uri="http://plexus.codehaus.org/redback/taglib-1.0" prefix="redback" %>
@@ -154,12 +153,12 @@
<th><label class="label"><s:text name='buildResult.username'/>:</label></th>
<td><s:property value="buildResult.username"/></td>
</tr>
- <c:if test="${!empty buildResult.buildUrl}">
+ <s:if test="buildResult.buildUrl.length() > 0">
<tr class="b">
<th><label class="label"><s:text name='buildResult.buildUrl'/>:</label></th>
<td><s:property value="buildResult.buildUrl"/></td>
</tr>
- </c:if>
+ </s:if>
</table>
</div>
<div class="functnbar3">
@@ -202,9 +201,9 @@
<ec:column property="date" title="buildResult.scmResult.changes.date" cell="date"/>
<ec:column property="comment" title="buildResult.scmResult.changes.comment" cell="escapeHtml" />
<ec:column property="files" title="buildResult.scmResult.changes.files">
- <c:forEach var="scmFile" items="${pageScope.change.files}">
- <c:out value="${scmFile.name}"/><br />
- </c:forEach>
+ <s:iterator value="#attr.change.files">
+ <s:property value="name"/><br />
+ </s:iterator>
</ec:column>
</ec:row>
</ec:table>
@@ -229,9 +228,9 @@
<ec:column property="date" title="buildResult.changes.date" cell="date"/>
<ec:column property="comment" title="buildResult.changes.comment" />
<ec:column property="files" title="buildResult.changes.files">
- <c:forEach var="scmFile" items="${pageScope.change.files}">
- <c:out value="${scmFile.name}"/><br />
- </c:forEach>
+ <s:iterator value="#attr.change.files">
+ <s:property value="name"/><br />
+ </s:iterator>
</ec:column>
</ec:row>
</ec:table>