diff options
Diffstat (limited to 'template/en')
| -rw-r--r-- | template/en/default/admin/params/general.html.tmpl | 16 | ||||
| -rw-r--r-- | template/en/default/global/header.html.tmpl | 51 |
2 files changed, 40 insertions, 27 deletions
diff --git a/template/en/default/admin/params/general.html.tmpl b/template/en/default/admin/params/general.html.tmpl index 05e8f09a2..248d818a9 100644 --- a/template/en/default/admin/params/general.html.tmpl +++ b/template/en/default/admin/params/general.html.tmpl @@ -49,16 +49,12 @@ _ " afterward.</p>", announcehtml => - "If this field is non-empty, then $terms.Bugzilla will" - _ " display whatever is in this field at the top of every" - _ " HTML page. The HTML you put in this field is not wrapped or" - _ " enclosed in anything. You might want to wrap it inside a" - _ "<tt><div></tt>. Give the div <em>id=\"message\"</em> to get" - _ " green text inside a red box, or <em>class=\"bz_private\"</em> for" - _ " dark red on a red background. Anything defined in " - _ " <tt>skins/standard/global.css</tt>" - _ " will work. To get centered text, use <em>style=\"text-align: " - _ " center;\"</em>.", + "If this field is non-empty, then $terms.Bugzilla will display whatever is" + _ " in this field at the top of every HTML page. The HTML you put in this" + _ " field is not wrapped or enclosed in anything. You might want to wrap it" + _ " inside a <code><p></code> tag. Give it" + _ " <code>class=\"warning\"</code> to make the text red. Anything defined" + _ " in <code>skins/standard/global.css</code> will work.", upgrade_notification => "$terms.Bugzilla can inform you when a new release is available." diff --git a/template/en/default/global/header.html.tmpl b/template/en/default/global/header.html.tmpl index c7d73fe85..5db263981 100644 --- a/template/en/default/global/header.html.tmpl +++ b/template/en/default/global/header.html.tmpl @@ -245,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> @@ -370,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"> @@ -393,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 %] |