From 9f8c3c4a307ec0d3397b40c83845aa78cb86908e Mon Sep 17 00:00:00 2001 From: Dylan William Hardison Date: Tue, 18 Jul 2017 01:30:28 -0400 Subject: Bug 1380064 - Remove references to Mozilla skin to prevent problems when default preferences are changed --- template/en/default/global/common-links.html.tmpl | 69 +---------------------- template/en/default/global/header.html.tmpl | 56 +----------------- 2 files changed, 4 insertions(+), 121 deletions(-) diff --git a/template/en/default/global/common-links.html.tmpl b/template/en/default/global/common-links.html.tmpl index 76b0855d8..c2c054b24 100644 --- a/template/en/default/global/common-links.html.tmpl +++ b/template/en/default/global/common-links.html.tmpl @@ -32,9 +32,9 @@ |
- - [%-# Work around FF bug: keep this on one line %]
[help] @@ -42,73 +42,8 @@
  • | Reports
    • - [% IF user.settings.skin.value != 'Mozilla' && user.settings.skin.value != 'Mozilla-OpenSans' %] -
  • - [% IF Param('shutdownhtml') || Bugzilla.has_flags %] - | - [% IF user.id %] - My Requests - [% ELSE %] - Requests - [% END %] - [% END %] - [%-# Work around FF bug: keep this on one line %]
    • - [% END %] - [% Hook.process('action-links') %] - [% IF user.settings.skin.value != 'Mozilla' && user.settings.skin.value != 'Mozilla-OpenSans' %] - [% IF user.login %] -
  • | Preferences
    • - [% IF user.in_group('tweakparams') || user.in_group('editusers') || user.can_bless - || (Param('useclassification') && user.in_group('editclassifications')) - || user.in_group('editcomponents') || user.in_group('admin') || user.in_group('creategroups') - || user.in_group('editkeywords') || user.in_group('bz_canusewhines') - || user.get_products_by_permission("editcomponents").size %] -
  • | Administration
    • - [% END %] - - [% PROCESS link_to_documentation %] - -
  • - | - [% IF user.authorizer.can_logout %] - Log out - [% ELSE %] - Logged in as - [% END %] - [% IF sudoer %] - [%+ sudoer.login FILTER html %] (impersonating - [%+ user.login FILTER html %] - end session) - [% ELSE %] - [%+ user.login FILTER html %] - [% END %] - [%-# Work around FF bug: keep this on one line %]
    • - [% ELSE %] - - [% PROCESS link_to_documentation %] - - [% IF Param('createemailregexp') - && user.authorizer.user_can_create_account %] -
  • - | - New Account -
    • - [% END %] - - [%# Only display one login form when we're on a LOGIN_REQUIRED page. That - # way, we're guaranteed that the user will use the form that has - # hidden_fields in it (the center form) instead of this one. Also, it's - # less confusing to have one form (as opposed to three) when you're - # required to log in. - #%] - [% IF user.authorizer.can_login && !Bugzilla.page_requires_login %] - [% PROCESS "account/auth/login-small.html.tmpl" %] - [% END %] - [% END %] - [% END %] [% Hook.process("link-row") %] diff --git a/template/en/default/global/header.html.tmpl b/template/en/default/global/header.html.tmpl index 107c69069..3b46b143a 100644 --- a/template/en/default/global/header.html.tmpl +++ b/template/en/default/global/header.html.tmpl @@ -238,7 +238,6 @@