summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFrédéric Buclin <LpSolit@gmail.com>2014-01-16 19:02:47 +0100
committerFrédéric Buclin <LpSolit@gmail.com>2014-01-16 19:02:47 +0100
commit77a59a459c66ac6525b0b18be481a137ef6e662e (patch)
treeca53267a340944b4e80535fcdc08e898537149c0
parent89d7ae58740710d8970b13046b7cf0277aa9d893 (diff)
downloadbugzilla-77a59a459c66ac6525b0b18be481a137ef6e662e.tar.gz
bugzilla-77a59a459c66ac6525b0b18be481a137ef6e662e.tar.xz
Bug 959402: Saved searches in the page footer cause the page to not be valid HTML5
r/a=justdave
-rw-r--r--template/en/default/global/useful-links.html.tmpl60
1 files changed, 29 insertions, 31 deletions
diff --git a/template/en/default/global/useful-links.html.tmpl b/template/en/default/global/useful-links.html.tmpl
index 5959ab656..97c7f709c 100644
--- a/template/en/default/global/useful-links.html.tmpl
+++ b/template/en/default/global/useful-links.html.tmpl
@@ -6,51 +6,48 @@
# defined by the Mozilla Public License, v. 2.0.
#%]
-[%# Migration note: this whole file corresponds to the old %commandmenu%
- substitution param in 'footerhtml' %]
-
<ul id="useful-links">
<li id="links-actions">
[% PROCESS "global/common-links.html.tmpl" qs_suffix = "_bottom" %]
</li>
[%# Saved searches %]
-
- [% IF user.showmybugslink OR user.queries.size
- OR user.queries_subscribed.size
- %]
- [% print_pipe = 0 %]
+
+ [% IF user.showmybugslink OR user.queries.size %]
<li id="links-saved">
<ul class="links">
+ [% print_pipe = 0 %]
[% IF user.showmybugslink %]
[% filtered_username = user.login FILTER uri %]
- <li><a href="[% Param('mybugstemplate').replace('%userid%', filtered_username) %]">My [% terms.Bugs %]</a></li>
+ <li>
+ <a href="[% Param('mybugstemplate').replace('%userid%', filtered_username) %]">My [% terms.Bugs %]</a>
+ </li>
[% print_pipe = 1 %]
[% END %]
[% FOREACH q = user.queries %]
- [% IF q.link_in_footer %]
- <li>[% '<span class="separator">| </span>' IF print_pipe %]
- <a href="buglist.cgi?cmdtype=runnamed&amp;namedcmd=[% q.name FILTER uri %]">[% q.name FILTER html %]</a></li>
- [% print_pipe = 1 %]
- [% END %]
+ [% NEXT UNLESS q.link_in_footer %]
+ <li>
+ [% '<span class="separator">| </span>' IF print_pipe %]
+ <a href="buglist.cgi?cmdtype=runnamed&amp;namedcmd=[% q.name FILTER uri %]">[% q.name FILTER html %]</a>
+ </li>
+ [% print_pipe = 1 %]
[% END %]
- [% new_line = print_pipe %]
- [% print_pipe = 0 %]
+ </ul>
+ </li>
+ [% END %]
+
+ [% IF user.queries_subscribed.size %]
+ <li id="links-shared">
+ <ul class="links">
[% FOREACH q = user.queries_subscribed %]
- [% IF new_line %]
- <br>
- [% new_line = 0 %]
- [% END %]
<li>
- [% '<span class="separator">| </span>' IF print_pipe %]
+ [% '<span class="separator">| </span>' UNLESS loop.first %]
<a href="buglist.cgi?cmdtype=dorem&amp;remaction=run&amp;namedcmd=
- [% q.name FILTER uri %]&amp;sharer_id=
- [% q.user.id FILTER uri %]"
- class="shared"
- title="Shared by [% q.user.identity FILTER html %]"
- >[% q.name FILTER html FILTER no_break %]</a></li>
- [% print_pipe = 1 %]
+ [%- q.name FILTER uri %]&amp;sharer_id=[% q.user.id FILTER uri %]"
+ class="shared" title="Shared by [% q.user.identity FILTER html %]">
+ [%- q.name FILTER html FILTER no_break %]</a>
+ </li>
[% END %]
</ul>
</li>
@@ -60,10 +57,11 @@
<li id="reports-saved">
<ul class="links">
[% FOREACH r = user.reports %]
- <li>[% '<span class="separator">| </span>' IF print_pipe %]
- <a href="report.cgi?[% r.query FILTER html %]&amp;saved_report_id=
- [%~ r.id FILTER uri %]">[% r.name FILTER html %]</a></li>
- [% print_pipe = 1 %]
+ <li>
+ [% '<span class="separator">| </span>' UNLESS loop.first %]
+ <a href="report.cgi?[% r.query FILTER html %]&amp;saved_report_id=
+ [%~ r.id FILTER uri %]">[% r.name FILTER html %]</a>
+ </li>
[% END %]
</ul>
</li>