diff options
Diffstat (limited to 'template')
| -rw-r--r-- | template/en/default/bug/create/created.html.tmpl | 2 | ||||
| -rw-r--r-- | template/en/default/bug/navigate.html.tmpl | 19 | ||||
| -rw-r--r-- | template/en/default/filterexceptions.pl | 11 | ||||
| -rw-r--r-- | template/en/default/global/site-navigation.html.tmpl | 26 |
4 files changed, 10 insertions, 48 deletions
diff --git a/template/en/default/bug/create/created.html.tmpl b/template/en/default/bug/create/created.html.tmpl index 0a03a4d71..dd1be1c17 100644 --- a/template/en/default/bug/create/created.html.tmpl +++ b/template/en/default/bug/create/created.html.tmpl @@ -28,8 +28,6 @@ # this contents, see template bug/process/bugmail.html.tmpl # bug: object; Bugzilla::Bug object of the bug that was created (used in # template bug/edit.html.tmpl - # bug_list: array of integers; sorted bug list (used in template - # bug/navigate.html.tmpl) #%] [% PROCESS global/variables.none.tmpl %] diff --git a/template/en/default/bug/navigate.html.tmpl b/template/en/default/bug/navigate.html.tmpl index 7b8f3c827..9592301f7 100644 --- a/template/en/default/bug/navigate.html.tmpl +++ b/template/en/default/bug/navigate.html.tmpl @@ -36,30 +36,32 @@ <div class="navigation"> -[% IF bug_list && bug_list.size > 0 %] - [% this_bug_idx = lsearch(bug_list, bug.bug_id) %] +[% IF last_bug_list.size > 0 %] + [% this_bug_idx = lsearch(last_bug_list, bug.id) %] <b>[% terms.Bug %] List:</b> [% IF this_bug_idx != -1 %] - ([% this_bug_idx + 1 %] of [% bug_list.size %]) + ([% this_bug_idx + 1 %] of [% last_bug_list.size %]) [% END %] [% IF this_bug_idx != -1 %] - <a href="show_bug.cgi?id=[% bug_list.first %]">First</a> - <a href="show_bug.cgi?id=[% bug_list.last %]">Last</a> + <a href="show_bug.cgi?id=[% last_bug_list.first FILTER url_quote %]">First</a> + <a href="show_bug.cgi?id=[% last_bug_list.last FILTER url_quote %]">Last</a> [% END %] [% IF bug.bug_id %] [% IF this_bug_idx != -1 %] [% IF this_bug_idx > 0 %] [% prev_bug = this_bug_idx - 1 %] - <a href="show_bug.cgi?id=[% bug_list.$prev_bug %]">Prev</a> + <a href="show_bug.cgi?id= + [%- last_bug_list.$prev_bug FILTER url_quote %]">Prev</a> [% ELSE %] <i><font color="#777777">Prev</font></i> [% END %] - [% IF this_bug_idx + 1 < bug_list.size %] + [% IF this_bug_idx + 1 < last_bug_list.size %] [% next_bug = this_bug_idx + 1 %] - <a href="show_bug.cgi?id=[% bug_list.$next_bug %]">Next</a> + <a href="show_bug.cgi?id= + [%- last_bug_list.$next_bug FILTER url_quote %]">Next</a> [% ELSE %] <i><font color="#777777">Next</font></i> [% END %] @@ -72,7 +74,6 @@ <a href="buglist.cgi?regetlastlist=1">Show last search results</a> [% ELSE %] - [%# Either !bug_list || bug_list.size <= 0 %] [%# With no list, don't show link to search results %] <i><font color="#777777">First</font></i> <i><font color="#777777">Last</font></i> diff --git a/template/en/default/filterexceptions.pl b/template/en/default/filterexceptions.pl index 11c2804a8..7e0d99c36 100644 --- a/template/en/default/filterexceptions.pl +++ b/template/en/default/filterexceptions.pl @@ -250,10 +250,6 @@ ], 'global/site-navigation.html.tmpl' => [ - 'bug_list.first', - 'bug_list.$prev_bug', - 'bug_list.$next_bug', - 'bug_list.last', 'bug.bug_id', 'bug.votes', ], @@ -300,13 +296,6 @@ '" spellcheck=\"$spellcheck\"" IF spellcheck', ], -'bug/navigate.html.tmpl' => [ - 'bug_list.first', - 'bug_list.last', - 'bug_list.$prev_bug', - 'bug_list.$next_bug', -], - 'bug/show-multiple.html.tmpl' => [ 'attachment.id', 'flag.status', diff --git a/template/en/default/global/site-navigation.html.tmpl b/template/en/default/global/site-navigation.html.tmpl index 5440fe1f8..df60b7638 100644 --- a/template/en/default/global/site-navigation.html.tmpl +++ b/template/en/default/global/site-navigation.html.tmpl @@ -20,7 +20,6 @@ #%] [%# INTERFACE: - # bug_list: list of integers. List of bug numbers of current query (if any). # bug.bug_id: integer. Number of current bug (for navigation purposes) #%] @@ -32,31 +31,6 @@ [% IF NOT (cgi.user_agent("MSIE [1-6]") OR cgi.user_agent("Mozilla/4")) %] <link rel="Top" href="[% urlbase FILTER html %]"> - [%# *** Bug List Navigation *** %] - [% IF bug_list && bug_list.size > 0 %] - <link rel="Up" href="buglist.cgi?regetlastlist=1"> - - <link rel="First" href="show_bug.cgi?id=[% bug_list.first %]"> - <link rel="Last" href="show_bug.cgi?id=[% bug_list.last %]"> - - [% IF bug && bug.bug_id %] - [% current_bug_idx = lsearch(bug_list, bug.bug_id) %] - [% IF current_bug_idx != -1 %] - - [% IF current_bug_idx > 0 %] - [% prev_bug = current_bug_idx - 1 %] - <link rel="Prev" href="show_bug.cgi?id=[% bug_list.$prev_bug %]"> - [% END %] - - [% IF current_bug_idx + 1 < bug_list.size %] - [% next_bug = current_bug_idx + 1 %] - <link rel="Next" href="show_bug.cgi?id=[% bug_list.$next_bug %]"> - [% END %] - - [% END %] - [% END %] - [% END %] - [%# *** Attachment *** %] [% IF attachment && attachment.bug_id %] <link rel="Up" href="show_bug.cgi?id=[% attachment.bug_id FILTER none %]"> |