summaryrefslogtreecommitdiffstats
path: root/template/en
diff options
context:
space:
mode:
authorKohei Yoshino <kohei.yoshino@gmail.com>2017-12-19 14:23:53 +0100
committerDylan William Hardison <dylan@hardison.net>2017-12-19 14:23:53 +0100
commit0bef54c7899da717a8c60e1562c838381d014c10 (patch)
treee5cb7713ad88a04b9ff5aa59a240cd6e2d94885a /template/en
parent6bcedf7e2cb411174220bff87e2c8318a210ce48 (diff)
downloadbugzilla-0bef54c7899da717a8c60e1562c838381d014c10.tar.gz
bugzilla-0bef54c7899da717a8c60e1562c838381d014c10.tar.xz
Bug 1420771 - Remove global footer
Diffstat (limited to 'template/en')
-rw-r--r--template/en/default/account/prefs/saved-searches.html.tmpl10
-rw-r--r--template/en/default/global/footer.html.tmpl23
-rw-r--r--template/en/default/global/header-search-dropdown.html.tmpl48
-rw-r--r--template/en/default/global/header.html.tmpl27
-rw-r--r--template/en/default/global/useful-links.html.tmpl73
5 files changed, 67 insertions, 114 deletions
diff --git a/template/en/default/account/prefs/saved-searches.html.tmpl b/template/en/default/account/prefs/saved-searches.html.tmpl
index ce9623372..7b71ccf6d 100644
--- a/template/en/default/account/prefs/saved-searches.html.tmpl
+++ b/template/en/default/account/prefs/saved-searches.html.tmpl
@@ -59,7 +59,7 @@
</th>
<th>
Show in
- Footer
+ Search Bar
</th>
[% may_share = user.in_group(Param('querysharegroup')) && queryshare_groups.size %]
[% IF may_share %]
@@ -137,7 +137,7 @@
%]class="bz_default_hidden"[% END %]>
<input type="checkbox" id="force_[% q.id FILTER html %]"
name="force_[% q.id FILTER html %]" value="1">
- <label for="force_[% q.id FILTER html %]">Add to footer</label>
+ <label for="force_[% q.id FILTER html %]">Add to Search Bar</label>
</span>
[% END %]
[% IF q.shared_with_users %]
@@ -151,8 +151,8 @@
[% END %]
</table>
[% IF user.can_bless %]
- <p>Note that for every search that has the "Add to footer" selected, a
- link to the shared search is added to the footer of every user that is
+ <p>Note that for every search that has the "Add to Search Bar" selected, a
+ link to the shared search is added to the Search Bar of every user that is
a direct member of the group at the time you click Submit Changes.</p>
[% END %]
</blockquote>
@@ -179,7 +179,7 @@
</th>
<th>
Show in
- Footer
+ Search Bar
</th>
</tr>
[% FOREACH q = user.queries_available %]
diff --git a/template/en/default/global/footer.html.tmpl b/template/en/default/global/footer.html.tmpl
index 29d17bccd..4578c1084 100644
--- a/template/en/default/global/footer.html.tmpl
+++ b/template/en/default/global/footer.html.tmpl
@@ -19,28 +19,7 @@
# Svetlana Harisova <light@rathedg.com>
#%]
-[%# INTERFACE:
- # This template has no interface. However, you must fulfill the interface to
- # global/useful-links.html.tmpl.
- #%]
-
-</div>
-
-[%# Migration note: below this point, this file corresponds to the old Param
- # 'footerhtml'
- #%]
-
-<div id="footer">
- <div class="intro">[% Hook.process('intro') %]</div>
-
-[%# Migration note: the old param 'blurbhtml' goes here %]
-
-[%# Migration note: useful-links.html.tmpl corresponds to %commandmenu% %]
-
- [% PROCESS "global/useful-links.html.tmpl" %]
-
- <div class="outro">[% Hook.process('outro') %]</div>
-</div>
+</div> [%# bugzilla-body %]
[% Hook.process("end") %]
diff --git a/template/en/default/global/header-search-dropdown.html.tmpl b/template/en/default/global/header-search-dropdown.html.tmpl
new file mode 100644
index 000000000..590c95d31
--- /dev/null
+++ b/template/en/default/global/header-search-dropdown.html.tmpl
@@ -0,0 +1,48 @@
+[%# 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 <gerv@gerv.net>
+ # Svetlana Harisova <light@rathedg.com>
+ # Marc Schumann <wurblzap@gmail.com>
+ #%]
+
+[% PROCESS global/variables.none.tmpl %]
+
+<div id="header-search-dropdown" class="dropdown-content right" role="listbox" style="display: none;">
+ <div id="header-search-dropdown-wrapper">
+ [% IF user.showmybugslink OR user.queries.size OR user.queries_subscribed.size %]
+ <section id="header-search-dropdown-saved">
+ <h3>Saved Searches</h3>
+ <ul role="none">
+ [% IF user.showmybugslink %][% filtered_username = user.login FILTER uri %]
+ <li role="none"><a role="option" href="[% Param('mybugstemplate').replace('%userid%', filtered_username) %]">
+ My [% terms.Bugs %]</a></li>
+ [% END %]
+ [% FOREACH q = user.queries %][% IF q.link_in_footer %]
+ <li role="none"><a role="option" href="buglist.cgi?cmdtype=runnamed&amp;namedcmd=[% q.name FILTER uri %]">
+ [% q.name FILTER html %]</a></li>
+ [% END %][% END %]
+ [% FOREACH q = user.queries_subscribed %]
+ <li role="none"><a role="option" href="buglist.cgi?cmdtype=dorem&amp;remaction=run&amp;namedcmd=
+ [% q.name FILTER uri %]&amp;sharer_id=[% q.user.id FILTER uri %]"
+ title="Shared by [% q.user.identity FILTER html %]">[% q.name FILTER html FILTER no_break %]</a></li>
+ [% END %]
+ </ul>
+ </section>
+ [% END %]
+ </div>
+</div>
diff --git a/template/en/default/global/header.html.tmpl b/template/en/default/global/header.html.tmpl
index 9baecbb53..81db1910b 100644
--- a/template/en/default/global/header.html.tmpl
+++ b/template/en/default/global/header.html.tmpl
@@ -246,16 +246,20 @@
<header id="header" role="banner">
<div class="inner">
- <h1 id="header-title" class="title"><a href="./" title="Go to home page">[% terms.BugzillaTitle %]</a></h1>
- <form role="search" id="header-search" class="quicksearch quicksearch_check_empty" action="buglist.cgi">
- <div class="searchbox-outer">
- <input role="searchbox" id="quicksearch_top" name="quicksearch"
+ <h1 id="header-title" class="title"><a href="./" title="Go to home page">[% terms.Bugzilla %]</a></h1>
+ <form role="search" id="header-search" class="quicksearch" action="buglist.cgi">
+ <section class="searchbox-outer dropdown" role="combobox" aria-expanded="false" aria-haspopup="listbox"
+ aria-owns="header-search-dropdown">
+ <h2>Quick Search</h2>
+ <input role="searchbox" id="quicksearch_top" class="dropdown-button" name="quicksearch" autocomplete="off"
value="[% quicksearch FILTER html %]" placeholder="Search [% terms.Bugs %]"
- title="Search [% terms.bugs %] by keywords">
+ title="Enter a [% terms.bug %] number or some search terms" aria-controls="header-search-dropdown"
+ aria-label="Quick Search">
<button type="submit" id="find_top" aria-label="Submit">
<span class="icon" aria-hidden="true"></span>
</button>
- </div>
+ [% PROCESS "global/header-search-dropdown.html.tmpl" %]
+ </section>
</form>
<nav id="header-nav">
<ul class="links">
@@ -286,13 +290,7 @@
aria-label="More tools…" aria-expanded="false" aria-haspopup="true" aria-controls="header-tools-menu">
<span class="icon" aria-hidden="true"></span>
</button>
- <ul class="dropdown-content" id="header-tools-menu" role="menu" style="display:none;">
- [% IF user.showmybugslink %]
- [% filtered_username = user.login FILTER uri %]
- <li role="presentation">
- <a href="[% Param('mybugstemplate').replace('%userid%', filtered_username) %]" role="menuitem" tabindex="-1">My [% terms.Bugs %]</a>
- </li>
- [% END %]
+ <ul class="dropdown-content left" id="header-tools-menu" role="menu" style="display:none;">
[% IF user.id %]
<li role="presentation">
<a href="request.cgi?requester=[% user.login FILTER uri %]&amp;requestee=[% user.login FILTER uri %]&amp;do_union=1&amp;group=type&amp;action=queue" role="menuitem" tabindex="-1">My Requests</a>
@@ -330,7 +328,7 @@
<span class="icon" aria-hidden="true"></span>
[% END %]
</button>
- <ul class="dropdown-content" id="header-account-menu" role="menu" style="display:none;">
+ <ul class="dropdown-content left" id="header-account-menu" role="menu" style="display:none;">
<li role="presentation">
<div href="user_profile" class="account-label">
<div class="name">[% user.name FILTER html %]</div>
@@ -371,6 +369,7 @@
[% END %]
</ul>
[% END %]
+ [% Hook.process('external-links') %]
</div>
</header> [%# header %]
diff --git a/template/en/default/global/useful-links.html.tmpl b/template/en/default/global/useful-links.html.tmpl
deleted file mode 100644
index 90a3268cb..000000000
--- a/template/en/default/global/useful-links.html.tmpl
+++ /dev/null
@@ -1,73 +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 <gerv@gerv.net>
- # Svetlana Harisova <light@rathedg.com>
- # Marc Schumann <wurblzap@gmail.com>
- #%]
-
-[%# Migration note: this whole file corresponds to the old %commandmenu%
- substitution param in 'footerhtml' %]
-
-[% PROCESS global/variables.none.tmpl %]
-
-<ul id="useful-links">
- [%# Saved searches %]
-
- [% IF user.showmybugslink OR user.queries.size
- OR user.queries_subscribed.size
- %]
- [% print_pipe = 0 %]
- <li id="links-saved">
- <ul class="links">
- [% IF user.showmybugslink %]
- [% filtered_username = user.login FILTER uri %]
- <li><a href="[% Param('mybugstemplate').replace('%userid%', filtered_username) %]">My [% terms.Bugs %]</a></li>
- [% print_pipe = 1 %]
- [% END %]
-
- [% FOREACH q = user.queries %]
- [% IF q.link_in_footer %]
- <li>[% '<span class="separator">| </span>' IF print_pipe %]
- <a href="buglist.cgi?cmdtype=runnamed&amp;namedcmd=[% q.name FILTER uri %]">[% q.name FILTER html %]</a></li>
- [% print_pipe = 1 %]
- [% END %]
- [% END %]
- [% new_line = print_pipe %]
- [% print_pipe = 0 %]
- [% FOREACH q = user.queries_subscribed %]
- [% IF new_line %]
- <br>
- [% new_line = 0 %]
- [% END %]
- <li>
- [% '<span class="separator">| </span>' IF print_pipe %]
- <a href="buglist.cgi?cmdtype=dorem&amp;remaction=run&amp;namedcmd=
- [% q.name FILTER uri %]&amp;sharer_id=
- [% q.user.id FILTER uri %]"
- class="shared"
- title="Shared by [% q.user.identity FILTER html %]"
- >[% q.name FILTER html FILTER no_break %]</a></li>
- [% print_pipe = 1 %]
- [% END %]
- </ul>
- </li>
- [% END %]
-
- [%# Sections of links to more things users can do on this installation. %]
- [% Hook.process("end") %]
-</ul>