continuum-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From eveni...@apache.org
Subject svn commit: r366172 - in /maven/continuum/trunk/continuum-webapp/src/main: resources/template/default/ webapp/
Date Thu, 05 Jan 2006 12:36:40 GMT
Author: evenisse
Date: Thu Jan  5 04:36:29 2006
New Revision: 366172

URL: http://svn.apache.org/viewcvs?rev=366172&view=rev
Log:
o replace all <div class="functnbar3"> in jsp by webwork template
o Define size of textfield in webwork template

Modified:
    maven/continuum/trunk/continuum-webapp/src/main/resources/template/default/checkbox.vm
    maven/continuum/trunk/continuum-webapp/src/main/resources/template/default/controlheader.vm
    maven/continuum/trunk/continuum-webapp/src/main/resources/template/default/form.vm
    maven/continuum/trunk/continuum-webapp/src/main/resources/template/default/password.vm
    maven/continuum/trunk/continuum-webapp/src/main/resources/template/default/submit.vm
    maven/continuum/trunk/continuum-webapp/src/main/resources/template/default/submit_cancel.vm
    maven/continuum/trunk/continuum-webapp/src/main/resources/template/default/text.vm
    maven/continuum/trunk/continuum-webapp/src/main/webapp/configuration.jsp
    maven/continuum/trunk/continuum-webapp/src/main/webapp/projectView.jsp
    maven/continuum/trunk/continuum-webapp/src/main/webapp/summary.jsp

Modified: maven/continuum/trunk/continuum-webapp/src/main/resources/template/default/checkbox.vm
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-webapp/src/main/resources/template/default/checkbox.vm?rev=366172&r1=366171&r2=366172&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/resources/template/default/checkbox.vm
(original)
+++ maven/continuum/trunk/continuum-webapp/src/main/resources/template/default/checkbox.vm
Thu Jan  5 04:36:29 2006
@@ -1,19 +1 @@
-#if( $fieldErrors.get($parameters.name) )
-  #set ($hasFieldErrors = $fieldErrors.get($parameters.name))
-  #foreach ($error in $fieldErrors.get($parameters.name))
-    <tr>
-        <td align="left" valign="top" colspan="2"><span class="errorMessage">$!error</span></td>
-    </tr>
-  #end
-#end
-
-<tr>
-    <td valign="top" colspan="2">
-#* Use an extra table so that the checkbox doesn't align with the other columns. *#
-<table width="100%" border="0" cellpadding="0" cellspacing="0">
-    <tr>
-        <td valign="middle">#parse("/template/simple/checkbox.vm")</td>
-        <td width="100%" valign="middle"><label #if ($parameters.id) for="$!webwork.htmlEncode($parameters.id)"#end#if
($hasFieldErrors) class="checkboxErrorLabel"#else class="checkboxLabel"#end>$!webwork.htmlEncode($parameters.label)</label></td>
-    </tr>
-</table>
-#parse("/template/default/controlfooter.vm")
+#parse("/template/default/controlheader.vm")#parse("/template/simple/checkbox.vm")#parse("/template/default/controlfooter.vm")

Modified: maven/continuum/trunk/continuum-webapp/src/main/resources/template/default/controlheader.vm
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-webapp/src/main/resources/template/default/controlheader.vm?rev=366172&r1=366171&r2=366172&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/resources/template/default/controlheader.vm
(original)
+++ maven/continuum/trunk/continuum-webapp/src/main/resources/template/default/controlheader.vm
Thu Jan  5 04:36:29 2006
@@ -8,20 +8,6 @@
     </tr>
   #end
 #end
-## if the label position is top,
-## then give the label it's own row in the table
-<tr>
-#if ($parameters.labelposition && $parameters.labelposition == 'top')<td align="left"
valign="top" colspan="2">#else<td align="right" valign="top">#end#if ($parameters.label)<label
#if ($parameters.id) for="$!webwork.htmlEncode($parameters.id)"#end#if ($hasFieldErrors) class="errorLabel"#else
class="label"#end>#if ($parameters.required)<span class="required">*</span>#end$!webwork.htmlEncode($parameters.label):</label>#end</td>
-## add the extra row
-#if ($parameters.labelposition && $parameters.labelposition == 'top')
-</tr>
-<tr>
-#end
-#if ($parameters.form.validate && $parameters.form.validate == true)
-    #if ($parameters.onblur)
-        #set ($parameters.onblur = "validate(this);${parameters.onblur}")
-    #else
-        #set ($parameters.onblur = "validate(this)")
-    #end
-#end
+  <tr class="b">
+    <th>$!webwork.htmlEncode($parameters.label)</th>
     <td>

Modified: maven/continuum/trunk/continuum-webapp/src/main/resources/template/default/form.vm
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-webapp/src/main/resources/template/default/form.vm?rev=366172&r1=366171&r2=366172&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/resources/template/default/form.vm (original)
+++ maven/continuum/trunk/continuum-webapp/src/main/resources/template/default/form.vm Thu
Jan  5 04:36:29 2006
@@ -1,2 +1,2 @@
 #parse("/template/simple/form.vm")
-<table class="wwFormTable">
+<table border="1" cellspacing="2" cellpadding="3" width="100%">

Modified: maven/continuum/trunk/continuum-webapp/src/main/resources/template/default/password.vm
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-webapp/src/main/resources/template/default/password.vm?rev=366172&r1=366171&r2=366172&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/resources/template/default/password.vm
(original)
+++ maven/continuum/trunk/continuum-webapp/src/main/resources/template/default/password.vm
Thu Jan  5 04:36:29 2006
@@ -1 +1,2 @@
+#if (!$parameters.size) #set ($parameters.size = '100') #end
 #parse("/template/default/controlheader.vm")#parse("/template/simple/password.vm")#parse("/template/default/controlfooter.vm")

Modified: maven/continuum/trunk/continuum-webapp/src/main/resources/template/default/submit.vm
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-webapp/src/main/resources/template/default/submit.vm?rev=366172&r1=366171&r2=366172&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/resources/template/default/submit.vm (original)
+++ maven/continuum/trunk/continuum-webapp/src/main/resources/template/default/submit.vm Thu
Jan  5 04:36:29 2006
@@ -1,4 +1,6 @@
 </table>
 <div class="functnbar3">
+$!{parameters.before}
 #parse("/template/simple/submit.vm")
+$!{parameters.after}
 </div>

Modified: maven/continuum/trunk/continuum-webapp/src/main/resources/template/default/submit_cancel.vm
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-webapp/src/main/resources/template/default/submit_cancel.vm?rev=366172&r1=366171&r2=366172&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/resources/template/default/submit_cancel.vm
(original)
+++ maven/continuum/trunk/continuum-webapp/src/main/resources/template/default/submit_cancel.vm
Thu Jan  5 04:36:29 2006
@@ -1,5 +1,7 @@
 </table>
 <div class="functnbar3">
+$!{parameters.before}
 #parse("/template/simple/submit.vm")
 #if ($parameters.cancel) &nbsp;<input type="button" name="Cancel" value="$parameters.cancel"
onClick="history.back()"/> #end
+$!{parameters.after}
 </div>

Modified: maven/continuum/trunk/continuum-webapp/src/main/resources/template/default/text.vm
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-webapp/src/main/resources/template/default/text.vm?rev=366172&r1=366171&r2=366172&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/resources/template/default/text.vm (original)
+++ maven/continuum/trunk/continuum-webapp/src/main/resources/template/default/text.vm Thu
Jan  5 04:36:29 2006
@@ -1 +1,2 @@
+#if (!$parameters.size) #set ($parameters.size = '100') #end
 #parse("/template/default/controlheader.vm")#parse("/template/simple/text.vm")#parse("/template/default/controlfooter.vm")

Modified: maven/continuum/trunk/continuum-webapp/src/main/webapp/configuration.jsp
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-webapp/src/main/webapp/configuration.jsp?rev=366172&r1=366171&r2=366172&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/webapp/configuration.jsp (original)
+++ maven/continuum/trunk/continuum-webapp/src/main/webapp/configuration.jsp Thu Jan  5 04:36:29
2006
@@ -46,11 +46,9 @@
               <td><ww:property value="companyUrl"/></td>
             </tr>
           </table>
-          <div class="functnbar3">
-            <form action="configuration!edit.action" method="post">
-                <ww:submit value="%{getText('edit')}" theme="simple"/>
-            </form>
-          </div>
+          <ww:form action="configuration!edit.action" method="post">
+              <ww:submit value="%{getText('edit')}"/>
+          </ww:form>
         </div>
       </div>
     </body>

Modified: maven/continuum/trunk/continuum-webapp/src/main/webapp/projectView.jsp
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-webapp/src/main/webapp/projectView.jsp?rev=366172&r1=366171&r2=366172&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/webapp/projectView.jsp (original)
+++ maven/continuum/trunk/continuum-webapp/src/main/webapp/projectView.jsp Thu Jan  5 04:36:29
2006
@@ -37,12 +37,10 @@
               <td><ww:property value="project.projectGroup.name"/></td>
             </tr>
           </table>
-          <div class="functnbar3">
-            <form action="projectEdit!edit.action" method="post">
-                <input type="hidden" name="projectId" value="<ww:property value="project.id"/>"/>
-                <ww:submit value="%{getText('edit')}" theme="simple"/>
-            </form>
-          </div>
+          <ww:form action="projectEdit!edit.action" method="post">
+              <input type="hidden" name="projectId" value="<ww:property value="project.id"/>"/>
+              <ww:submit value="%{getText('edit')}"/>
+          </ww:form>
         </div>
 
         <h3><ww:text name="projectView.buildDefinitions"/></h3>
@@ -72,12 +70,10 @@
             </ec:column>
           </ec:row>
         </ec:table>
-        <div class="functnbar3">
-          <form method="post" action="addBuildDefinition.action">
-              <input type="hidden" name="projectId" value="<ww:property value="project.id"/>"/>
-              <ww:submit value="%{getText('add')}" theme="simple"/>
-          </form>
-        </div>
+        <ww:form action="addBuildDefinition.action" method="post">
+            <input type="hidden" name="projectId" value="<ww:property value="project.id"/>"/>
+            <ww:submit value="%{getText('add')}"/>
+        </ww:form>
 
         <h3><ww:text name="projectView.notifiers"/></h3>
         <ww:set name="notifiers" value="project.notifiers" scope="request"/>
@@ -102,12 +98,10 @@
             </ec:column>
           </ec:row>
         </ec:table>
-        <div class="functnbar3">
-          <form method="post" action="addNotifier!default.action">
-              <input type="hidden" name="projectId" value="<ww:property value="project.id"/>"/>
-              <ww:submit value="%{getText('add')}" theme="simple"/>
-          </form>
-        </div>
+        <ww:form action="addNotifier!default.action" method="post">
+            <input type="hidden" name="projectId" value="<ww:property value="project.id"/>"/>
+            <ww:submit value="%{getText('add')}"/>
+        </ww:form>
 
         <h3><ww:text name="projectView.dependencies"/></h3>
         <ww:set name="dependencies" value="project.dependencies" scope="request"/>

Modified: maven/continuum/trunk/continuum-webapp/src/main/webapp/summary.jsp
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-webapp/src/main/webapp/summary.jsp?rev=366172&r1=366171&r2=366172&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/webapp/summary.jsp (original)
+++ maven/continuum/trunk/continuum-webapp/src/main/webapp/summary.jsp Thu Jan  5 04:36:29
2006
@@ -35,14 +35,15 @@
             </ec:column>
           </ec:row>
         </ec:table>
-        <div class="functnbar3">
-          <form method="post" action="buildProject.action">
-              <img src="<ww:url value="/images/icon_success_sml.gif"/>" alt="<ww:text
name="message.success"/>" title="<ww:text name="message.success"/>"/> <ww:property
value="nbSuccesses"/>
-              <img src="<ww:url value="/images/icon_warning_sml.gif"/>" alt="<ww:text
name="message.failed"/>" title="<ww:text name="message.failed"/>"/> <ww:property
value="nbFailures"/>
-              <img src="<ww:url value="/images/icon_error_sml.gif"/>" alt="<ww:text
name="message.error"/>" title="<ww:text name="message.error"/>"/> <ww:property
value="nbErrors"/>
-              <ww:submit value="%{getText('summary.buildAll')}" theme="simple"/>
-          </form>
-        </div>
+        <ww:form action="buildProject.action" method="post">
+            <ww:submit value="%{getText('summary.buildAll')}">
+                <ww:param name="before">
+                  <img src="<ww:url value="/images/icon_success_sml.gif"/>" alt="<ww:text
name="message.success"/>" title="<ww:text name="message.success"/>"/> <ww:property
value="nbSuccesses"/>
+                  <img src="<ww:url value="/images/icon_warning_sml.gif"/>" alt="<ww:text
name="message.failed"/>" title="<ww:text name="message.failed"/>"/> <ww:property
value="nbFailures"/>
+                  <img src="<ww:url value="/images/icon_error_sml.gif"/>" alt="<ww:text
name="message.error"/>" title="<ww:text name="message.error"/>"/> <ww:property
value="nbErrors"/>
+                </ww:param>
+            </ww:submit>
+        </ww:form>
       </div>
     </body>
   </ww:i18n>



Mime
View raw message