From aa3f0331fb7e0b97201afb806b777a03c9f2fca2 Mon Sep 17 00:00:00 2001
From: Kohei Yoshino <kohei.yoshino@gmail.com>
Date: Thu, 30 Nov 2017 22:42:14 -0500
Subject: Bug 1420300 - Move bug tagging tool from global footer to bug footer

---
 template/en/default/bug/navigate.html.tmpl         |  2 +
 template/en/default/bug/tagging.html.tmpl          | 52 +++++++++++++++++++
 template/en/default/filterexceptions.pl            |  4 --
 .../en/default/global/per-bug-queries.html.tmpl    | 58 ----------------------
 template/en/default/global/useful-links.html.tmpl  |  4 --
 5 files changed, 54 insertions(+), 66 deletions(-)
 create mode 100644 template/en/default/bug/tagging.html.tmpl
 delete mode 100644 template/en/default/global/per-bug-queries.html.tmpl

(limited to 'template/en')

diff --git a/template/en/default/bug/navigate.html.tmpl b/template/en/default/bug/navigate.html.tmpl
index f0c924160..027e3fcf9 100644
--- a/template/en/default/bug/navigate.html.tmpl
+++ b/template/en/default/bug/navigate.html.tmpl
@@ -41,6 +41,8 @@
     [% Hook.process("links") %]
     <li>&nbsp;-&nbsp;<a href="#">Top of page </a></li>
   </ul>
+  [% PROCESS "bug/tagging.html.tmpl" %]
+  <hr>
 [% END %]
 
 [% SET my_search = user.recent_search_for(bug) %]
diff --git a/template/en/default/bug/tagging.html.tmpl b/template/en/default/bug/tagging.html.tmpl
new file mode 100644
index 000000000..88c113051
--- /dev/null
+++ b/template/en/default/bug/tagging.html.tmpl
@@ -0,0 +1,52 @@
+[%# The contents of this file are subject to the Mozilla Public
+  # License Version 1.1 (the "License"); you may not use this file
+  # except in compliance with the License. You may obtain a copy of
+  # the License at http://www.mozilla.org/MPL/
+  #
+  # Software distributed under the License is distributed on an "AS
+  # IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+  # implied. See the License for the specific language governing
+  # rights and limitations under the License.
+  #
+  # The Original Code is the Bugzilla Bug Tracking System.
+  #
+  # Contributor(s): Frédéric Buclin <LpSolit@gmail.com>
+  #%]
+
+[% IF user.id && user.settings.per_bug_queries.value == "on" %]
+      <form id="list_of_bugs" action="buglist.cgi" method="get">
+        <input type="hidden" name="cmdtype" value="doit">
+        <input type="hidden" name="remtype" value="asnamed">
+        <input type="hidden" name="list_of_bugs" value="1">
+        <input type="hidden" name="bug_ids" value="[% bug.id FILTER none %]">
+        <input type="hidden" name="token" value="[% issue_hash_token(['savedsearch']) FILTER html %]">
+        <select id="lob_action" name="action" >
+          <option value="add">Add</option>
+          [% IF user.tags.size %]
+            <option value="remove">Remove</option>
+          [% END %]
+        </select>
+
+        [% IF Param('docs_urlbase') %]
+          <a href="[% docs_urlbase FILTER html %]using/finding.html#individual-bug-lists">the named tag</a>
+        [% ELSE %]
+          the named tag
+        [% END %]
+
+        [% IF user.tags.size %]
+          <select id="lob_oldqueryname" name="oldqueryname">
+            [% FOREACH tag = user.tags.keys %]
+              <option value="[% tag FILTER html %]">[% tag FILTER html %]</option>
+            [% END %]
+          </select>
+        [% END %]
+        <span id="lob_new_query_text">
+          [% " or create and add the tag" IF user.tags.size %]
+          <input class="txt" type="text" id="lob_newqueryname"
+                 size="20" maxlength="64" name="newqueryname">
+        </span>
+        <span id="lob_direction">to</span>
+        this [% terms.bug %]
+        <input type="submit" value="Save Tag" id="commit_list_of_bugs">
+      </form>
+[% END %]
diff --git a/template/en/default/filterexceptions.pl b/template/en/default/filterexceptions.pl
index 237dd7b46..39f064035 100644
--- a/template/en/default/filterexceptions.pl
+++ b/template/en/default/filterexceptions.pl
@@ -185,10 +185,6 @@
   'series.frequency * 2',
 ],
 
-'global/per-bug-queries.html.tmpl' => [
-  '" value=\"$bugids\"" IF bugids',
-],
-
 'global/select-menu.html.tmpl' => [
   'options',
   'size',
diff --git a/template/en/default/global/per-bug-queries.html.tmpl b/template/en/default/global/per-bug-queries.html.tmpl
deleted file mode 100644
index b5c2431e1..000000000
--- a/template/en/default/global/per-bug-queries.html.tmpl
+++ /dev/null
@@ -1,58 +0,0 @@
-[%# The contents of this file are subject to the Mozilla Public
-  # License Version 1.1 (the "License"); you may not use this file
-  # except in compliance with the License. You may obtain a copy of
-  # the License at http://www.mozilla.org/MPL/
-  #
-  # Software distributed under the License is distributed on an "AS
-  # IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-  # implied. See the License for the specific language governing
-  # rights and limitations under the License.
-  #
-  # The Original Code is the Bugzilla Bug Tracking System.
-  #
-  # Contributor(s): Frédéric Buclin <LpSolit@gmail.com>
-  #%]
-
-[% IF user.id && user.settings.per_bug_queries.value == "on" %]
-  <li id="links-special">
-    <div class="label"></div>
-    <ul class="links"><li class="form">
-      <form id="list_of_bugs" action="buglist.cgi" method="get">
-        <input type="hidden" name="cmdtype" value="doit">
-        <input type="hidden" name="remtype" value="asnamed">
-        <input type="hidden" name="list_of_bugs" value="1">
-        <input type="hidden" name="token" value="[% issue_hash_token(['savedsearch']) FILTER html %]">
-        <select id="lob_action" name="action" >
-          <option value="add">Add</option>
-          [% IF user.tags.size %]
-            <option value="remove">Remove</option>
-          [% END %]
-        </select>
-
-        [% IF Param('docs_urlbase') %]
-          <a href="[% docs_urlbase FILTER html %]query.html#individual-buglists">the named tag</a>
-        [% ELSE %]
-          the named tag
-        [% END %]
-
-        [% IF user.tags.size %]
-          <select id="lob_oldqueryname" name="oldqueryname">
-            [% FOREACH tag = user.tags.keys %]
-              <option value="[% tag FILTER html %]">[% tag FILTER html %]</option>
-            [% END %]
-          </select>
-        [% END %]
-        <span id="lob_new_query_text">
-          [% " or create and add the tag" IF user.tags.size %]
-          <input class="txt" type="text" id="lob_newqueryname"
-                 size="20" maxlength="64" name="newqueryname">
-        </span>
-        <span id="lob_direction">to</span>
-        [%+ terms.bugs %]
-        <input type="text" name="bug_ids" size="12" maxlength="80"
-         [%- " value=\"$bugids\"" IF bugids %]>
-        <input type="submit" value="Commit" id="commit_list_of_bugs">
-      </form>
-    </li></ul>
-  </li>
-[% END %]
diff --git a/template/en/default/global/useful-links.html.tmpl b/template/en/default/global/useful-links.html.tmpl
index dd4fed424..467719028 100644
--- a/template/en/default/global/useful-links.html.tmpl
+++ b/template/en/default/global/useful-links.html.tmpl
@@ -72,10 +72,6 @@
     </li>
   [% END %]
 
-  [%# Individual bugs addition %]
-
-  [% PROCESS "global/per-bug-queries.html.tmpl" %]
-
   [%# Sections of links to more things users can do on this installation. %]
   [% Hook.process("end") %]
 </ul>
-- 
cgit v1.2.3-24-g4f1b