summaryrefslogtreecommitdiffstats
path: root/template/en/default/global
diff options
context:
space:
mode:
authorByron Jones <glob@mozilla.com>2014-07-16 07:51:44 +0200
committerByron Jones <glob@mozilla.com>2014-07-16 07:51:44 +0200
commit948d1f3d201653081fa5491edf6679e78796c3e7 (patch)
tree023ed1c2ad096d15a30a90fa0835e4c73aa50b31 /template/en/default/global
parentccd31ef60e02d5d28130de7abbb64558fe04a141 (diff)
downloadbugzilla-948d1f3d201653081fa5491edf6679e78796c3e7.tar.gz
bugzilla-948d1f3d201653081fa5491edf6679e78796c3e7.tar.xz
Bug 1039146: add an "open sans" alternative for the mozilla skin
Diffstat (limited to 'template/en/default/global')
-rw-r--r--template/en/default/global/common-links.html.tmpl4
-rw-r--r--template/en/default/global/header.html.tmpl4
2 files changed, 4 insertions, 4 deletions
diff --git a/template/en/default/global/common-links.html.tmpl b/template/en/default/global/common-links.html.tmpl
index 53d22df71..50cfa020c 100644
--- a/template/en/default/global/common-links.html.tmpl
+++ b/template/en/default/global/common-links.html.tmpl
@@ -44,7 +44,7 @@
<li><span class="separator">| </span><a href="report.cgi">Reports</a></li>
- [% IF user.settings.skin.value != 'Mozilla' %]
+ [% IF user.settings.skin.value != 'Mozilla' && user.settings.skin.value != 'Mozilla-OpenSans' %]
<li>
[% IF Param('shutdownhtml') || Bugzilla.has_flags %]
<span class="separator">| </span>
@@ -60,7 +60,7 @@
[% Hook.process('action-links') %]
- [% IF user.settings.skin.value != 'Mozilla' %]
+ [% IF user.settings.skin.value != 'Mozilla' && user.settings.skin.value != 'Mozilla-OpenSans' %]
[% IF user.login %]
<li><span class="separator">| </span><a href="userprefs.cgi">Preferences</a></li>
[% IF user.in_group('tweakparams') || user.in_group('editusers') || user.can_bless
diff --git a/template/en/default/global/header.html.tmpl b/template/en/default/global/header.html.tmpl
index d6fc78b11..a7e65dea8 100644
--- a/template/en/default/global/header.html.tmpl
+++ b/template/en/default/global/header.html.tmpl
@@ -231,7 +231,7 @@
<div id="header">
-[% IF user.settings.skin.value == 'Mozilla' %]
+[% IF user.settings.skin.value == 'Mozilla' || user.settings.skin.value == 'Mozilla-OpenSans' %]
<div class="wrapper">
<table border="0" cellspacing="0" cellpadding="0" id="titles">
<tr>
@@ -364,7 +364,7 @@
[%# in most cases the "header" variable provides redundant information, however
# there are exceptions where not displaying this text is problematic. %]
-[% IF user.settings.skin.value == 'Mozilla'
+[% IF (user.settings.skin.value == 'Mozilla' || user.settings.skin.value == 'Mozilla-OpenSans')
&& template.name.match('^attachment/')
&& !header.match('^Bug&nbsp;\d+$')
%]