continuum-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From eveni...@apache.org
Subject svn commit: r366460 - in /maven/continuum/trunk/continuum-webapp/src/main: java/org/apache/maven/continuum/web/action/ resources/ resources/localization/ webapp/
Date Fri, 06 Jan 2006 09:47:45 GMT
Author: evenisse
Date: Fri Jan  6 01:47:36 2006
New Revision: 366460

URL: http://svn.apache.org/viewcvs?rev=366460&view=rev
Log:
Remove html code in jsp and use webwork tags instead

Removed:
    maven/continuum/trunk/continuum-webapp/src/main/webapp/addSchedule.jsp
Modified:
    maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/AddScheduleAction.java
    maven/continuum/trunk/continuum-webapp/src/main/resources/localization/Continuum.properties
    maven/continuum/trunk/continuum-webapp/src/main/resources/xwork.xml
    maven/continuum/trunk/continuum-webapp/src/main/webapp/editSchedule.jsp
    maven/continuum/trunk/continuum-webapp/src/main/webapp/schedules.jsp

Modified: maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/AddScheduleAction.java
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/AddScheduleAction.java?rev=366460&r1=366459&r2=366460&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/AddScheduleAction.java
(original)
+++ maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/AddScheduleAction.java
Fri Jan  6 01:47:36 2006
@@ -32,11 +32,11 @@
 
     private int scheduleId;
 
-    private boolean active;
+    private boolean active = true;
 
     private String cronExpression;
 
-    private int delay;
+    private int delay = 0;
 
     private String description;
 
@@ -68,6 +68,11 @@
         return INPUT;
     }
 
+    public boolean getActive()
+    {
+        return active;
+    }
+
     public void setActive( boolean active )
     {
         this.active = active;
@@ -81,6 +86,11 @@
     public void setCronExpression( String cronExpression )
     {
         this.cronExpression = cronExpression;
+    }
+
+    public int getDelay()
+    {
+        return delay;
     }
 
     public void setDelay( int delay )

Modified: maven/continuum/trunk/continuum-webapp/src/main/resources/localization/Continuum.properties
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-webapp/src/main/resources/localization/Continuum.properties?rev=366460&r1=366459&r2=366460&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/resources/localization/Continuum.properties
(original)
+++ maven/continuum/trunk/continuum-webapp/src/main/resources/localization/Continuum.properties
Fri Jan  6 01:47:36 2006
@@ -305,7 +305,7 @@
 schedule.description.message=Enter a description of the schedule
 schedule.cronExpression.label=Cron Expression
 schedule.cronExpression.message=Enter the cron expression. Format is described there : <a
href="http://www.opensymphony.com/quartz/api/org/quartz/CronTrigger.html" target="_blank">Syntax<a>
-schedule.quietPeriod.labelQuiet=Period (seconds)
+schedule.quietPeriod.label=Period (seconds)
 schedule.quietPeriod.message=Enter a quiet period period for this schedule
 schedule.enabled.label=Enabled
 schedule.enabled.message=Enable/Disable the schedule

Modified: maven/continuum/trunk/continuum-webapp/src/main/resources/xwork.xml
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-webapp/src/main/resources/xwork.xml?rev=366460&r1=366459&r2=366460&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/resources/xwork.xml (original)
+++ maven/continuum/trunk/continuum-webapp/src/main/resources/xwork.xml Fri Jan  6 01:47:36
2006
@@ -208,7 +208,7 @@
 
         <action name="addSchedule"
                 class="addSchedule">
-            <result name="input">addSchedule.jsp</result>
+            <result name="input">editSchedule.jsp</result>
             <result name="success" type="chain">schedules</result>
         </action>
 

Modified: maven/continuum/trunk/continuum-webapp/src/main/webapp/editSchedule.jsp
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-webapp/src/main/webapp/editSchedule.jsp?rev=366460&r1=366459&r2=366460&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/webapp/editSchedule.jsp (original)
+++ maven/continuum/trunk/continuum-webapp/src/main/webapp/editSchedule.jsp Fri Jan  6 01:47:36
2006
@@ -8,62 +8,28 @@
 <div class="app">
   <div id="axial" class="h3">
     <h3><ww:text name="editSchedule.page.title"/></h3>
-    <form method="post" action="editSchedule.action">
-      <input type="hidden" name="id" value="<ww:property value="id"/>"/>
-      <div class="axial">
-        <table border="1" cellspacing="2" cellpadding="3" width="100%">
-          <tr>
-            <th><ww:text name="schedule.name.label"/></th>
-            <td >
-            <input type="text" name="name" value="<ww:property value="name"/>" size="100"/>
-            <p>
-            <ww:text name="schedule.name.message"/>
-            </p>
-            </td>
-          </tr>
-          <tr>
-            <th><ww:text name="schedule.description.label"/></th>
-            <td >
-            <input type="text" name="description" value="<ww:property value="description"/>"
size="100"/>
-            <p>
-            <ww:text name="schedule.description.message"/>
-            </p>
-            </td>
-          </tr>
-          <tr>
-            <th><ww:text name="schedule.cronExpression.label"/></th>
-            <td >
-            <input type="text" name="cronExpression" value="<ww:property value="cronExpression"/>"
size="100"/>
-            <p>
-            <ww:text name="schedule.cronExpression.message"/>
-            </p>
-            </td>
-          </tr>
-          <tr>
-            <th><ww:text name="schedule.delay.label"/></th>
-            <td >
-            <input type="text" name="delay" value="<ww:property value="delay"/>"
size="100"/>
-            <p>
-            <ww:text name="schedule.delay.message"/>
-            </p>
-            </td>
-          </tr>
-          <tr>
-            <th><ww:text name="schedule.enabled.label"/></th>
-            <td >
-            <input type="checkbox" name="active" value="true" <ww:if test="active">checked</ww:if>
/>
-            <p>
-            <ww:text name="schedule.enabled.message"/>
-            </p>
-            </td>
-          </tr>
-        </table>
-        <div class="functnbar3">
-          <input type="submit" value="Submit"/>
-          <input type="button" value="Cancel" onClick="history.back()"/>
-        </div>
-      </div>
-    </form>
+
+    <div class="axial">
+      <ww:form action="editSchedule.action" method="post">
+        <input type="hidden" name="id" value="<ww:property value="id"/>"/>
+        <ww:textfield label="%{getText('schedule.name.label')}" name="name" required="true">
+            <ww:param name="desc"><p><ww:text name="schedule.name.message"/></p></ww:param>
+        </ww:textfield>
+        <ww:textfield label="%{getText('schedule.description.label')}" name="description"
required="true">
+            <ww:param name="desc"><p><ww:text name="schedule.description.message"/></p></ww:param>
+        </ww:textfield>
+        <ww:textfield label="%{getText('schedule.cronExpression.label')}" name="cronExpression"
required="true">
+            <ww:param name="desc"><p><ww:text name="schedule.cronExpression.message"/></p></ww:param>
+        </ww:textfield>
+        <ww:textfield label="%{getText('schedule.quietPeriod.label')}" name="delay">
+            <ww:param name="desc"><p><ww:text name="schedule.quietPeriod.message"/></p></ww:param>
+        </ww:textfield>
+        <ww:checkbox label="%{getText('schedule.enabled.label')}" name="active" value="active"
fieldValue="true">
+            <ww:param name="desc"><p><ww:text name="schedule.enabled.message"/></p></ww:param>
+        </ww:checkbox>
+        <c1:submitcancel value="%{getText('save')}" cancel="%{getText('cancel')}"/>
+      </ww:form>
+    </div>
   </div>
 </div>
 

Modified: maven/continuum/trunk/continuum-webapp/src/main/webapp/schedules.jsp
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-webapp/src/main/webapp/schedules.jsp?rev=366460&r1=366459&r2=366460&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/webapp/schedules.jsp (original)
+++ maven/continuum/trunk/continuum-webapp/src/main/webapp/schedules.jsp Fri Jan  6 01:47:36
2006
@@ -26,15 +26,9 @@
           </ec:row>
         </ec:table>
       </div>
-      <table>
-        <tr>
-          <td>
-            <form method="post" action="addSchedule!default.action">
-              <input type="submit" name="add-build-def" value="Add"/>
-            </form>
-          </td>
-        </tr>
-      </table>
+      <ww:form action="addSchedule!default.action" method="post">
+          <ww:submit value="%{getText('add')}"/>
+      </ww:form>
     </body>
   </ww:i18n>
 </html>



Mime
View raw message