From 6708131d92db5ef5201a7c70b5e49b846761bec6 Mon Sep 17 00:00:00 2001
From: "guy.pyrzak%gmail.com" <>
Date: Wed, 5 Nov 2008 01:17:02 +0000
Subject: Bug 452888: The status selector is too far from the comment box,
 leading to a serious usability problem Patch By Guy Pyrzak
 <guy.pyrzak@gmail.com> r=mkanat, a=mkanat

---
 template/en/default/bug/edit.html.tmpl | 17 ++++++++++++++++-
 template/en/default/bug/knob.html.tmpl |  1 +
 2 files changed, 17 insertions(+), 1 deletion(-)

(limited to 'template/en/default')

diff --git a/template/en/default/bug/edit.html.tmpl b/template/en/default/bug/edit.html.tmpl
index fc74bcfb2..a3367fe87 100644
--- a/template/en/default/bug/edit.html.tmpl
+++ b/template/en/default/bug/edit.html.tmpl
@@ -258,6 +258,8 @@
                      cols      = constants.COMMENT_COLS
           %]
           <br>
+          <a name="bug_status_bottom"></a>
+          [% PROCESS bug/knob.html.tmpl %]
           <div id="knob-buttons">
             <input type="submit" value="Commit" id="commit">
             [% IF bug.user.canmove %]
@@ -427,7 +429,20 @@
       <b><a href="page.cgi?id=fields.html#status">Status</a></b>:
     </td>
     <td id="bz_field_status">
-      [% PROCESS bug/knob.html.tmpl %]
+      <span id="static_bug_status">
+        [% get_status(bug.bug_status) FILTER html %]
+        [% IF bug.resolution %]
+          [%+ get_resolution(bug.resolution) FILTER html %]
+          [% IF bug.dup_id %]
+            <span id="duplicate_display">of 
+            [% "${terms.bug} ${bug.dup_id}" FILTER bug_link(bug.dup_id) FILTER none %]</span>
+          [% END %]
+        [% END %]
+        [% IF bug.user.canedit || bug.user.isreporter %]
+          (<a href="#bug_status_bottom" 
+              onclick="document.getElementById('bug_status').focus();return false;">edit</a>)
+        [% END %]
+      </span>
     </td>
   </tr>
 [% END %]
diff --git a/template/en/default/bug/knob.html.tmpl b/template/en/default/bug/knob.html.tmpl
index b984410e0..038e6cbb3 100644
--- a/template/en/default/bug/knob.html.tmpl
+++ b/template/en/default/bug/knob.html.tmpl
@@ -23,6 +23,7 @@
 
 [% PROCESS global/variables.none.tmpl %]
 <div id="status">
+  <a name="bug_status"></a>
   [% initial_action_shown = 0 %]
   [% show_resolution = 0 %]
   [% bug_status_select_displayed = 0 %]
-- 
cgit v1.2.3-24-g4f1b