diff options
| -rw-r--r-- | template/en/default/filterexceptions.pl | 4 | ||||
| -rw-r--r-- | template/en/default/global/header.html.tmpl | 2 | ||||
| -rw-r--r-- | template/en/default/global/per-bug-queries.html.tmpl | 73 | ||||
| -rw-r--r-- | template/en/default/global/useful-links.html.tmpl | 47 |
4 files changed, 61 insertions, 65 deletions
diff --git a/template/en/default/filterexceptions.pl b/template/en/default/filterexceptions.pl index 9a2060870..3a25da7ae 100644 --- a/template/en/default/filterexceptions.pl +++ b/template/en/default/filterexceptions.pl @@ -260,10 +260,6 @@ 'content', ], -'global/useful-links.html.tmpl' => [ - 'sep', -], - # You are not permitted to add any values here. Everything in this file should # be filtered unless there's an extremely good reason why not, in which case, # use the "none" dummy filter. diff --git a/template/en/default/global/header.html.tmpl b/template/en/default/global/header.html.tmpl index d629a6c23..ec906f3e6 100644 --- a/template/en/default/global/header.html.tmpl +++ b/template/en/default/global/header.html.tmpl @@ -207,7 +207,7 @@ [% IF atomlink %] <link rel="alternate" type="application/atom+xml" title="Atom feed" - href="[% atomlink FILTER html %]" /> + href="[% atomlink FILTER html %]"> [% END %] [%# Required for the 'Autodiscovery' feature in Firefox 2 and IE 7. %] diff --git a/template/en/default/global/per-bug-queries.html.tmpl b/template/en/default/global/per-bug-queries.html.tmpl index 6a63016c0..1b9b21b92 100644 --- a/template/en/default/global/per-bug-queries.html.tmpl +++ b/template/en/default/global/per-bug-queries.html.tmpl @@ -15,50 +15,49 @@ #%] [% IF user.id && user.settings.per_bug_queries.value == "on" %] - <script type="text/javascript"> - <!-- - function update_text() { - // 'lob' means list_of_bugs. - var lob_action = document.getElementById('lob_action'); - var action = lob_action.options[lob_action.selectedIndex].value; - var text = document.getElementById('lob_direction'); - var new_query_text = document.getElementById('lob_new_query_text'); + <li id="links-special"> + <script type="text/javascript"> + <!-- + function update_text() { + // 'lob' means list_of_bugs. + var lob_action = document.getElementById('lob_action'); + var action = lob_action.options[lob_action.selectedIndex].value; + var text = document.getElementById('lob_direction'); + var new_query_text = document.getElementById('lob_new_query_text'); - if (action == "add") { - text.innerHTML = "to"; - new_query_text.style.display = 'inline'; - } - else { - text.innerHTML = "from"; - new_query_text.style.display = 'none'; + if (action == "add") { + text.innerHTML = "to"; + new_query_text.style.display = 'inline'; + } + else { + text.innerHTML = "from"; + new_query_text.style.display = 'none'; + } } - } - function manage_old_lists() { - var old_lists = document.getElementById('lob_oldqueryname'); - // If there is no saved searches available, returns. - if (!old_lists) return; + function manage_old_lists() { + var old_lists = document.getElementById('lob_oldqueryname'); + // If there is no saved searches available, returns. + if (!old_lists) return; - var new_query = document.getElementById('lob_newqueryname').value; + var new_query = document.getElementById('lob_newqueryname').value; - if (new_query != "") { - old_lists.disabled = true; - } - else { - old_lists.disabled = false; + if (new_query != "") { + old_lists.disabled = true; + } + else { + old_lists.disabled = false; + } } - } - //--> - </script> + //--> + </script> - [%# Get existing lists of bugs for this user %] - [% lists_of_bugs = [] %] - [% FOREACH q = user.queries %] - [% NEXT UNLESS q.bug_ids_only %] - [% lists_of_bugs.push(q.name) %] - [% END %] - - <li id="links-special"> + [%# Get existing lists of bugs for this user %] + [% lists_of_bugs = [] %] + [% FOREACH q = user.queries %] + [% NEXT UNLESS q.bug_ids_only %] + [% lists_of_bugs.push(q.name) %] + [% END %] <div class="label"></div> <ul class="links"><li class="form"> <form id="list_of_bugs" action="buglist.cgi" method="get"> diff --git a/template/en/default/global/useful-links.html.tmpl b/template/en/default/global/useful-links.html.tmpl index 66e942802..5dff3d578 100644 --- a/template/en/default/global/useful-links.html.tmpl +++ b/template/en/default/global/useful-links.html.tmpl @@ -40,51 +40,51 @@ || user.groups.editcomponents || user.groups.admin || user.groups.creategroups || user.groups.editkeywords || user.groups.bz_canusewhines) %] - [% sep = "" FILTER html %] + [% print_pipe = 0 %] <li id="links-edit"> <div class="label">Edit: </div> <ul class="links"> [% IF user.groups.tweakparams %] - <li><span class="separator">[% sep %]</span><a href="editparams.cgi">Parameters</a></li> - [% sep = "| " %] - <li><span class="separator">[% sep %]</span><a href="editsettings.cgi">User Preferences</a></li> + <li>[% '<span class="separator">| </span>' IF print_pipe %]<a href="editparams.cgi">Parameters</a></li> + [% print_pipe = 1 %] + <li>[% '<span class="separator">| </span>' IF print_pipe %]<a href="editsettings.cgi">User Preferences</a></li> [% END %] [% IF user.groups.editcomponents %] - <li><span class="separator">[% sep %]</span><a href="sanitycheck.cgi">Sanity Check</a></li> - [% sep = "| " %] + <li>[% '<span class="separator">| </span>' IF print_pipe %]<a href="sanitycheck.cgi">Sanity Check</a></li> + [% print_pipe = 1 %] [% END %] [% IF user.groups.editusers || user.can_bless %] - <li><span class="separator">[% sep %]</span><a href="editusers.cgi">Users</a></li> - [% sep = "| " %] + <li>[% '<span class="separator">| </span>' IF print_pipe %]<a href="editusers.cgi">Users</a></li> + [% print_pipe = 1 %] [% END %] [% IF Param('useclassification') && user.groups.editclassifications %] - <li><span class="separator">[% sep %]</span><a href="editclassifications.cgi">Classifications</a></li> - [% sep = "| " %] + <li>[% '<span class="separator">| </span>' IF print_pipe %]<a href="editclassifications.cgi">Classifications</a></li> + [% print_pipe = 1 %] [% END %] [% IF user.groups.editcomponents || user.get_products_by_permission("editcomponents").size %] - <li><span class="separator">[% sep %]</span><a href="editproducts.cgi">Products</a></li> - [% sep = "| " %] + <li>[% '<span class="separator">| </span>' IF print_pipe %]<a href="editproducts.cgi">Products</a></li> + [% print_pipe = 1 %] [% END %] [% IF user.groups.editcomponents %] - <li><span class="separator">[% sep %]</span><a href="editflagtypes.cgi">Flags</a></li> - [% sep = "| " %] + <li>[% '<span class="separator">| </span>' IF print_pipe %]<a href="editflagtypes.cgi">Flags</a></li> + [% print_pipe = 1 %] [% END %] [% IF user.groups.admin %] - <li><span class="separator">[% sep %]</span><a href="editfields.cgi">Custom Fields</a></li> - [% sep = "| " %] - <li><span class="separator">[% sep %]</span><a href="editvalues.cgi">Field Values</a></li> + <li>[% '<span class="separator">| </span>' IF print_pipe %]<a href="editfields.cgi">Custom Fields</a></li> + [% print_pipe = 1 %] + <li>[% '<span class="separator">| </span>' IF print_pipe %]<a href="editvalues.cgi">Field Values</a></li> [% END %] [% IF user.groups.creategroups %] - <li><span class="separator">[% sep %]</span><a href="editgroups.cgi">Groups</a></li> - [% sep = "| " %] + <li>[% '<span class="separator">| </span>' IF print_pipe %]<a href="editgroups.cgi">Groups</a></li> + [% print_pipe = 1 %] [% END %] [% IF user.groups.editkeywords %] - <li><span class="separator">[% sep %]</span><a href="editkeywords.cgi">Keywords</a></li> - [% sep = "| " %] + <li>[% '<span class="separator">| </span>' IF print_pipe %]<a href="editkeywords.cgi">Keywords</a></li> + [% print_pipe = 1 %] [% END %] [% IF user.groups.bz_canusewhines %] - <li><span class="separator">[% sep %]</span><a href="editwhines.cgi">Whining</a></li> - [% sep = "| " %] + <li>[% '<span class="separator">| </span>' IF print_pipe %]<a href="editwhines.cgi">Whining</a></li> + [% print_pipe = 1 %] [% END %] </ul> </li> @@ -95,6 +95,7 @@ [% IF user.showmybugslink OR user.queries.size OR user.queries_subscribed.size %] + [% print_pipe = 0 %] <li id="links-saved"> <div class="label"> Saved Searches: |