Commits

Anonymous committed 4b4dc2e

template cleanup -- primarily for spacing in and around key elements, such as
form widgets, labels, spans, and tabel cells. This will remove random spaces (" ")
that show up in the output

git-svn-id: http://svn.opensymphony.com/svn/webwork/trunk@494573baa09-0c28-0410-bef9-dab3c582ae83

Comments (0)

Files changed (42)

src/java/template/simple/checkbox.vm

-#*
-  -- checkbox.vm
-  --
-  -- Required Parameters:
-  --   * label       - The description that will be used to identfy the control
-  --   * name        - The name of the attribute to put and pull the result from
-  --                   Equates to the NAME parameter of the HTML INPUT tag
-  --   * fieldValue  - The value displayed by the control.  Equates to the value
-  --                   of the HTML INPUT tag
-  --
-  -- Optional Parameters:
-  --   * disabled        - DISABLED parameter of the HTML INPUT tag
-  --   * tabindex        - tabindex parameter of the HTML INPUT tag
-  --   * onchange        - onkeyup parameter of the HTML INPUT tag
-*#
 <input type="checkbox" name="$!webwork.htmlEncode($parameters.name)" value="$!webwork.htmlEncode($parameters.fieldValue)"
 #if ($parameters.nameValue)        checked="true"                                           #end
 #if ($parameters.disabled == true) disabled="disabled"                                      #end
 #if ($parameters.id)               id="$!webwork.htmlEncode($parameters.id)"                #end
 #if ($parameters.cssClass)         class="$!webwork.htmlEncode($parameters.cssClass)"       #end
 #if ($parameters.cssStyle)         style="$!webwork.htmlEncode($parameters.cssStyle)"       #end
-/>
+/>

src/java/template/simple/combobox.vm

-#*
-  -- combobox.vm
-  --
-  -- Required Parameters:
-  --   * label  - The description that will be used to identfy the control.
-  --   * name   - The name of the attribute to put and pull the result from.
-  --              Equates to the NAME parameter of the HTML SELECT tag.
-  --   * list   - Iterator that will provide the options for the control.
-  --              Equates to the HTML OPTION tags in the SELECT and supplies
-  --              both the NAME and VALUE parameters of the OPTION tag.
-  --
-  -- Optional Parameters:
-  --   * labelposition   - determines were the label will be place in relation
-  --                       to the control.  Default is to the left of the control.
-  --   * size       - SIZE parameter of the HTML INPUT tag.
-  --   * maxlength  - MAXLENGTH parameter of the HTML INPUT tag.
-  --   * disabled   - DISABLED parameter of the HTML INPUT tag.
-  --   * onkeyup    - onkeyup parameter of the HTML INPUT tag.
-  --   * tabindex  - tabindex parameter of the HTML INPUT tag.
-  --   * onchange  - onkeyup parameter of the HTML INPUT tag.
-  --
-    *#
 <input type="text"
        name="$!webwork.htmlEncode($parameters.name)"
 #if ($parameters.size)             size="$!webwork.htmlEncode($parameters.size)"            #end
             #foreach ($param in $parameters.list)
                 <option value="$!webwork.htmlEncode($param)" #if ($parameters.name == $param) selected="selected" #end >$!webwork.htmlEncode($param)</option>
             #end
-      </select>
-#end
-
+      </select>#end

src/java/template/simple/file.vm

-#*
-  -- file.vm
-  --
-  -- Required Parameters:
-  --   * label      - The description that will be used to identfy the control.
-  --   * name       - The name of the attribute to put and pull the result from.
-  --                  Equates to the NAME parameter of the HTML INPUT tag.
-  --
-  -- Optional Parameters:
-  --   * labelposition   - determines were the label will be place in relation
-  --                       to the control.  Default is to the left of the control.
-  --   * size       - SIZE parameter of the HTML INPUT tag.
-  --   * accept     - What files should be accepted
-  --   * disabled   - DISABLED parameter of the HTML INPUT tag.
-  --
-    *#
 <input type="file"
                                    name="$!webwork.htmlEncode($parameters.name)"
 #if ($parameters.size)             size="$!webwork.htmlEncode($parameters.size)"            #end
 #if ($parameters.onchange)         onchange="$!parameters.onchange"                         #end
 #if ($parameters.cssClass)         class="$!webwork.htmlEncode($parameters.cssClass)"       #end
 #if ($parameters.cssStyle)         style="$!webwork.htmlEncode($parameters.cssStyle)"       #end
-/>
+/>

src/java/template/simple/label.vm

-#*
-  -- label.vm
-  --
-  -- Required Parameters:
-  --   * label      - The description that will be used to identfy this text label
-  --
-  -- Optional Parameters:
-  --   * labelposition   - determines were the label will be place in relation
-  --                       to the control.  Default is to the left of the control.
-  *#
 <label
 #if ($parameters.id)               id="$!webwork.htmlEncode($parameters.id)"                #end
 #if ($parameters.cssClass)         class="$!webwork.htmlEncode($parameters.cssClass)"       #end
 #if ($parameters.cssStyle)         style="$!webwork.htmlEncode($parameters.cssStyle)"       #end
-> $!webwork.htmlEncode($parameters.nameValue) </label>
+>$!webwork.htmlEncode($parameters.nameValue)</label>

src/java/template/simple/password.vm

-#*
-  -- password.vm
-  --
-  -- Required Parameters:
-  --   * label  - The description that will be used to identfy the control.
-  --   * name   - The name of the attribute to put and pull the result from.
-  --              Equates to the NAME parameter of the HTML INPUT tag.
-  --
-  -- Optional Parameters:
-  --   * labelposition   - determines were the label will be place in relation
-  --                       to the control.  Default is to the left of the control.
-  --   * size            - SIZE parameter of the HTML INPUT tag.
-  --   * maxlength       - MAXLENGTH parameter of the HTML INPUT tag.
-  --   * disabled        - DISABLED parameter of the HTML INPUT tag.
-  --   * readonly        - READONLY parameter of the HTML INPUT tag.
-  --   * onkeyup         - onkeyup parameter of the HTML INPUT tag.
-  --   * tabindex        - tabindex parameter of the HTML INPUT tag.
-  --   * onchange        - onkeyup parameter of the HTML INPUT tag.
-  --   * show            - determines whether the password is shown or not. Default is false.
-  --
-    *#
-
 <input type="password"
                                    name="$!webwork.htmlEncode($parameters.name)"
 #if ($parameters.size)             size="$!webwork.htmlEncode($parameters.size)"            #end
 #if ($parameters.onchange)         onchange="$!webwork.htmlEncode($parameters.onchange)"    #end
 #if ($parameters.id)               id="$!webwork.htmlEncode($parameters.id)"                #end
 #if ($parameters.cssClass)         class="$!webwork.htmlEncode($parameters.cssClass)"       #end
-/>
+/>

src/java/template/simple/radiomap.vm

-#*
-  -- WebWork, Web Application Framework
-  --
-  -- Distributable under LGPL license.
-  -- See terms of license at opensource.org
-  --
-  --
-  -- radiomap.jsp
-  --
-  -- Required Parameters:
-  --   * label     - The description that will be used to identfy the control.
-  --   * name      - The name of the attribute to put and pull the result from.
-  --                 Equates to the NAME parameter of the HTML tag INPUT.
-  --   * list      - Iterator that will provide the options for the control.
-  --                 Equates to the HTML LABEL tags.
-  --   * listKey   - Where to get the values for the INPUT tag.  Equates to
-  --                 the VALUE parameter of the INPUT tag.
-  --   * listValue - The value displayed next to the radio control.  Equates to the body
-  --                 of the enclosing HTML LABEL tag.
-  --
-  -- Optional Parameters:
-  --   * labelposition   - determines were the label will be place in relation
-  --                       to the control.  Default is to the left of the control.
-  --   * disabled        - DISABLED parameter of the HTML INPUT tag.
-  --   * tabindex        - tabindex parameter of the HTML INPUT tag.
-  --   * onchange        - onkeyup parameter of the HTML INPUT tag.
-  --
-    *#
 #set( $items = $parameters.list )
 #if( $items )
     #foreach( $item in $items )
             #if ($parameters.onchange)  onchange="$!webwork.htmlEncode($parameters.onchange)" #end
             #if ($parameters.cssClass)  class="$!webwork.htmlEncode($parameters.cssClass)"    #end
             #if ($parameters.cssStyle)  style="$!webwork.htmlEncode($parameters.cssStyle)"    #end
-        />
-        <label for="$!webwork.htmlEncode($parameters.name)$!webwork.htmlEncode($itemKey)">$!itemValue</label>
+        /><label for="$!webwork.htmlEncode($parameters.name)$!webwork.htmlEncode($itemKey)">$!itemValue</label>
 
         #set ($trash = $stack.pop())
     #end

src/java/template/simple/select.vm

-#*
-  -- selectmap.vm
-  --
-  -- Required Parameters:
-  --   * label  - The description that will be used to identfy the control.
-  --   * name   - The name of the attribute to put and pull the result from.
-  --              Equates to the NAME parameter of the HTML SELECT tag.
-  --   * list   - Iterator that will provide the options for the control.
-  --              Equates to the HTML OPTION tags in the SELECT and supplies
-  --              both the NAME and VALUE parameters of the OPTION tag.
-  --
-  -- Optional Parameters:
-  --   * labelposition   - determines were the label will be place in relation
-  --                       to the control.  Default is to the left of the control.
-  --   * size            - SIZE parameter of the HTML SELECT tag.
-  --   * disabled        - DISABLED parameter of the HTML SELECT tag.
-  --   * tabindex        - tabindex parameter of the HTML SELECT tag.
-  --   * onchange        - onkeyup parameter of the HTML SELECT tag.
-  --   * size            - SIZE parameter of the HTML SELECT tag.
-  --   * multiple        - MULTIPLE parameter of the HTML SELECT tag.
-  --   * headerKey       - Combined with headerValue parameter specifies the top of select list
-  --   * headerValue     - see above
-  --
-    *#
 <select name="$!parameters.name"
     #if ($parameters.size)             size="$parameters.size"                              #end
     #if ($parameters.disabled)         disabled="disabled"                                  #end
     #end
 #end
 
-</select>
+</select>

src/java/template/simple/text.vm

-#*
-  -- text.vm
-  --
-  -- Required Parameters:
-  --   * label      - The description that will be used to identfy the control.
-  --   * name       - The name of the attribute to put and pull the result from.
-  --                  Equates to the NAME parameter of the HTML INPUT tag.
-  --
-  -- Optional Parameters:
-  --   * labelposition   - determines were the label will be place in relation
-  --                       to the control.  Default is to the left of the control.
-  --   * size       - SIZE parameter of the HTML INPUT tag.
-  --   * maxlength  - MAXLENGTH parameter of the HTML INPUT tag.
-  --   * disabled   - DISABLED parameter of the HTML INPUT tag.
-  --   * readonly   - READONLY parameter of the HTML INPUT tag.
-  --   * onkeyup    - onkeyup parameter of the HTML INPUT tag.
-  --   * tabindex  - tabindex parameter of the HTML INPUT tag.
-  --   * onchange  - onkeyup parameter of the HTML INPUT tag.
-  --
-    *#
 <input type="text"
                                    name="$!webwork.htmlEncode($parameters.name)"
 #if ($parameters.size)             size="$!webwork.htmlEncode($parameters.size)"            #end
 #if ($parameters.id)               id="$!webwork.htmlEncode($parameters.id)"                #end
 #if ($parameters.cssClass)         class="$!webwork.htmlEncode($parameters.cssClass)"       #end
 #if ($parameters.cssStyle)         style="$!webwork.htmlEncode($parameters.cssStyle)"       #end
-/>
+/>

src/java/template/simple/textarea.vm

-#*
-  -- textarea.vm
-  --
-  -- Required Parameters:
-  --   * label  - The description that will be used to identfy the control.
-  --   * name   - The name of the attribute to put and pull the result from.
-  --              Equates to the NAME parameter of the HTML INPUT tag.
-  --   * cols   - Width of the textarea.  Equates to the COLS parameter of
-  --              HTML tag TEXTAREA.
-  --   * rows   - Height of the textarea.  Equates to the ROWS parameter of
-  --              HTML tag TEXTAREA.
-  --
-  -- Optional Parameters:
-  --   * labelposition   - determines were the label will be place in relation
-  --                       to the control.  Default is to the left of the control.
-  --   * disabled  - DISABLED parameter of the HTML TEXTAREA tag.
-  --   * readonly  - READONLY parameter of the HTML TEXTAREA tag.
-  --   * onkeyup   - onkeyup parameter of the HTML TEXTAREA tag.
-  --   * tabindex  - tabindex parameter of the HTML TEXTAREA tag.
-  --   * onchange  - onkeyup parameter of the HTML TEXTAREA tag.
-  --
-    *#
 <textarea name="$!webwork.htmlEncode($parameters.name)"
           cols="$!webwork.htmlEncode($parameters.cols)"
           rows="$!webwork.htmlEncode($parameters.rows)"
 #if ($parameters.id)               id="$!webwork.htmlEncode($parameters.id)"                #end
 #if ($parameters.cssClass)         class="$!webwork.htmlEncode($parameters.cssClass)"       #end
 #if ($parameters.cssStyle)         style="$!webwork.htmlEncode($parameters.cssStyle)"       #end
->$!webwork.htmlEncode($parameters.nameValue)</textarea>
+>$!webwork.htmlEncode($parameters.nameValue)</textarea>

src/java/template/xhtml/checkbox.vm

   #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>
+        <td align="left" valign="top" colspan="2"><span class="errorMessage">$!error</span></td>
     </tr>
   #end
 #end
     <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="top">
-#parse("/template/simple/checkbox.vm")
-    </td>
-    <td width="100%" valign="top">
-        #if ($hasFieldErrors)
-            <span class="checkboxErrorLabel">
-        #else
-            <span class="checkboxLabel">
-        #end
-                $!webwork.htmlEncode($parameters.label)
-            </span>
-    </td>
+    <tr>
+        <td valign="top">#parse("/template/simple/checkbox.vm")</td>
+        <td width="100%" valign="top"><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/xhtml/controlfooter.vm")

src/java/template/xhtml/controlfooter.vm

-  </td>
+</td>
 </tr>

src/java/template/xhtml/controlheader.vm

   #set ($hasFieldErrors = $fieldErrors.get($parameters.name))
   #foreach ($error in $fieldErrors.get($parameters.name))
     <tr>
-        #if ($parameters.labelposition == 'top')
-            <td align="left" valign="top" colspan="2">
-        #else
-            <td align="center" valign="top" colspan="2">
-        #end
-            <span class="errorMessage">$!webwork.htmlEncode($error)</span>
-            </td>
+        #if ($parameters.labelposition == 'top')<td align="left" valign="top" colspan="2">#else<td align="center" valign="top" colspan="2">#end<span class="errorMessage">$!webwork.htmlEncode($error)</span></td>
     </tr>
   #end
 #end
 ## if the label position is top,
 ## then give the label it's own row in the table
 <tr>
-#if ($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>
+#if ($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 == 'top')
 </tr>

src/java/template/xhtml/file.vm

-#parse("/template/xhtml/controlheader.vm")
-#parse("/template/simple/file.vm")
-#parse("/template/xhtml/controlfooter.vm")
+#parse("/template/xhtml/controlheader.vm")#parse("/template/simple/file.vm")#parse("/template/xhtml/controlfooter.vm")

src/java/template/xhtml/label.vm

-#parse("/template/xhtml/controlheader.vm")
-#parse("/template/simple/label.vm")
-#parse("/template/xhtml/controlfooter.vm")
+#parse("/template/xhtml/controlheader.vm")#parse("/template/simple/label.vm")#parse("/template/xhtml/controlfooter.vm")

src/java/template/xhtml/password.vm

-#parse("/template/xhtml/controlheader.vm")
-#parse("/template/simple/password.vm")
-#parse("/template/xhtml/controlfooter.vm")
+#parse("/template/xhtml/controlheader.vm")#parse("/template/simple/password.vm")#parse("/template/xhtml/controlfooter.vm")

src/java/template/xhtml/radiomap.vm

-#parse("/template/xhtml/controlheader.vm")
-#parse("/template/simple/radiomap.vm")
-#parse("/template/xhtml/controlfooter.vm")
+#parse("/template/xhtml/controlheader.vm")#parse("/template/simple/radiomap.vm")#parse("/template/xhtml/controlfooter.vm")

src/java/template/xhtml/select.vm

-#parse("/template/xhtml/controlheader.vm")
-#parse("/template/simple/select.vm")
-#parse("/template/xhtml/controlfooter.vm")
+#parse("/template/xhtml/controlheader.vm")#parse("/template/simple/select.vm")#parse("/template/xhtml/controlfooter.vm")

src/java/template/xhtml/submit.vm

 <tr>
-    <td colspan="2">
-<div #if ($parameters.align) align="$!webwork.htmlEncode($parameters.align)" #end
->#parse("/template/simple/submit.vm")</div>
-#parse( "/template/xhtml/controlfooter.vm" )
+    <td colspan="2"><div #if ($parameters.align) align="$!webwork.htmlEncode($parameters.align)" #end
+>#parse("/template/simple/submit.vm")</div>#parse( "/template/xhtml/controlfooter.vm" )

src/java/template/xhtml/text.vm

-#parse("/template/xhtml/controlheader.vm")
-#parse("/template/simple/text.vm")
-#parse("/template/xhtml/controlfooter.vm")
+#parse("/template/xhtml/controlheader.vm")#parse("/template/simple/text.vm")#parse("/template/xhtml/controlfooter.vm")

src/java/template/xhtml/textarea.vm

-#parse("/template/xhtml/controlheader.vm")
-#parse("/template/simple/textarea.vm")
-#parse("/template/xhtml/controlfooter.vm")
+#parse("/template/xhtml/controlheader.vm")#parse("/template/simple/textarea.vm")#parse("/template/xhtml/controlfooter.vm")
 

src/test/com/opensymphony/webwork/views/jsp/ui/Checkbox-1.txt

-<tr><td valign="top" colspan="2">
-    <table width="100%" border="0" cellpadding="0" cellspacing="0"><tr><td valign="top">
-        <input type="checkbox" name="foo" value="baz"
-        checked="true"
-    /></td><td width="100%" valign="top">
-        <label class="checkboxLabel">mylabel</label>
-    </td></tr></table>
+<tr>
+    <td valign="top" colspan="2">
+        <table width="100%" border="0" cellpadding="0" cellspacing="0">
+            <tr>
+                <td valign="top"><input type="checkbox" name="foo" value="baz" checked="true" id="someId" /></td>
+                <td width="100%" valign="top"><label for="someId" class="checkboxLabel">mylabel</label></td>
+            </tr>
+        </table>
     </td>
 </tr>

src/test/com/opensymphony/webwork/views/jsp/ui/Checkbox-2.txt

-<tr><td valign="top" colspan="2">
-    <table width="100%" border="0" cellpadding="0" cellspacing="0"><tr><td valign="top">
-        <input type="checkbox" name="foo" value="baz"
-    /></td><td width="100%" valign="top">
-        <label class="checkboxLabel">mylabel</label>
-    </td></tr></table>
+<tr>
+    <td valign="top" colspan="2">
+        <table width="100%" border="0" cellpadding="0" cellspacing="0">
+            <tr>
+                <td valign="top"><input type="checkbox" name="foo" value="baz" /></td>
+                <td width="100%" valign="top"><label class="checkboxLabel">mylabel</label></td>
+            </tr>
+        </table>
     </td>
 </tr>

src/test/com/opensymphony/webwork/views/jsp/ui/Checkbox-3.txt

 <tr>
-    <td align="left" valign="top" colspan="2">
-        <span class="errorMessage">Some Foo Error</span>
-    </td>
+    <td align="left" valign="top" colspan="2"><span class="errorMessage">Some Foo Error</span></td>
 </tr>
 <tr>
-    <td align="left" valign="top" colspan="2">
-        <span class="errorMessage">Another Foo Error</span>
-    </td>
+    <td align="left" valign="top" colspan="2"><span class="errorMessage">Another Foo Error</span></td>
 </tr>
-<tr><td valign="top" colspan="2">
-    <table width="100%" border="0" cellpadding="0" cellspacing="0"><tr><td valign="top">
-        <input type="checkbox" name="foo" value="baz"
-            checked="true"
-    /></td><td width="100%" valign="top">
-        <label class="checkboxErrorLabel">mylabel</label>
-    </td></tr></table>
+<tr>
+    <td valign="top" colspan="2">
+        <table width="100%" border="0" cellpadding="0" cellspacing="0">
+            <tr>
+                <td valign="top"><input type="checkbox" name="foo" value="baz" checked="true" /></td>
+                <td width="100%" valign="top"><label class="checkboxErrorLabel">mylabel</label></td>
+            </tr>
+        </table>
     </td>
 </tr>

src/test/com/opensymphony/webwork/views/jsp/ui/CheckboxList-1.txt

 <tr>
-    <td align="right" valign="top">
-        <label class="label"> mylabel: </label>
-    </td>
+    <td align="right" valign="top"><label class="label">mylabel:</label></td>
     <td>
         <div>
             <input type="checkbox" name="foo" value="hello" id="foo-1" checked="true" />

src/test/com/opensymphony/webwork/views/jsp/ui/CheckboxList-2.txt

 <tr>
-    <td align="right" valign="top">
-        <label class="label"> mylabel: </label>
-    </td>
+    <td align="right" valign="top"><label class="label">mylabel:</label></td>
     <td>
         <div>
             <input type="checkbox" name="collection" value="hello" id="collection-1" checked="true" />

src/test/com/opensymphony/webwork/views/jsp/ui/CheckboxTest.java

 
         CheckboxTag tag = new CheckboxTag();
         tag.setPageContext(pageContext);
+        tag.setId("someId");
         tag.setLabel("'mylabel'");
         tag.setName("'foo'");
         tag.setFieldValue("'baz'");

src/test/com/opensymphony/webwork/views/jsp/ui/ComboBox-1.txt

 <tr>
-    <td align="right" valign="top">
-        <label class="label"> mylabel: </label>
-    </td>
-    <td>
-        <input type="text" name="foo" /><br/>
+    <td align="right" valign="top"><label class="label">mylabel:</label></td>
+    <td><input type="text" name="foo" /><br/>
         <select onChange="this.form.elements['foo'].value=this.options[this.selectedIndex].value" >
             <option value="foo" selected="selected" >foo</option>
             <option value="bar" >bar</option>
             <option value="baz" >baz</option>
-        </select>
-    </td>
+        </select></td>
 </tr>

src/test/com/opensymphony/webwork/views/jsp/ui/File-1.txt

 <tr>
-    <td align="right" valign="top">
-        <label class="label"> mylabel: </label>
-    </td>
-    <td>
-        <input type="file"
-               name="myname"
-               size="10"
-               value="bar"
-               accept="*.txt"
-        />
-    </td>
+    <td align="right" valign="top"><label class="label">mylabel:</label></td>
+    <td><input type="file" name="myname" size="10" value="bar" accept="*.txt" /></td>
 </tr>

src/test/com/opensymphony/webwork/views/jsp/ui/Label-1.txt

 <tr>
-    <td align="right" valign="top">
-        <label class="label"> mylabel: </label>
-    </td>
-    <td>
-        <label > bar </label>
-    </td>
+    <td align="right" valign="top"><label class="label">mylabel:</label></td>
+    <td><label >bar</label></td>
 </tr>

src/test/com/opensymphony/webwork/views/jsp/ui/Label-2.txt

 <tr>
-    <td align="right" valign="top">
-        <label class="label"> mylabel: </label>
-    </td>
-    <td>
-        <label > foo </label>
-    </td>
+    <td align="right" valign="top"><label class="label">mylabel:</label></td>
+    <td><label >foo</label></td>
 </tr>

src/test/com/opensymphony/webwork/views/jsp/ui/Label-3.txt

 <tr>
-    <td align="left" valign="top" colspan="2">
-        <label class="label"> mylabel: </label>
-    </td>
+    <td align="left" valign="top" colspan="2"><label class="label">mylabel:</label></td>
 </tr>
 <tr>
-    <td>
-        <label > bar </label>
-    </td>
+    <td><label >bar</label></td>
 </tr>

src/test/com/opensymphony/webwork/views/jsp/ui/Password-1.txt

 <tr>
-    <td align="right" valign="top">
-        <label class="label"> mylabel: </label>
-    </td>
-    <td>
-        <input type="password"
-               name="myname"
-        />
-    </td>
+    <td align="right" valign="top"><label class="label">mylabel:</label></td>
+    <td><input type="password" name="myname" /></td>
 </tr>

src/test/com/opensymphony/webwork/views/jsp/ui/Radio-1.txt

 <tr>
-    <td align="right" valign="top">
-        <label class="label"> mylabel: </label>
-    </td>
+    <td align="right" valign="top"><label class="label">mylabel:</label></td>
     <td>
-        <input type="radio"
-               name="myname"
-               id="mynamehello"
-               value="hello"
-        />
-        <label for="mynamehello">world</label>
-
-        <input type="radio"
-               name="myname"
-               id="mynamefoo"
-               value="foo"
-        />
-        <label for="mynamefoo">bar</label>
+        <input type="radio" name="myname" id="mynamehello" value="hello" /><label for="mynamehello">world</label>
+        <input type="radio" name="myname" id="mynamefoo" value="foo" /><label for="mynamefoo">bar</label>
     </td>
 </tr>

src/test/com/opensymphony/webwork/views/jsp/ui/Radio-2.txt

 <tr>
-    <td align="right" valign="top">
-        <label class="label"> mylabel: </label>
-    </td>
+    <td align="right" valign="top"><label class="label">mylabel:</label></td>
     <td>
-        <input type="radio"
-               name="myname"
-               id="myname2"
-               value="2"
-        />
-        <label for="myname2">Two</label>
-
-        <input type="radio"
-               checked="checked"
-               name="myname"
-               id="myname1"
-               value="1"
-        />
-        <label for="myname1">One</label>
+        <input type="radio" name="myname" id="myname2" value="2" /><label for="myname2">Two</label>
+        <input type="radio" checked="checked" name="myname" id="myname1" value="1" /><label for="myname1">One</label>
     </td>
 </tr>

src/test/com/opensymphony/webwork/views/jsp/ui/Select-1.txt

 <tr>
-    <td align="right" valign="top">
-        <label class="label"> mylabel: </label>
-    </td>
-    <td>
-        <select name="foo"
-        >
+    <td align="right" valign="top"><label class="label">mylabel:</label></td>
+    <td><select name="foo" >
             <option value="headerKey">headerValue</option>
             <option value=""></option>
             <option value="hello" selected="true" >world</option>
             <option value="foo" >bar</option>
-        </select>
-    </td>
+        </select></td>
 </tr>

src/test/com/opensymphony/webwork/views/jsp/ui/Select-2.txt

 <tr>
-    <td align="right" valign="top">
-        <label class="label"> mylabel: </label>
-    </td>
-    <td>
-        <select name="collection"
-                multiple="multiple"
-        >
+    <td align="right" valign="top"><label class="label">mylabel:</label></td>
+    <td><select name="collection" multiple="multiple" >
             <option value="hello" selected="true" >world</option>
             <option value="foo" selected="true" >bar</option>
             <option value="cat" >dog</option>
-        </select>
-    </td>
+        </select></td>
 </tr>

src/test/com/opensymphony/webwork/views/jsp/ui/Submit-1.txt

 <tr>
-    <td colspan="2"> <div align="left" ><input type="submit" name="myname" value="bar" /></div> </td>
+    <td colspan="2"><div align="left" ><input type="submit" name="myname" value="bar" /></div></td>
 </tr>

src/test/com/opensymphony/webwork/views/jsp/ui/Submit-2.txt

 <tr>
-    <td colspan="2"> <div align="right" ><input type="submit" name="myname" value="Submit" /></div> </td>
+    <td colspan="2"><div align="right" ><input type="submit" name="myname" value="Submit" /></div></td>
 </tr>

src/test/com/opensymphony/webwork/views/jsp/ui/Textarea-1.txt

 <tr>
-    <td align="right" valign="top">
-        <label for="the_id" class="label"> mylabel: </label>
-    </td>
-    <td>
-        <textarea name="myname"
+    <td align="right" valign="top"><label for="the_id" class="label">mylabel:</label></td>
+    <td><textarea name="myname"
                   cols="20"
                   rows="30"
                   value="bar"
                   tabindex="5"
                   onchange="alert('goodbye');"
                   id="the_id"
-        >bar</textarea>
-    </td>
+        >bar</textarea></td>
 </tr>

src/test/com/opensymphony/webwork/views/jsp/ui/Textfield-1.txt

 <tr>
-    <td align="right" valign="top">
-        <label class="label"> mylabel: </label>
-    </td>
-    <td>
-        <input type="text" 
+    <td align="right" valign="top"><label class="label">mylabel:</label></td>
+    <td><input type="text"
                name="myname"
                size="10"
                value="bar"
-        />
-    </td>
+        /></td>
 </tr>

src/test/com/opensymphony/webwork/views/jsp/ui/Textfield-2.txt

 <tr>
-    <td align="center" valign="top" colspan="2">
-        <span class="errorMessage">bar error message</span>
-    </td>
+    <td align="center" valign="top" colspan="2"><span class="errorMessage">bar error message</span></td>
 </tr>
 <tr>
-    <td align="right" valign="top">
-        <label class="errorLabel"> mylabel: </label>
-    </td>
-    <td>
-        <input type="text"
+    <td align="right" valign="top"><label class="errorLabel">mylabel:</label></td>
+    <td><input type="text"
                name="foo"
                value="bar"
-        />
-    </td>
+        /></td>
 </tr>

src/test/com/opensymphony/webwork/views/jsp/ui/Textfield-3.txt

 <tr>
-    <td align="right" valign="top">
-    </td>
-    <td>
-        <input type="text"
+    <td align="right" valign="top"></td>
+    <td><input type="text"
                name="myname"
                size="10"
                value="bar"
-        />
-    </td>
+        /></td>
 </tr>