diff options
Diffstat (limited to 'template/en/default/global/header.html.tmpl')
| -rw-r--r-- | template/en/default/global/header.html.tmpl | 66 |
1 files changed, 42 insertions, 24 deletions
diff --git a/template/en/default/global/header.html.tmpl b/template/en/default/global/header.html.tmpl index 9db9a1404..5db263981 100644 --- a/template/en/default/global/header.html.tmpl +++ b/template/en/default/global/header.html.tmpl @@ -98,7 +98,6 @@ <meta charset="UTF-8"> [% END %] [% USE Bugzilla %] - <base href="[% urlbase FILTER html %]"> [% IF Bugzilla.cgi.should_block_referrer %] <meta name="referrer" content="origin"> @@ -107,6 +106,10 @@ [% END %] [%- js_BUGZILLA = { + user => { + # TODO: Move all properties form bug_modal/header.html.tmpl + login => user.login, + }, param => { maxattachmentsize => Param('maxattachmentsize'), maxusermatches => Param('maxusermatches'), @@ -242,6 +245,40 @@ #%] <div id="wrapper"> + +<aside id="message-container" role="complementary"> + <noscript> + <div class="noscript"> + <div class="inner"> + <p>Please enable JavaScript in your browser to use all the features on this site.</p> + </div> + </div> + </noscript> + [% IF Bugzilla.request_cache.mfa_warning + AND user.mfa_required_date + AND NOT Bugzilla.request_cache.on_mfa_page %] + <div class="warning"> + <div class="inner"> + <p> + Please <a href="userprefs.cgi?tab=mfa">enable two-factor authentication</a> + [% IF Param('mfa_group_grace_period') %] + before <i>[% user.mfa_required_date FILTER time %]</i>. + [% ELSE %] + now. + [% END %] + </p> + </div> + </div> + [% END %] + [% IF Param('announcehtml') %] + <div class="announcement"> + <div class="inner"> + [% Param('announcehtml') FILTER none %] + </div> + </div> + [% END %] +</aside> + <header id="header" role="banner"> <div class="inner"> <h1 id="header-title" class="title"><a href="./" title="Go to home page">[% terms.Bugzilla %]</a></h1> @@ -342,12 +379,10 @@ <li role="presentation"> <a href="userprefs.cgi" role="menuitem" tabindex="-1">Preferences</a> </li> - [% IF user.authorizer.can_logout %] - <li role="separator"></li> - <li role="presentation"> - <a href="index.cgi?logout=1" role="menuitem" tabindex="-1">Log out</a> - </li> - [% END %] + <li role="separator"></li> + <li role="presentation"> + <a href="index.cgi?logout=1" role="menuitem" tabindex="-1">Log out</a> + </li> [% IF sudoer %] <li role="presentation"> <a href="relogin.cgi?action=end-sudo" role="menuitem" tabindex="-1">End sudo session impersonating [% user.login FILTER html %]</a> @@ -369,19 +404,6 @@ </div> </header> [%# header %] -[% IF Bugzilla.request_cache.mfa_warning - AND user.mfa_required_date - AND NOT Bugzilla.request_cache.on_mfa_page %] - <aside id="mfa-warning"> - Please <a href="userprefs.cgi?tab=mfa">enable two-factor authentication</a> - [% IF Param('mfa_group_grace_period') %] - before <i>[% user.mfa_required_date FILTER time %]</i>. - [% ELSE %] - now. - [% END %] - </aside> -[% END %] - <main id="bugzilla-body" tabindex="-1"> <div id="main-inner"> @@ -392,10 +414,6 @@ <h2>[% header FILTER none %]</h2> [% END %] -[% IF Param('announcehtml') %] -[% Param('announcehtml') FILTER none %] -[% END %] - [% IF message %] <div id="message">[% message %]</div> [% END %] |