Bug 348337: enter_bug.cgi doesn't pass HTML validation - Patch by Frédéric Buclin <LpSolit@gmail.com> r=kevin.benton a=myk

3 files changed, 12 insertions, 11 deletions

diff --git a/template/en/default/bug/create/create.html.tmpl b/template/en/default/bug/create/create.html.tmpl
index bb4936861..33e8b8090 100644
--- a/template/en/default/bug/create/create.html.tmpl
+++ b/template/en/default/bug/create/create.html.tmpl
@@ -265,6 +265,7 @@ function handleWantsAttachment(wants_attachment) {
       [% IF product.flag_types.bug.size > 0 %]
         [% PROCESS "flag/list.html.tmpl" flag_types = product.flag_types.bug
                                          any_flags_requesteeble = 1
+                                         flag_table_id = "bug_flags"
         %]
       [% END %]
     </td>
@@ -365,7 +366,7 @@ function handleWantsAttachment(wants_attachment) {
                                            enter_bug => 1 }) %]
     [% SET value = ${field.name} IF ${field.name}.defined %]
     <tr>
-      [% PROCESS bug/field.html.tmpl editable=1 value_span=3 %]
+      [% PROCESS bug/field.html.tmpl editable=1 value_span=2 %]
     </tr>
   [% END %]
 
@@ -425,8 +426,8 @@ function handleWantsAttachment(wants_attachment) {
                       +          'onClick="handleWantsAttachment(true)"> '
                       +   '<em style="display: none">This button has no '
                       +   'functionality for you because your browser does '
-                      +   'not support CSS or does not use it.</em>'
-                      + '</div>'
+                      +   'not support CSS or does not use it.<\/em>'
+                      + '<\/div>'
                       + '<div id="attachment_true" style="display: none">'
                       +   '<input type="button" '
                       +          'value="Don\'t add an attachment " '
@@ -437,12 +438,13 @@ function handleWantsAttachment(wants_attachment) {
           <legend>Add an attachment</legend>
           <table class="attachment_entry">
             [% PROCESS attachment/createformcontents.html.tmpl
-                       flag_types = product.flag_types.attachment %]
+                       flag_types = product.flag_types.attachment
+                       flag_table_id ="attachment_flags" %]
           </table>
         </fieldset>
       <script type="text/javascript">
         <!--
-        document.write('</div>');
+        document.write('<\/div>');
         //-->
       </script>
     </td>
diff --git a/template/en/default/bug/field.html.tmpl b/template/en/default/bug/field.html.tmpl
index ece2f64bf..59020518b 100644
--- a/template/en/default/bug/field.html.tmpl
+++ b/template/en/default/bug/field.html.tmpl
@@ -37,14 +37,11 @@
   [% '</label>' IF editable %]
 </th>
 
-<td class="field_value">
+<td class="field_value" [% "colspan=\"$value_span\"" FILTER none IF value_span %]>
 [% IF editable %]
   [% SWITCH field.type %]
     [% CASE constants.FIELD_TYPE_FREETEXT %]
-        <input name="[% field.name FILTER html %]"
-               value="[% value FILTER html %]"
-               [% "colspan=\"$value_span\"" FILTER none IF value_span %]
-               size="60">
+        <input name="[% field.name FILTER html %]" value="[% value FILTER html %]" size="60">
   [% END %]
 [% ELSE %]
   [% value FILTER html %]
diff --git a/template/en/default/flag/list.html.tmpl b/template/en/default/flag/list.html.tmpl
index 1cf710250..643547405 100644
--- a/template/en/default/flag/list.html.tmpl
+++ b/template/en/default/flag/list.html.tmpl
@@ -72,7 +72,9 @@
   # on a single bug/attachment).
   #%]
 
-<table id="flags">
+[% DEFAULT flag_table_id = "flags" %]
+
+<table id="[% flag_table_id FILTER html %]">
   <tr>
     <th colspan="3">
       Flags: