From 0f2819042877f44dd921c7d72e5f70d59dc93392 Mon Sep 17 00:00:00 2001 From: Eivin Giske Skaaren Date: Mon, 11 May 2015 18:57:11 +0000 Subject: [PATCH] Bug 14189 - 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 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. Bug 14189 refactor after failed QA. Signed-off-by: Jonathan Druart Amended patch: replace tabs with spaces --- .../prog/en/includes/budgets-admin-search.inc | 10 ++++---- .../intranet-tmpl/prog/en/includes/cat-search.inc | 10 ++++---- .../prog/en/includes/cataloging-search.inc | 14 +++++----- .../prog/en/includes/checkin-search.inc | 6 ++--- .../intranet-tmpl/prog/en/includes/circ-search.inc | 10 ++++---- .../prog/en/includes/cities-admin-search.inc | 10 ++++---- .../prog/en/includes/contracts-admin-search.inc | 10 ++++---- .../prog/en/includes/currencies-admin-search.inc | 10 ++++---- .../prog/en/includes/doc-head-close.inc | 3 +++ .../intranet-tmpl/prog/en/includes/home-search.inc | 14 +++++----- .../prog/en/includes/letters-search.inc | 10 ++++---- .../prog/en/includes/patron-search-box.inc | 4 +-- .../prog/en/includes/patron-search.inc | 14 +++++----- .../prog/en/includes/patrons-admin-search.inc | 10 ++++---- .../prog/en/includes/prefs-admin-search.inc | 12 ++++----- .../prog/en/includes/printers-admin-search.inc | 10 ++++---- .../prog/en/includes/searchbox-keep-text.inc | 30 ++++++++++++++++++++++ .../prog/en/includes/serials-search.inc | 6 ++--- .../prog/en/includes/stopwords-admin-search.inc | 10 ++++---- .../prog/en/includes/suggestions-add-search.inc | 6 ++--- .../prog/en/includes/z3950-admin-search.inc | 10 ++++---- 21 files changed, 126 insertions(+), 93 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..86d9b92 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 %] 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..6eae193 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,16 +17,16 @@ [% END %] 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..1fda946 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,17 +23,17 @@ [% INCLUDE 'patron-search-box.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..4f1e2b9 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/checkin-search.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/checkin-search.inc @@ -6,14 +6,14 @@ [% END %] 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..ab730ba 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,15 +15,15 @@ [% END %] 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..41bfdc4 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,14 +15,14 @@ [% END %] 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..1d38559 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,14 +16,14 @@ [% END %] 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..cbd6e5c 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,14 +13,14 @@ [% END %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/doc-head-close.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/doc-head-close.inc index 2f80b78..a93435b 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/doc-head-close.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/doc-head-close.inc @@ -56,3 +56,6 @@ var NO_LOCAL_JACKET = _("No cover image available"); //]]> [% 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..fbf3618 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 @@ 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..806ee5e 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,14 +13,14 @@ [% END %] 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..a7e9061 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 05a0e98..646c70a 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/patron-search.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/patron-search.inc @@ -7,7 +7,7 @@
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/patrons-admin-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/patrons-admin-search.inc index 3fd9f5d..c248810 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/patrons-admin-search.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/patrons-admin-search.inc @@ -4,7 +4,7 @@ @@ -13,14 +13,14 @@ [% END %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/prefs-admin-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/prefs-admin-search.inc index 06b0752..a224c89 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/prefs-admin-search.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/prefs-admin-search.inc @@ -6,24 +6,24 @@
- +
[% INCLUDE 'patron-search-box.inc' %] [% IF ( CAN_user_catalogue ) %] [% END %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/printers-admin-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/printers-admin-search.inc index 0fbc282..46deb14 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/printers-admin-search.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/printers-admin-search.inc @@ -4,7 +4,7 @@ @@ -13,15 +13,15 @@ [% END %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/searchbox-keep-text.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/searchbox-keep-text.inc new file mode 100644 index 0000000..3d7dbc2 --- /dev/null +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/searchbox-keep-text.inc @@ -0,0 +1,30 @@ + 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..8ba2b15 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/serials-search.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/serials-search.inc @@ -22,15 +22,15 @@ [% END %] 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..964f1b6 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,15 +13,15 @@ [% END %] 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..58195c0 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,15 +18,15 @@ [% END %] 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..ffd5290 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,15 +15,15 @@ [% END %] -- 2.1.0