summaryrefslogtreecommitdiffstats
path: root/template
diff options
context:
space:
mode:
authorFrédéric Buclin <LpSolit@gmail.com>2014-09-11 01:49:24 +0200
committerFrédéric Buclin <LpSolit@gmail.com>2014-09-11 01:49:24 +0200
commit5802599c4c23b92aee027d763d73002d1880e31e (patch)
treed31b3d0ed2558851e300a4b5f2e1fef26ae44215 /template
parentb8ecdca238744552db04acb5450ce078d9760a4c (diff)
downloadbugzilla-5802599c4c23b92aee027d763d73002d1880e31e.tar.gz
bugzilla-5802599c4c23b92aee027d763d73002d1880e31e.tar.xz
Bug 1041306: Kill global/site-navigation.html.tmpl to conform to the HTML5 spec about valid <link rel="..."> keywords
r=dkl a=sgreen
Diffstat (limited to 'template')
-rw-r--r--template/en/default/account/auth/login-small.html.tmpl3
-rw-r--r--template/en/default/filterexceptions.pl4
-rw-r--r--template/en/default/global/header.html.tmpl2
-rw-r--r--template/en/default/global/site-navigation.html.tmpl75
4 files changed, 3 insertions, 81 deletions
diff --git a/template/en/default/account/auth/login-small.html.tmpl b/template/en/default/account/auth/login-small.html.tmpl
index 5868b8671..790c135bf 100644
--- a/template/en/default/account/auth/login-small.html.tmpl
+++ b/template/en/default/account/auth/login-small.html.tmpl
@@ -9,6 +9,9 @@
[%# Use the current script name. If an empty name is returned,
# then we are accessing the home page. %]
+[% USE Bugzilla %]
+[% cgi = Bugzilla.cgi %]
+
[% login_target = cgi.url("-relative" => 1, "-query" => 1) %]
[% IF !login_target OR login_target.match("^token.cgi") %]
[% login_target = "index.cgi" %]
diff --git a/template/en/default/filterexceptions.pl b/template/en/default/filterexceptions.pl
index 0b65414d7..93c4a42a9 100644
--- a/template/en/default/filterexceptions.pl
+++ b/template/en/default/filterexceptions.pl
@@ -190,10 +190,6 @@
'script',
],
-'global/site-navigation.html.tmpl' => [
- 'bug.bug_id',
-],
-
'bug/comments.html.tmpl' => [
'comment.id',
'comment.count',
diff --git a/template/en/default/global/header.html.tmpl b/template/en/default/global/header.html.tmpl
index 5740016a6..4f6e187d8 100644
--- a/template/en/default/global/header.html.tmpl
+++ b/template/en/default/global/header.html.tmpl
@@ -85,8 +85,6 @@
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
[% END %]
- [% PROCESS "global/site-navigation.html.tmpl" %]
-
[% PROCESS 'global/setting-descs.none.tmpl' %]
[% SET yui = yui_resolve_deps(yui, yui_deps) %]
diff --git a/template/en/default/global/site-navigation.html.tmpl b/template/en/default/global/site-navigation.html.tmpl
deleted file mode 100644
index 5c68ad7f6..000000000
--- a/template/en/default/global/site-navigation.html.tmpl
+++ /dev/null
@@ -1,75 +0,0 @@
-[%# 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.
- #%]
-
-[%# INTERFACE:
- # bug.bug_id: integer. Number of current bug (for navigation purposes)
- #%]
-
-[% USE Bugzilla %]
-[% cgi = Bugzilla.cgi %]
-
-[% IF NOT (cgi.user_agent("MSIE [1-6]") OR cgi.user_agent("Mozilla/4")) %]
- <link rel="Top" href="[% urlbase FILTER html %]">
-
- [%# *** Attachment *** %]
- [% IF attachment && attachment.bug_id %]
- <link rel="Up" href="show_bug.cgi?id=[% attachment.bug_id FILTER none %]">
- [% END %]
-
-
- [%# *** Dependencies, Activity, Print-version *** %]
- [% IF bug %]
- <link rel="Show" title="Dependency Tree"
- href="showdependencytree.cgi?id=[% bug.bug_id %]&amp;hide_resolved=1">
- [% IF Param('webdotbase') %]
- <link rel="Show" title="Dependency Graph"
- href="showdependencygraph.cgi?id=[% bug.bug_id %]">
- [% END %]
-
- <link rel="Show" title="[% terms.Bug %] Activity"
- href="show_activity.cgi?id=[% bug.bug_id %]">
- <link rel="Show" title="Printer-Friendly Version"
- href="show_bug.cgi?format=multiple&amp;id=[% bug.bug_id %]">
- [% END %]
-
-
- [%# *** Saved Searches *** %]
- [% IF user.showmybugslink %]
- [% user_login = user.login FILTER uri %]
- <link rel="Saved&nbsp;Searches" title="My [% terms.Bugs %]"
- href="[% Param('mybugstemplate').replace('%userid%', user_login) %]">
- [% END %]
-
- [% FOREACH q = user.queries_subscribed %]
- <link rel="Saved&nbsp;Search"
- title="[% q.name FILTER html %] ([% q.user.login FILTER html %])"
- href="buglist.cgi?cmdtype=dorem&amp;remaction=run&amp;namedcmd=
- [% q.name FILTER uri %]&amp;sharer_id=
- [% q.user.id FILTER uri %]">
- [% END %]
-
- [%# *** Bugzilla Administration Tools *** %]
- [% IF user.login %]
- [% '<link rel="Administration" title="Parameters"
- href="editparams.cgi">' IF user.in_group('tweakparams') %]
- [% '<link rel="Administration" title="Users"
- href="editusers.cgi">' IF user.in_group('editusers') %]
- [% '<link rel="Administration" title="Products" href="editproducts.cgi">'
- IF user.in_group('editcomponents') || user.get_products_by_permission("editcomponents").size %]
- [% '<link rel="Administration" title="Flag Types"
- href="editflagtypes.cgi">' IF user.in_group('editcomponents') %]
- [% '<link rel="Administration" title="Groups"
- href="editgroups.cgi">' IF user.in_group('creategroups') %]
- [% '<link rel="Administration" title="Keywords"
- href="editkeywords.cgi">' IF user.in_group('editkeywords') %]
- [% '<link rel="Administration" title="Whining"
- href="editwhines.cgi">' IF user.in_group('bz_canusewhines') %]
- [% '<link rel="Administration" title="Sanity Check"
- href="sanitycheck.cgi">' IF user.in_group('editcomponents') %]
- [% END %]
-[% END %]