Bug 456043 - Make enter_bug consistent with show_bug for Severity and Priority

template/en/default/bug/create/create.html.tmpl

@@ -184,9 +184,9 @@ TUI_hide_default('attachment_text_field');
 
   <tr>
     [% INCLUDE "bug/field-label.html.tmpl"
-      field = bug_fields.version editable = 1 rowspan = 3 
+      field = bug_fields.version editable = 1 rowspan = 4
     %]
-    <td rowspan="3">
+    <td rowspan="4">
       <select name="version" id="version" size="5" aria-required="true"
               class="required">
         [%- FOREACH v = version %]
@@ -203,6 +203,16 @@ TUI_hide_default('attachment_text_field');
       value = default.bug_severity %]
   </tr>
 
+  <tr class="expert_fields">
+    [% IF Param('letsubmitterchoosepriority') %]
+      [% INCLUDE bug/field.html.tmpl
+        bug = default, field = bug_fields.priority, editable = 1, 
+        value = default.priority %]
+    [% ELSE %]
+      <td colspan="2">&nbsp;</td>
+    [% END %]
+  </tr>
+
   <tr>
     [% INCLUDE bug/field.html.tmpl
       bug = default, field = bug_fields.rep_platform, editable = 1,
@@ -216,7 +226,8 @@ TUI_hide_default('attachment_text_field');
   </tr>
   [% IF (!Param('defaultplatform') || !Param('defaultopsys')) && !cloned_bug_id %]
     <tr>
-      <th colspan="3">&nbsp;</th>
+      <td colspan="2" class="expert_fields">&nbsp;</td>
+      <td>&nbsp;</td>
       <td id="os_guess_note" class="comment">
         <div>We've made a guess at your
         [% IF Param('defaultplatform') %]
@@ -240,13 +251,7 @@ TUI_hide_default('attachment_text_field');
       <td colspan="2">&nbsp;</td>
     [% END %]
 
-    [% IF Param('letsubmitterchoosepriority') %]
-      [% INCLUDE bug/field.html.tmpl
-        bug = default, field = bug_fields.priority, editable = 1, 
-        value = default.priority %]
-    [% ELSE %]
-      <td colspan="2">&nbsp;</td>
-    [% END %]
+    <td colspan="2">&nbsp;</td>
   </tr>
 </tbody>
 
@@ -263,7 +268,7 @@ TUI_hide_default('attachment_text_field');
 
     <td>&nbsp;</td>
     [%# Calculate the number of rows we can use for flags %]
-    [% num_rows = 7 + (Param("useqacontact") ? 1 : 0) +
+    [% num_rows = 6 + (Param("useqacontact") ? 1 : 0) +
                       (user.is_timetracker ? 3 : 0)
     %]
 
@@ -387,7 +392,7 @@ TUI_hide_default('attachment_text_field');
     [% INCLUDE "bug/field-label.html.tmpl"
       field = bug_fields.bug_file_loc editable = 1
     %]
-    <td colspan="2" class="field_value">
+    <td colspan="3" class="field_value">
       <input name="bug_file_loc" id="bug_file_loc" class="text_input"
              size="40" value="[% bug_file_loc FILTER html %]">
     </td>
@@ -532,7 +537,7 @@ TUI_hide_default('attachment_text_field');
       [% INCLUDE bug/field.html.tmpl
         bug = default, field = bug_fields.keywords, editable = 1,
         value = keywords, possible_values = all_keywords,
-        desc_url = "describekeywords.cgi", value_span = 2
+        desc_url = "describekeywords.cgi", value_span = 3
       %]
     </tr>
   [% END %]