From 224ec4a14c01789a9f085075b92a48eec677c8d9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Buclin?= <LpSolit@netscape.net>
Date: Tue, 11 Jul 2017 00:10:29 +0200
Subject: Replace the "Importance" field by two distinct "Priority" and
 "Severity" fields (mga#21221)

This reverts what has been done upstream in Bugzilla 3.2 (bmo bug 374020)
---
 template/en/default/bug/edit.html.tmpl | 23 ++++++++++++++---------
 1 file changed, 14 insertions(+), 9 deletions(-)

diff --git a/template/en/default/bug/edit.html.tmpl b/template/en/default/bug/edit.html.tmpl
index b8abe6bc5..1e10d38e8 100644
--- a/template/en/default/bug/edit.html.tmpl
+++ b/template/en/default/bug/edit.html.tmpl
@@ -329,20 +329,25 @@
  [%# Importance (priority and severity) #%]
  [%###############################################################%]
     <tr>
-      <th class="field_label">
-        [% can_edit_priority = bug.check_can_change_field('priority', 0, 1) %]
-        <label [% IF can_edit_priority %]for="priority"[% END %] accesskey="i">
-          <a href="page.cgi?id=fields.html#importance"><u>I</u>mportance</a></label>:
-      </th>
-      <td>
-       [% INCLUDE bug/field.html.tmpl
+      [% can_edit_priority = bug.check_can_change_field('priority', 0, 1) %]
+      [% INCLUDE "bug/field-label.html.tmpl"
+          field = bug_fields.priority
+          editable = can_edit_priority
+      %]
+      <td class="field_value">
+        [% INCLUDE bug/field.html.tmpl
             bug = bug, field = bug_fields.priority,
             no_tds = 1, value = bug.priority
             editable = can_edit_priority %]
-       [%+ INCLUDE bug/field.html.tmpl
+
+        [% can_edit_severity = bug.check_can_change_field('bug_severity', 0, 1) %]
+        <label [% IF can_edit_severity %]for="bug_severity"[% END %] class="field_label">
+          <a href="page.cgi?id=fields.html#bug_severity" class="field_help_link"
+             title="[% help_html.bug_severity FILTER txt FILTER collapse FILTER html %]">Severity</a>:</label>
+        [%+ INCLUDE bug/field.html.tmpl
             bug = bug, field = bug_fields.bug_severity,
             no_tds = 1, value = bug.bug_severity
-            editable = bug.check_can_change_field('bug_severity', 0, 1) %]
+            editable = can_edit_severity %]
         [% Hook.process('after_importance', 'bug/edit.html.tmpl') %]
       </td>
     </tr>
-- 
cgit v1.2.1