From 0bef54c7899da717a8c60e1562c838381d014c10 Mon Sep 17 00:00:00 2001 From: Kohei Yoshino Date: Tue, 19 Dec 2017 08:23:53 -0500 Subject: Bug 1420771 - Remove global footer --- .../default/account/prefs/saved-searches.html.tmpl | 10 +-- template/en/default/global/footer.html.tmpl | 23 +------ .../global/header-search-dropdown.html.tmpl | 48 ++++++++++++++ template/en/default/global/header.html.tmpl | 27 ++++---- template/en/default/global/useful-links.html.tmpl | 73 ---------------------- 5 files changed, 67 insertions(+), 114 deletions(-) create mode 100644 template/en/default/global/header-search-dropdown.html.tmpl delete mode 100644 template/en/default/global/useful-links.html.tmpl (limited to 'template/en') 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 @@ Show in - Footer + Search Bar [% may_share = user.in_group(Param('querysharegroup')) && queryshare_groups.size %] [% IF may_share %] @@ -137,7 +137,7 @@ %]class="bz_default_hidden"[% END %]> - + [% END %] [% IF q.shared_with_users %] @@ -151,8 +151,8 @@ [% END %] [% IF user.can_bless %] -

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 +

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.

[% END %] @@ -179,7 +179,7 @@ Show in - Footer + Search Bar [% 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 #%] -[%# INTERFACE: - # This template has no interface. However, you must fulfill the interface to - # global/useful-links.html.tmpl. - #%] - - - -[%# Migration note: below this point, this file corresponds to the old Param - # 'footerhtml' - #%] - - + [%# 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 + # Svetlana Harisova + # Marc Schumann + #%] + +[% PROCESS global/variables.none.tmpl %] + + 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 %] 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 - # Svetlana Harisova - # Marc Schumann - #%] - -[%# Migration note: this whole file corresponds to the old %commandmenu% - substitution param in 'footerhtml' %] - -[% PROCESS global/variables.none.tmpl %] - - -- cgit v1.2.3-24-g4f1b