Bug 1420300 - Move bug tagging tool from global footer to bug footer

diff --git a/docs/en/rst/using/finding.rst b/docs/en/rst/using/finding.rst
index a8e18eef211d3c7b0055cbe6b243ce8c8f5ae6f9..44d4003dca43775646b84c909d4facae4fcccf68 100644 (file)
--- a/docs/en/rst/using/finding.rst
+++ b/docs/en/rst/using/finding.rst
@@ -257,3 +257,19 @@ Remember Search As:
     You can give a search a name and remember it; a link will appear
     in your page footer giving you quick access to run it again later.
 
+Individual Bug Lists
+====================
+
+You can add and remove tags from individual bugs, which let you find and manage
+bugs more easily. Tags are per-user and so are only visible and editable by the
+user who created them. You can then run queries using tags as a criteria, either
+by using the Advanced Search form, or simply by typing "tag:my_tag_name" in the
+QuickSearch box at the top (or bottom) of the page. Tags can also be displayed
+in bug lists.
+
+This feature is useful when you want to keep track of several bugs, but for
+different reasons. Instead of adding yourself to the CC list of all these bugs
+and mixing all these reasons, you can now store these bugs in separate lists,
+e.g. “Keep in mind”, “Interesting bugs”, or “Triage”. One big advantage of this
+way to manage bugs is that you can easily add or remove tags from bugs one by
+one.

diff --git a/extensions/BugModal/template/en/default/bug_modal/edit.html.tmpl b/extensions/BugModal/template/en/default/bug_modal/edit.html.tmpl
index 365370d506e542063fef82182dbb9d81cf436695..211d673cab64739e84b312e3dfd966cc0f21786c 100644 (file)
--- a/extensions/BugModal/template/en/default/bug_modal/edit.html.tmpl
+++ b/extensions/BugModal/template/en/default/bug_modal/edit.html.tmpl
@@ -1385,6 +1385,10 @@
   </form>
 [% END %]
 
+[%# === individual bugs addition === %]
+
+[% PROCESS "bug/tagging.html.tmpl" %]
+
 [%# === blocks === %]
 
 [% BLOCK new_comment %]

diff --git a/template/en/default/bug/navigate.html.tmpl b/template/en/default/bug/navigate.html.tmpl
index f0c92416008ec5eb63105e324d40f59580c62d9f..027e3fcf963727dd516705368baf5afce0f010db 100644 (file)
--- 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/global/per-bug-queries.html.tmpl b/template/en/default/bug/tagging.html.tmpl
similarity index 81%
rename from template/en/default/global/per-bug-queries.html.tmpl
rename to template/en/default/bug/tagging.html.tmpl
index b5c2431e170cb1cf669fefd44060d9c1588d39a7..88c11305112e4ae99184759472f4d005feb28578 100644 (file)
--- a/template/en/default/global/per-bug-queries.html.tmpl
+++ b/template/en/default/bug/tagging.html.tmpl
@@ -14,13 +14,11 @@
   #%]
 
 [% 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="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>
@@ -30,7 +28,7 @@
         </select>
 
         [% IF Param('docs_urlbase') %]
-          <a href="[% docs_urlbase FILTER html %]query.html#individual-buglists">the named tag</a>
+          <a href="[% docs_urlbase FILTER html %]using/finding.html#individual-bug-lists">the named tag</a>
         [% ELSE %]
           the named tag
         [% END %]
@@ -48,11 +46,7 @@
                  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">
+        this [% terms.bug %]
+        <input type="submit" value="Save Tag" id="commit_list_of_bugs">
       </form>
-    </li></ul>
-  </li>
 [% END %]

diff --git a/template/en/default/filterexceptions.pl b/template/en/default/filterexceptions.pl
index 237dd7b464dcaf8145ed2b51c19f06e18be90ab9..39f064035d2681f2c01b42b36b56f76c9cc10483 100644 (file)
--- 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/useful-links.html.tmpl b/template/en/default/global/useful-links.html.tmpl
index dd4fed424fdf1f2c6521ae2e14f25eb47eedc302..467719028ddc496a9d028fb49e4aaafb156dd7f6 100644 (file)
--- 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>