From 3bd8cfc53a818fd74f704e975ff388b95f4f8d5d Mon Sep 17 00:00:00 2001 From: Aleisha Date: Wed, 27 Apr 2016 03:34:07 +0000 Subject: [PATCH] [PASSED QA] Bug 10171: Add a search box include on advanced search and item search pages MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This patch creates a new file: adv-search.inc. This search include has no catalog search (as it makes no sense to have the catalog search tab on the advanced search page). The item search page uses home-search.inc (with catalog search) as the catalog search is different to the item search. To test: 1) Go to Search (advanced search) 2) Confirm search header is there with no catalog search tab and works as expected 3) Go to item search 4) Confirm search header is there with catalog search tab and works as expected Sponsored-by: Catalyst IT Signed-off-by: Owen Leonard Tested together with follow up patch, works as expected. Signed-off-by: Marc VĂ©ron Signed-off-by: Katrin Fischer --- .../intranet-tmpl/prog/en/includes/adv-search.inc | 42 ++++++++++++++++++++++ .../prog/en/modules/catalogue/advsearch.tt | 2 +- .../prog/en/modules/catalogue/itemsearch.tt | 1 + 3 files changed, 44 insertions(+), 1 deletion(-) create mode 100644 koha-tmpl/intranet-tmpl/prog/en/includes/adv-search.inc diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/adv-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/adv-search.inc new file mode 100644 index 0000000..d081ed2 --- /dev/null +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/adv-search.inc @@ -0,0 +1,42 @@ +
+

[% LibraryName %]

+ + +
+ diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/advsearch.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/advsearch.tt index 6019f4c..1349a80 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/advsearch.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/advsearch.tt @@ -22,8 +22,8 @@ - [% INCLUDE 'header.inc' %] +[% INCLUDE 'adv-search.inc' %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/itemsearch.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/itemsearch.tt index 09e6b84..9ce1427 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/itemsearch.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/itemsearch.tt @@ -356,6 +356,7 @@ [% INCLUDE 'header.inc' %] + [% INCLUDE 'home-search.inc' %] -- 1.9.1