From 948d1f3d201653081fa5491edf6679e78796c3e7 Mon Sep 17 00:00:00 2001
From: Byron Jones <glob@mozilla.com>
Date: Wed, 16 Jul 2014 13:51:44 +0800
Subject: Bug 1039146: add an "open sans" alternative for the mozilla skin

---
 template/en/default/global/common-links.html.tmpl | 4 ++--
 template/en/default/global/header.html.tmpl       | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'template/en/default/global')

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+$')
 %]
-- 
cgit v1.2.3-24-g4f1b