diff options
Diffstat (limited to 'template/en')
| -rw-r--r-- | template/en/default/global/common-links.html.tmpl | 69 | ||||
| -rw-r--r-- | template/en/default/global/header.html.tmpl | 57 |
2 files changed, 122 insertions, 4 deletions
diff --git a/template/en/default/global/common-links.html.tmpl b/template/en/default/global/common-links.html.tmpl index c2c054b24..76b0855d8 100644 --- a/template/en/default/global/common-links.html.tmpl +++ b/template/en/default/global/common-links.html.tmpl @@ -32,9 +32,9 @@ <span class="separator">| </span> <form action="buglist.cgi" method="get" class='quicksearch_check_empty'> - <input class="txt" type="text" id="quicksearch[% qs_suffix FILTER html %]" name="quicksearch" + <input class="txt" type="text" id="quicksearch[% qs_suffix FILTER html %]" name="quicksearch" title="Quick Search" value="[% quicksearch FILTER html %]"> - <input class="btn" type="submit" value="Search" + <input class="btn" type="submit" value="Search" id="find[% qs_suffix FILTER html %]"> [%-# Work around FF bug: keep this on one line %]</form> [<a href="page.cgi?id=quicksearch.html" title="Quicksearch Help">help</a>] @@ -42,8 +42,73 @@ <li><span class="separator">| </span><a href="report.cgi">Reports</a></li> + [% IF user.settings.skin.value != 'Mozilla' && user.settings.skin.value != 'Mozilla-OpenSans' %] + <li> + [% IF Param('shutdownhtml') || Bugzilla.has_flags %] + <span class="separator">| </span> + [% IF user.id %] + <a href="request.cgi?requester=[% user.login FILTER uri %]&requestee= + [% user.login FILTER uri %]&do_union=1&group=type&action=queue">My Requests</a> + [% ELSE %] + <a href="request.cgi">Requests</a> + [% END %] + [% END %] + [%-# Work around FF bug: keep this on one line %]</li> + [% END %] + [% Hook.process('action-links') %] + [% 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 + || (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 %] + <li><span class="separator">| </span><a href="admin.cgi">Administration</a></li> + [% END %] + + [% PROCESS link_to_documentation %] + + <li> + <span class="separator">| </span> + [% IF user.authorizer.can_logout %] + <a href="index.cgi?logout=1">Log out</a> + [% ELSE %] + Logged in as + [% END %] + [% IF sudoer %] + [%+ sudoer.login FILTER html %] (<b>impersonating + [%+ user.login FILTER html %]</b> + <a href="relogin.cgi?action=end-sudo">end session</a>) + [% ELSE %] + [%+ user.login FILTER html %] + [% END %] + [%-# Work around FF bug: keep this on one line %]</li> + [% ELSE %] + + [% PROCESS link_to_documentation %] + + [% IF Param('createemailregexp') + && user.authorizer.user_can_create_account %] + <li id="new_account_container[% qs_suffix FILTER html %]"> + <span class="separator">| </span> + <a href="createaccount.cgi">New Account</a> + </li> + [% 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 %] </ul> [% Hook.process("link-row") %] diff --git a/template/en/default/global/header.html.tmpl b/template/en/default/global/header.html.tmpl index 1c53daab0..107c69069 100644 --- a/template/en/default/global/header.html.tmpl +++ b/template/en/default/global/header.html.tmpl @@ -238,6 +238,7 @@ <div id="header"> +[% 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> @@ -256,6 +257,7 @@ [% IF user.showmybugslink %] [% filtered_username = user.login FILTER uri %] <li><a href="[% Param('mybugstemplate').replace('%userid%', filtered_username) %]">My [% terms.Bugs %]</a></li> + [% END %] <li><a href="page.cgi?id=mydashboard.html">My Dashboard</a></li> <li><a href="user_profile">My Profile</a></li> <li><a href="page.cgi?id=user_activity.html&action=run&who=[% user.login FILTER uri %]">My Activity</a></li> @@ -323,14 +325,65 @@ [% PROCESS "global/common-links.html.tmpl" qs_suffix = "_top" %] </div> + +[% ELSE %] + +[% INCLUDE global/banner.html.tmpl %] + +<table border="0" cellspacing="0" cellpadding="0" id="titles"> +<tr> + <td id="title"> + <p>[% terms.BugzillaTitle %] + [% Hook.process("message") %] + [% " – $header" IF header %]</p> + </td> + + [% IF subheader %] + <td id="subtitle"> + <p class="subheader">[% subheader %]</p> + </td> + [% END %] + + [% IF header_addl_info %] + <td id="information"> + <p class="header_addl_info">[% header_addl_info %]</p> + </td> + [% END %] +</tr> +</table> + +<table id="lang_links_container" cellpadding="0" cellspacing="0" + class="bz_default_hidden"><tr><td> +[% IF Bugzilla.languages.size > 1 %] + <ul class="links"> + [% FOREACH lang = Bugzilla.languages.sort %] + <li>[% IF NOT loop.first %]<span class="separator"> | </span>[% END %] + [% IF lang == current_language %] + <span class="lang_current">[% lang FILTER html FILTER upper %]</span> + [% ELSE %] + <a href="#" onclick="set_language('[% lang FILTER none %]');"> + [%- lang FILTER html FILTER upper %]</a> + [% END %] + </li> + [% END %] + </ul> +[% END %] +</td></tr></table> + +[% PROCESS "global/common-links.html.tmpl" qs_suffix = "_top" %] + +[% END %] + </div> [%# header %] <div id="bugzilla-body"> [%# in most cases the "header" variable provides redundant information, however # there are exceptions where not displaying this text is problematic. %] -[% IF template.name.match('^attachment/') - && !header.match('^Bug \d+$') %] +[% IF (user.settings.skin.value == 'Mozilla' || user.settings.skin.value == 'Mozilla-OpenSans') + && template.name.match('^attachment/') + && !header.match('^Bug \d+$') +%] <h2>[% header FILTER none %]</h2> [% END %] |