From 48577f23ee0cccfcc476cbac477a9b30c5194fa9 Mon Sep 17 00:00:00 2001
From: Byron Jones <glob@mozilla.com>
Date: Tue, 1 Jul 2014 13:45:06 +0800
Subject: Bug 1031428: Move the "Mentors" field under "QA Contact" field

---
 .../hook/bug/edit-after_custom_fields.html.tmpl    | 50 ---------------------
 .../default/hook/bug/edit-after_people.html.tmpl   | 51 ++++++++++++++++++++++
 2 files changed, 51 insertions(+), 50 deletions(-)
 delete mode 100644 extensions/Review/template/en/default/hook/bug/edit-after_custom_fields.html.tmpl
 create mode 100644 extensions/Review/template/en/default/hook/bug/edit-after_people.html.tmpl

(limited to 'extensions')

diff --git a/extensions/Review/template/en/default/hook/bug/edit-after_custom_fields.html.tmpl b/extensions/Review/template/en/default/hook/bug/edit-after_custom_fields.html.tmpl
deleted file mode 100644
index 352dfa6c7..000000000
--- a/extensions/Review/template/en/default/hook/bug/edit-after_custom_fields.html.tmpl
+++ /dev/null
@@ -1,50 +0,0 @@
-[%# This Source Code Form is subject to the terms of the Mozilla Public
-  # License, v. 2.0. If a copy of the MPL was not distributed with this
-  # file, You can obtain one at http://mozilla.org/MPL/2.0/.
-  #
-  # This Source Code Form is "Incompatible With Secondary Licenses", as
-  # defined by the Mozilla Public License, v. 2.0.
-  #%]
-
-[% mentor_logins = [] %]
-[% FOREACH mentor = bug.mentors %]
-  [% mentor_logins.push(mentor.login) %]
-[% END %]
-<tr>
-  <th class="field_label">Mentors:</th>
-  <td>
-    [% IF bug.check_can_change_field("bug_mentors", 0, 1) %]
-      <div id="bz_bug_mentors_edit_container" class="bz_default_hidden">
-        <span>
-          [% FOREACH mentor = bug.mentors %]
-            [% INCLUDE global/user.html.tmpl who = mentor %]<br>
-          [% END %]
-          (<a href="#" id="bz_bug_mentors_edit_action">edit</a>)
-        </span>
-      </div>
-      <div id="bz_bug_mentors_input">
-        [% INCLUDE global/userselect.html.tmpl
-           id       = "bug_mentors"
-           name     = "bug_mentors"
-           value    = mentor_logins.join(", ")
-           classes  = ["bz_userfield"]
-           size     = 30
-           multiple = 5
-         %]
-        <br>
-      </div>
-      <script type="text/javascript">
-        hideEditableField('bz_bug_mentors_edit_container',
-                          'bz_bug_mentors_input',
-                          'bz_bug_mentors_edit_action',
-                          'bug_mentors',
-                          '[% mentor_logins.join(", ") FILTER js %]' );
-      </script>
-    [% ELSE %]
-      [% FOREACH mentor = bug.mentors %]
-        [% INCLUDE global/user.html.tmpl who = mentor %]<br>
-      [% END %]
-    [% END %]
-  </td>
-</tr>
-
diff --git a/extensions/Review/template/en/default/hook/bug/edit-after_people.html.tmpl b/extensions/Review/template/en/default/hook/bug/edit-after_people.html.tmpl
new file mode 100644
index 000000000..55f12e02d
--- /dev/null
+++ b/extensions/Review/template/en/default/hook/bug/edit-after_people.html.tmpl
@@ -0,0 +1,51 @@
+[%# This Source Code Form is subject to the terms of the Mozilla Public
+  # License, v. 2.0. If a copy of the MPL was not distributed with this
+  # file, You can obtain one at http://mozilla.org/MPL/2.0/.
+  #
+  # This Source Code Form is "Incompatible With Secondary Licenses", as
+  # defined by the Mozilla Public License, v. 2.0.
+  #%]
+
+[% mentor_logins = [] %]
+[% FOREACH mentor = bug.mentors %]
+  [% mentor_logins.push(mentor.login) %]
+[% END %]
+<tr>
+  <th class="field_label">Mentors:</th>
+  <td>
+    [% IF bug.check_can_change_field("bug_mentors", 0, 1) %]
+      <div id="bz_bug_mentors_edit_container" class="bz_default_hidden">
+        <span>
+          [% FOREACH mentor = bug.mentors %]
+            [% INCLUDE global/user.html.tmpl who = mentor %]
+            [% "<br>" UNLESS loop.last %]
+          [% END %]
+          (<a href="#" id="bz_bug_mentors_edit_action">edit</a>)
+        </span>
+      </div>
+      <div id="bz_bug_mentors_input">
+        [% INCLUDE global/userselect.html.tmpl
+           id       = "bug_mentors"
+           name     = "bug_mentors"
+           value    = mentor_logins.join(", ")
+           classes  = ["bz_userfield"]
+           size     = 30
+           multiple = 5
+         %]
+        <br>
+      </div>
+      <script type="text/javascript">
+        hideEditableField('bz_bug_mentors_edit_container',
+                          'bz_bug_mentors_input',
+                          'bz_bug_mentors_edit_action',
+                          'bug_mentors',
+                          '[% mentor_logins.join(", ") FILTER js %]' );
+      </script>
+    [% ELSE %]
+      [% FOREACH mentor = bug.mentors %]
+        [% INCLUDE global/user.html.tmpl who = mentor %]<br>
+      [% END %]
+    [% END %]
+  </td>
+</tr>
+
-- 
cgit v1.2.3-24-g4f1b