continuum-commits mailing list archives

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

URL: http://svn.apache.org/r1679069
Log:
Migrated edit build agent page from jstl to struts tags.

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

Modified: continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/editBuildAgent.jsp
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/editBuildAgent.jsp?rev=1679069&r1=1679068&r2=1679069&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/editBuildAgent.jsp
(original)
+++ continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/editBuildAgent.jsp
Tue May 12 20:37:35 2015
@@ -16,8 +16,7 @@
   ~ specific language governing permissions and limitations
   ~ under the License.
   --%>
-  
-<%@ taglib uri='http://java.sun.com/jsp/jstl/core' prefix='c'%>
+
 <%@ taglib uri="/struts-tags" prefix="s" %>
 <html>
   <s:i18n name="localization.Continuum">
@@ -28,28 +27,30 @@
     <div class="app">
       <div id="axial" class="h3">
         <h3><s:text name="buildAgent.section.title"/></h3>
+
+        <s:if test="hasActionErrors()">
+          <div class="errormessage">
+            <s:actionerror/>
+          </div>
+        </s:if>
+        <s:if test="hasActionMessages()">
+          <div class="warningmessage">
+            <s:actionmessage/>
+          </div>
+        </s:if>
         
         <div class="axial">
           <s:form action="saveBuildAgent" method="post" validate="true">
-            <c:if test="${!empty actionErrors}">
-              <div class="errormessage">
-                <s:iterator value="actionErrors">
-                  <p><s:property/></p>
-                </s:iterator>
-              </div>
-            </c:if>
             
             <table>
               <s:hidden name="type"/>
-              <c:choose>
-                <c:when test="${type=='new'}">
+                <s:if test="type == 'new'">
                   <s:textfield label="%{getText('buildAgent.url.label')}" name="buildAgent.url"
requiredLabel="true" size="100"/>
-                </c:when>
-                <c:otherwise>
+                </s:if>
+                <s:else>
                   <s:hidden name="buildAgent.url"/>
                   <s:textfield label="%{getText('buildAgent.url.label')}" name="buildAgent.url"
requiredLabel="true" disabled="true" size="100"/>
-                </c:otherwise>
-              </c:choose>
+                </s:else>
               <s:textfield label="%{getText('buildAgent.description.label')}" name="buildAgent.description"
size="100"/>
               <s:checkbox label="%{getText('buildAgent.enabled.label')}" name="buildAgent.enabled"
value="buildAgent.enabled" fieldValue="true"/>
             </table>



Mime
View raw message