From bb20a38cff183280ff747af926e886b2dfaa88b9 Mon Sep 17 00:00:00 2001
From: Dave Lawrence <dlawrence@mozilla.com>
Date: Mon, 16 Apr 2012 18:05:08 -0700
Subject: Bug 743910 - Revamp of tracking/project/flags for enter_bug.cgi
 r=glob

---
 template/en/default/bug/create/create.html.tmpl | 24 +++++++++++++-----------
 1 file changed, 13 insertions(+), 11 deletions(-)

(limited to 'template/en/default')

diff --git a/template/en/default/bug/create/create.html.tmpl b/template/en/default/bug/create/create.html.tmpl
index b52657147..977b5b2c5 100644
--- a/template/en/default/bug/create/create.html.tmpl
+++ b/template/en/default/bug/create/create.html.tmpl
@@ -706,15 +706,15 @@ TUI_hide_default('attachment_text_field');
             <legend>Set [% terms.bug %] flags</legend>
 
             <table cellpadding="0" cellspacing="0">
-            <tr>
-              [% IF project_flags.size %]
-                <td>
-                  <table id="bug_project_flags">
+              <tr>
+              [% IF tracking_flags.size %]
+                <td [% IF project_flags.size %]rowspan="2"[% END %]>
+                  <table id="bug_tracking_flags">
                     <tr>
-                      <th colspan="2" style="text-align:left">Project Flags:</th>
+                      <th colspan="2" style="text-align:left">Tracking Flags:</th>
                     </tr>
                     <tr>
-                      [% FOREACH field = project_flags %]
+                      [% FOREACH field = tracking_flags %]
                         [% SET value = ${field.name}.defined ? ${field.name} : "" %]
                         <tr>
                           [% INCLUDE bug/field.html.tmpl 
@@ -726,14 +726,14 @@ TUI_hide_default('attachment_text_field');
                   </table>
                 </td>
               [% END %]
-              [% IF tracking_flags.size %]
+              [% IF project_flags.size %]
                 <td>
-                  <table id="bug_tracking_flags">
+                  <table id="bug_project_flags">
                     <tr>
-                      <th colspan="2" style="text-align:left">Tracking Flags:</th>
+                      <th colspan="2" style="text-align:left">Project Flags:</th>
                     </tr>
                     <tr>
-                      [% FOREACH field = tracking_flags %]
+                      [% FOREACH field = project_flags %]
                         [% SET value = ${field.name}.defined ? ${field.name} : "" %]
                         <tr>
                           [% INCLUDE bug/field.html.tmpl 
@@ -744,6 +744,8 @@ TUI_hide_default('attachment_text_field');
                     </tr>
                   </table>
                 </td>
+              </tr>
+              <tr>
               [% END %]
               [% IF display_flags %]
                 <td>
@@ -753,7 +755,7 @@ TUI_hide_default('attachment_text_field');
                   %]
                 </td>
               [% END %]
-            </tr>
+              </tr>
             </table>
           </fieldset>
         </div>
-- 
cgit v1.2.3-24-g4f1b