From c42abcbc471c8dba01402c814de65303f4668077 Mon Sep 17 00:00:00 2001 From: Byron Jones Date: Wed, 3 Jun 2015 16:12:46 +0800 Subject: Bug 1146779: add search result navigation --- .../template/en/default/bug_modal/edit.html.tmpl | 2 + .../en/default/bug_modal/navigate.html.tmpl | 43 ++++++++++++++++++++++ extensions/BugModal/web/bug_modal.css | 23 ++++++++++++ 3 files changed, 68 insertions(+) create mode 100644 extensions/BugModal/template/en/default/bug_modal/navigate.html.tmpl (limited to 'extensions') 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 55780813f..d59717233 100644 --- a/extensions/BugModal/template/en/default/bug_modal/edit.html.tmpl +++ b/extensions/BugModal/template/en/default/bug_modal/edit.html.tmpl @@ -132,6 +132,8 @@ + + [% PROCESS bug_modal/navigate.html.tmpl %] [% END %] [%# === header === %] diff --git a/extensions/BugModal/template/en/default/bug_modal/navigate.html.tmpl b/extensions/BugModal/template/en/default/bug_modal/navigate.html.tmpl new file mode 100644 index 000000000..cb4eb4ab4 --- /dev/null +++ b/extensions/BugModal/template/en/default/bug_modal/navigate.html.tmpl @@ -0,0 +1,43 @@ +[%# 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. + #%] + + +[% + search = user.recent_search_for(bug); + RETURN UNLESS search; + last_bug_list = my_search.bug_list; + this_bug_idx = lsearch(last_bug_list, bug.id); +%] + +
+ [% terms.Bug %] List: + ([% this_bug_idx + 1 %] of [% last_bug_list.size %]) + [% INCLUDE nav_link text="❰❰ First" bug_id=last_bug_list.first %] + [% IF this_bug_idx > 0 %] + [% INCLUDE nav_link text="❰ Prev" bug_id=last_bug_list.item(this_bug_idx - 1) %] + [% ELSE %] + [% INCLUDE nav_link text="❰ Prev" bug_id="" %] + [% END %] + [% IF this_bug_idx + 1 < last_bug_list.size %] + [% INCLUDE nav_link text="Next ❱" bug_id=last_bug_list.item(this_bug_idx + 1) %] + [% ELSE %] + [% INCLUDE nav_link text="Next ❱" bug_id="" %] + [% END %] + [% INCLUDE nav_link text="Last ❱❱" bug_id=last_bug_list.last %] + Last search results +
+ +[% BLOCK nav_link %] + [% IF bug_id == "" %] + [% text FILTER none %] + [% ELSE %] + + [%~ text FILTER none ~%] + + [% END %] +[% END %] diff --git a/extensions/BugModal/web/bug_modal.css b/extensions/BugModal/web/bug_modal.css index b02fc6067..0d34039af 100644 --- a/extensions/BugModal/web/bug_modal.css +++ b/extensions/BugModal/web/bug_modal.css @@ -846,3 +846,26 @@ div.ui-tooltip { #pcs { width: 235px; } + +/* search navigation */ + +#search-nav { + background: rgba(255, 255, 255, 0.3); + padding: 4px 8px; +} + +#search-nav-label { + font-weight: bold; +} + +.search-nav-link, .search-nav-disabled { + margin-left: 4px; +} + +#search-nav-reget { + margin-left: 8px; +} + +.search-nav-disabled { + color: #777; +} -- cgit v1.2.3-24-g4f1b