From aa3f0331fb7e0b97201afb806b777a03c9f2fca2 Mon Sep 17 00:00:00 2001 From: Kohei Yoshino Date: Thu, 30 Nov 2017 22:42:14 -0500 Subject: Bug 1420300 - Move bug tagging tool from global footer to bug footer --- docs/en/rst/using/finding.rst | 16 ++++++ .../template/en/default/bug_modal/edit.html.tmpl | 4 ++ 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 -- 7 files changed, 74 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 diff --git a/docs/en/rst/using/finding.rst b/docs/en/rst/using/finding.rst index a8e18eef2..44d4003dc 100644 --- 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 365370d50..211d673ca 100644 --- 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 @@ [% 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 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") %]
  •  - Top of page
    • + [% PROCESS "bug/tagging.html.tmpl" %] +
    [% 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 + #%] + +[% IF user.id && user.settings.per_bug_queries.value == "on" %] +
    + + + + + + + + [% IF Param('docs_urlbase') %] + the named tag + [% ELSE %] + the named tag + [% END %] + + [% IF user.tags.size %] + + [% END %] + + [% " or create and add the tag" IF user.tags.size %] + + + to + this [% terms.bug %] + +
    +[% 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 - #%] - -[% IF user.id && user.settings.per_bug_queries.value == "on" %] - -[% 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 @@ [% 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") %] -- cgit v1.2.3-24-g4f1b