From c308ac515067c76306002aad5eef1fda6a8aabc4 Mon Sep 17 00:00:00 2001 From: Eivin Giske Skaaren Date: Mon, 11 May 2015 18:57:11 +0000 Subject: [PATCH] Bug 14189 - [SIGNED-OFF] Made text persist when clicking the tabs under the searchbox To test: Apply the patch and see that the text now is there in the search box when clicking the tabs: check in, check out etc.. (More files changed for persistent text in searchbox) Sponsored-by: Halland County Library http://bugs.koha-community.org/show_bug.cgi?id=14189 Signed-off-by: Magnus Enger This is something I have wanted quite a few times over the years... Tested by going to every main area of Koha, entering some random text into the search box and then clicking on all the available tabs to check that the entered text is carried over to all the boxes. There are a couple of places where text is not carried over, but I guess that might be because one of the boxes is structurally different to the others. These are: - "Vendor search" and "Orders search" in Acquisitions - "Search subscriptions" in Serials I have not looked at how this is implemented, just that it works as it should. --- .../prog/en/includes/budgets-admin-search.inc | 11 ++++---- .../intranet-tmpl/prog/en/includes/cat-search.inc | 11 ++++---- .../prog/en/includes/cataloging-search.inc | 15 ++++++----- .../prog/en/includes/checkin-search.inc | 7 ++--- .../intranet-tmpl/prog/en/includes/circ-search.inc | 11 ++++---- .../prog/en/includes/cities-admin-search.inc | 11 ++++---- .../prog/en/includes/contracts-admin-search.inc | 11 ++++---- .../prog/en/includes/currencies-admin-search.inc | 11 ++++---- .../intranet-tmpl/prog/en/includes/home-search.inc | 15 ++++++----- .../prog/en/includes/letters-search.inc | 11 ++++---- .../prog/en/includes/patron-search-box.inc | 4 +-- .../prog/en/includes/patron-search.inc | 15 ++++++----- .../prog/en/includes/patrons-admin-search.inc | 11 ++++---- .../prog/en/includes/prefs-admin-search.inc | 11 ++++---- .../prog/en/includes/printers-admin-search.inc | 11 ++++---- .../prog/en/includes/searchbox-keep-text.inc | 30 ++++++++++++++++++++++ .../prog/en/includes/serials-search.inc | 7 ++--- .../prog/en/includes/stopwords-admin-search.inc | 11 ++++---- .../prog/en/includes/suggestions-add-search.inc | 7 ++--- .../prog/en/includes/z3950-admin-search.inc | 11 ++++---- 20 files changed, 140 insertions(+), 92 deletions(-) create mode 100644 koha-tmpl/intranet-tmpl/prog/en/includes/searchbox-keep-text.inc diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/budgets-admin-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/budgets-admin-search.inc index b99c52a..e03e51d 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/budgets-admin-search.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/budgets-admin-search.inc @@ -5,7 +5,7 @@ [% END %] +[% INCLUDE 'searchbox-keep-text' %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/cat-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/cat-search.inc index 84cc333..32e455a 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/cat-search.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/cat-search.inc @@ -8,7 +8,7 @@ @@ -17,17 +17,18 @@ [% END %] +[% INCLUDE 'searchbox-keep-text.inc' %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/cataloging-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/cataloging-search.inc index 7315205..962c71f 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/cataloging-search.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/cataloging-search.inc @@ -5,7 +5,7 @@ @@ -14,7 +14,7 @@ @@ -23,18 +23,19 @@ [% INCLUDE 'patron-search-box.inc' %] +[% INCLUDE 'searchbox-keep-text.inc' %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/checkin-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/checkin-search.inc index cf96ab9..db213a4 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/checkin-search.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/checkin-search.inc @@ -6,16 +6,17 @@ [% END %] +[% INCLUDE 'searchbox-keep-text.inc' %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/circ-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/circ-search.inc index 5a145c6..0292114 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/circ-search.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/circ-search.inc @@ -7,7 +7,7 @@ [% END %] @@ -15,17 +15,18 @@ [% END %] +[% INCLUDE 'searchbox-keep-text.inc' %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/cities-admin-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/cities-admin-search.inc index 191f7f3..f15dbce 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/cities-admin-search.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/cities-admin-search.inc @@ -4,7 +4,7 @@ @@ -15,15 +15,16 @@ [% END %] +[% INCLUDE 'searchbox-keep-text.inc' %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/contracts-admin-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/contracts-admin-search.inc index 88145fb..ba39375 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/contracts-admin-search.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/contracts-admin-search.inc @@ -5,7 +5,7 @@ @@ -16,15 +16,16 @@ [% END %] +[% INCLUDE 'searchbox-keep-text.inc' %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/currencies-admin-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/currencies-admin-search.inc index 7ac9e3f..b421057 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/currencies-admin-search.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/currencies-admin-search.inc @@ -4,7 +4,7 @@ @@ -13,15 +13,16 @@ [% END %] +[% INCLUDE 'searchbox-keep-text.inc' %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/home-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/home-search.inc index f61ce85..7b4eded 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/home-search.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/home-search.inc @@ -7,7 +7,7 @@ [% END %] @@ -15,7 +15,7 @@ +[% INCLUDE 'searchbox-keep-text.inc' %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/letters-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/letters-search.inc index 1e28502..d22d949 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/letters-search.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/letters-search.inc @@ -4,7 +4,7 @@ @@ -13,15 +13,16 @@ [% END %] +[% INCLUDE 'searchbox-keep-text.inc' %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/patron-search-box.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/patron-search-box.inc index 87f1969..2b93441 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/patron-search-box.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/patron-search-box.inc @@ -26,7 +26,7 @@ $(document).ready(function(){
[% IF ( CircAutocompl ) %]
- + @@ -36,7 +36,7 @@ $(document).ready(function(){ [% END %]
[% ELSE %] - + [% IF ( stickyduedate ) %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/patron-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/patron-search.inc index 7739cc3..7758344 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/patron-search.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/patron-search.inc @@ -5,7 +5,7 @@
+[% INCLUDE 'searchbox-keep-text.inc' %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/serials-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/serials-search.inc index beb309c..e4d9313 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/serials-search.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/serials-search.inc @@ -22,16 +22,17 @@ [% END %] +[% INCLUDE 'searchbox-keep-text.inc' %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/stopwords-admin-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/stopwords-admin-search.inc index e45a5c7..9d5fe9a 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/stopwords-admin-search.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/stopwords-admin-search.inc @@ -4,7 +4,7 @@ @@ -13,16 +13,17 @@ [% END %] +[% INCLUDE 'searchbox-keep-text.inc' %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/suggestions-add-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/suggestions-add-search.inc index 877fcc2..5f69b5d 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/suggestions-add-search.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/suggestions-add-search.inc @@ -18,16 +18,17 @@ [% END %] +[% INCLUDE 'searchbox-keep-text.inc' %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/z3950-admin-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/z3950-admin-search.inc index f843069..16c0594 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/z3950-admin-search.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/z3950-admin-search.inc @@ -4,7 +4,7 @@ @@ -15,16 +15,17 @@ [% END %] +[% INCLUDE 'searchbox-keep-text.inc' %] -- 1.9.1