From 2e5d910d9401c4fa8f105d8f9502d9e4ea27bb99 Mon Sep 17 00:00:00 2001 From: Kohei Yoshino Date: Wed, 13 Dec 2017 16:06:06 -0500 Subject: Bug 1376826 - New HTML Header for BMO --- .../en/default/account/auth/login-small.html.tmpl | 50 +++-- template/en/default/global/common-links.html.tmpl | 57 ----- template/en/default/global/header.html.tmpl | 231 +++++++++++++-------- template/en/default/global/useful-links.html.tmpl | 4 - 4 files changed, 169 insertions(+), 173 deletions(-) delete mode 100644 template/en/default/global/common-links.html.tmpl (limited to 'template/en') diff --git a/template/en/default/account/auth/login-small.html.tmpl b/template/en/default/account/auth/login-small.html.tmpl index 1f38f18b7..a64384c98 100644 --- a/template/en/default/account/auth/login-small.html.tmpl +++ b/template/en/default/account/auth/login-small.html.tmpl @@ -31,7 +31,6 @@ [% login_target = urlbase _ login_target %]
  • - | [% connector = "?" %] [% IF cgi.request_method == "GET" AND cgi.query_string %] [% connector = "&" %] @@ -40,37 +39,38 @@ +
  • - | Forgot Password -
    - - - + + + - [x] + + +
    +
    • diff --git a/template/en/default/global/common-links.html.tmpl b/template/en/default/global/common-links.html.tmpl deleted file mode 100644 index c2c054b24..000000000 --- a/template/en/default/global/common-links.html.tmpl +++ /dev/null @@ -1,57 +0,0 @@ -[%# The contents of this file are subject to the Mozilla Public - # License Version 1.1 (the "License"); you may not use this file - # except in compliance with the License. You may obtain a copy of - # the License at http://www.mozilla.org/MPL/ - # - # Software distributed under the License is distributed on an "AS - # IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or - # implied. See the License for the specific language governing - # rights and limitations under the License. - # - # The Original Code is the Bugzilla Bug Tracking System. - # - # The Initial Developer of the Original Code is Netscape Communications - # Corporation. Portions created by Netscape are - # Copyright (C) 1998 Netscape Communications Corporation. All - # Rights Reserved. - # - # Contributor(s): Gervase Markham - # Svetlana Harisova - #%] - -[% DEFAULT qs_suffix = "" %] -[% USE Bugzilla %] - -
      -
    • Home
      • -
    • | New
      • -
    • | Browse
      • -
    • | Search
      • - -
    • - | -
      - - - [%-# Work around FF bug: keep this on one line %]
      - [help] -
      • - -
    • | Reports
      • - - [% Hook.process('action-links') %] - -
    - -[% Hook.process("link-row") %] -[% BLOCK link_to_documentation %] - [% IF doc_section && Param('docs_urlbase') %] -
  • - | - Help -
    • - [% END %] -[% END %] diff --git a/template/en/default/global/header.html.tmpl b/template/en/default/global/header.html.tmpl index 90cdbd4e8..a7aed895e 100644 --- a/template/en/default/global/header.html.tmpl +++ b/template/en/default/global/header.html.tmpl @@ -19,6 +19,7 @@ # Vaskin Kissoyan # Vitaly Harisov # Svetlana Harisova + # Kohei Yoshino #%] [%# INTERFACE: @@ -90,8 +91,7 @@ # value of title anyway. To get around that problem we explicitly # set header's default value here only if it is undefined. %] [% IF !header.defined %][% header = title %][% END %] - + [%- js_BUGZILLA = { @@ -124,6 +124,7 @@ END; %] + @@ -173,7 +174,7 @@ [% FOREACH jq_name = jquery.unique %] [% starting_js_urls.push("js/jquery/plugins/$jq_name/${jq_name}-min.js") %] [% END %] - [% starting_js_urls.push('js/global.js') %] + [% starting_js_urls.push('js/global.js', 'js/dropdown.js') %] [% FOREACH asset_url = concatenate_js(starting_js_urls) %] [% PROCESS format_js_link %] @@ -244,96 +245,148 @@ # 'bannerhtml' #%] - [%# header %] + [%# header %] + +[% IF Bugzilla.request_cache.mfa_warning + AND user.mfa_required_date + AND NOT Bugzilla.request_cache.on_mfa_page %] + +[% END %]
    diff --git a/template/en/default/global/useful-links.html.tmpl b/template/en/default/global/useful-links.html.tmpl index 467719028..90a3268cb 100644 --- a/template/en/default/global/useful-links.html.tmpl +++ b/template/en/default/global/useful-links.html.tmpl @@ -26,10 +26,6 @@ [% PROCESS global/variables.none.tmpl %]