From 72cf76f29516f9c8fac1a95cecc0aa42aa5e9ed6 Mon Sep 17 00:00:00 2001 From: Julian Maurice Date: Fri, 29 Jul 2022 13:29:10 +0200 Subject: [PATCH] Bug 30952: Fix the 'keep_text' feature of the search bar Text in one form should be copied in other forms when switching tab Issue #2 Signed-off-by: Martin Renvoize Signed-off-by: Owen Leonard Signed-off-by: Nick Clemens Signed-off-by: Tomas Cohen Arazi --- .../prog/en/includes/adv-search.inc | 8 ++++---- .../prog/en/includes/authorities-search.inc | 16 ++++++++-------- .../prog/en/includes/budgets-admin-search.inc | 6 +++--- .../prog/en/includes/cat-search.inc | 8 ++++---- .../prog/en/includes/cataloging-search.inc | 10 +++++----- .../prog/en/includes/checkin-search.inc | 6 +++--- .../prog/en/includes/circ-search.inc | 8 ++++---- .../prog/en/includes/cities-admin-search.inc | 6 +++--- .../prog/en/includes/contracts-admin-search.inc | 6 +++--- .../prog/en/includes/currencies-admin-search.inc | 6 +++--- .../prog/en/includes/desks-admin-search.inc | 6 +++--- .../prog/en/includes/home-search.inc | 10 +++++----- .../prog/en/includes/letters-search.inc | 6 +++--- .../prog/en/includes/patron-search-header.inc | 10 +++++----- .../prog/en/includes/patrons-admin-search.inc | 6 +++--- .../prog/en/includes/prefs-admin-search.inc | 6 +++--- .../prog/en/includes/serials-search.inc | 6 +++--- .../prog/en/includes/suggestions-add-search.inc | 6 +++--- .../prog/en/includes/z3950-admin-search.inc | 6 +++--- 19 files changed, 71 insertions(+), 71 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/adv-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/adv-search.inc index fa946d46d9..ec12a05f34 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/adv-search.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/adv-search.inc @@ -7,10 +7,10 @@ [% INCLUDE 'member-search-box.inc' %]
    - [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]
  • [% END %] - [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]
  • [% END %] - [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]
  • [% END %] - [% IF ( CAN_user_borrowers_edit_borrowers ) %]
  • [% END %] + [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]
  • [% END %] + [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]
  • [% END %] + [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]
  • [% END %] + [% IF ( CAN_user_borrowers_edit_borrowers ) %]
  • [% END %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/authorities-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/authorities-search.inc index 220338d17c..497cd15145 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/authorities-search.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/authorities-search.inc @@ -80,7 +80,7 @@ [% INCLUDE authtype %] - + @@ -107,7 +107,7 @@ [% INCLUDE authtype %] - + @@ -132,7 +132,7 @@ [% INCLUDE authtype %] - + @@ -159,7 +159,7 @@ [% INCLUDE authtype %] - + @@ -173,10 +173,10 @@
    -
  • $a
  • -
  • -
  • -
  • +
  • $a
  • +
  • +
  • +
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 3115c824a6..b257f5c9a7 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 @@ -34,9 +34,9 @@ [% INCLUDE 'catalogue-search-box.inc' %]
    -
  • - [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]
  • [% END %] - [% IF ( CAN_user_catalogue ) %]
  • [% END %] +
  • + [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]
  • [% END %] + [% IF ( CAN_user_catalogue ) %]
  • [% 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 44ffa399e0..b8e21ad7f7 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/cat-search.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/cat-search.inc @@ -6,10 +6,10 @@ [% INCLUDE 'catalogue-search-box.inc' %]
    - [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]
  • [% END %] - [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]
  • [% END %] - [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]
  • [% END %] - [% IF ( CAN_user_catalogue ) %]
  • [% END %] + [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]
  • [% END %] + [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]
  • [% END %] + [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]
  • [% END %] + [% IF ( CAN_user_catalogue ) %]
  • [% 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 38baa01753..d1bf930fa2 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/cataloging-search.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/cataloging-search.inc @@ -25,11 +25,11 @@ [% INCLUDE 'catalogue-search-box.inc' %]
    -
  • - [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]
  • [% END %] - [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]
  • [% END %] - [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]
  • [% END %] -
  • +
  • + [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]
  • [% END %] + [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]
  • [% END %] + [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]
  • [% END %] +
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 724abc5dcf..eb19d92eff 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/checkin-search.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/checkin-search.inc @@ -8,9 +8,9 @@ [% INCLUDE 'catalogue-search-box.inc' %]
    - [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]
  • [% END %] - [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]
  • [% END %] - [% IF ( CAN_user_catalogue ) %]
  • [% END %] + [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]
  • [% END %] + [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]
  • [% END %] + [% IF ( CAN_user_catalogue ) %]
  • [% 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 2d7b1eade3..438c765bac 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/circ-search.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/circ-search.inc @@ -9,10 +9,10 @@ [% INCLUDE 'catalogue-search-box.inc' %]
    - [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]
  • [% END %] - [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]
  • [% END %] - [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]
  • [% END %] - [% IF ( CAN_user_catalogue ) %]
  • [% END %] + [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]
  • [% END %] + [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]
  • [% END %] + [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]
  • [% END %] + [% IF ( CAN_user_catalogue ) %]
  • [% 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 f53b2ddb86..e45caf3e4b 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 @@ -19,9 +19,9 @@ [% INCLUDE 'catalogue-search-box.inc' %]
    -
  • - [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]
  • [% END %] - [% IF ( CAN_user_catalogue ) %]
  • [% END %] +
  • + [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]
  • [% END %] + [% IF ( CAN_user_catalogue ) %]
  • [% 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 82bb93c834..ac8475a300 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 @@ -20,9 +20,9 @@ [% INCLUDE 'catalogue-search-box.inc' %]
    -
  • - [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]
  • [% END %] - [% IF ( CAN_user_catalogue ) %]
  • [% END %] +
  • + [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]
  • [% END %] + [% IF ( CAN_user_catalogue ) %]
  • [% 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 73c1042e2a..8320442132 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 @@ -20,9 +20,9 @@ [% INCLUDE 'catalogue-search-box.inc' %]
    -
  • - [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]
  • [% END %] - [% IF ( CAN_user_catalogue ) %]
  • [% END %] +
  • + [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]
  • [% END %] + [% IF ( CAN_user_catalogue ) %]
  • [% END %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/desks-admin-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/desks-admin-search.inc index f7978ba4b5..ef852ae301 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/desks-admin-search.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/desks-admin-search.inc @@ -19,9 +19,9 @@ [% INCLUDE 'catalogue-search-box.inc' %]
    -
  • - [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]
  • [% END %] - [% IF ( CAN_user_catalogue ) %]
  • [% END %] +
  • + [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]
  • [% END %] + [% IF ( CAN_user_catalogue ) %]
  • [% END %]
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 cf24b90637..bcda7f2101 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/home-search.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/home-search.inc @@ -8,11 +8,11 @@ [% INCLUDE 'catalogue-search-box.inc' %]
    - [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]
  • [% END %] - [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]
  • [% END %] - [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]
  • [% END %] - [% IF ( CAN_user_borrowers_edit_borrowers ) %]
  • [% END %] - [% IF ( CAN_user_catalogue ) %]
  • [% END %] + [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]
  • [% END %] + [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]
  • [% END %] + [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]
  • [% END %] + [% IF ( CAN_user_borrowers_edit_borrowers ) %]
  • [% END %] + [% IF ( CAN_user_catalogue ) %]
  • [% END %]
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 b9964d1701..733bd882c1 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/letters-search.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/letters-search.inc @@ -20,9 +20,9 @@ [% INCLUDE 'catalogue-search-box.inc' %]
    -
  • - [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]
  • [% END %] - [% IF ( CAN_user_catalogue ) %]
  • [% END %] +
  • + [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]
  • [% END %] + [% IF ( CAN_user_catalogue ) %]
  • [% END %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/patron-search-header.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/patron-search-header.inc index 93d49664a6..110b47059c 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/patron-search-header.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/patron-search-header.inc @@ -6,10 +6,10 @@ [% INCLUDE 'catalogue-search-box.inc' %]
    -
  • - [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]
  • [% END %] - [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]
  • [% END %] - [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]
  • [% END %] - [% IF ( CAN_user_catalogue ) %]
  • [% END %] +
  • + [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]
  • [% END %] + [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]
  • [% END %] + [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]
  • [% END %] + [% IF ( CAN_user_catalogue ) %]
  • [% END %]
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 c6e81744e4..b4cdf6091e 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 @@ -20,9 +20,9 @@ [% INCLUDE 'catalogue-search-box.inc' %]
    -
  • - [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]
  • [% END %] - [% IF ( CAN_user_catalogue ) %]
  • [% END %] +
  • + [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]
  • [% END %] + [% IF ( CAN_user_catalogue ) %]
  • [% 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 542755fdd7..166a6c2bb2 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 @@ -21,9 +21,9 @@ [% INCLUDE 'catalogue-search-box.inc' %]
    -
  • - [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]
  • [% END %] - [% IF ( CAN_user_catalogue ) %]
  • [% END %] +
  • + [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]
  • [% END %] + [% IF ( CAN_user_catalogue ) %]
  • [% END %]
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 7884b07355..bea5c4cd5e 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/serials-search.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/serials-search.inc @@ -31,9 +31,9 @@ [% INCLUDE 'catalogue-search-box.inc' %]
    -
  • - [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]
  • [% END %] - [% IF ( CAN_user_catalogue ) %]
  • [% END %] +
  • + [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]
  • [% END %] + [% IF ( CAN_user_catalogue ) %]
  • [% 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 7b6fd3160e..6e09d35f9f 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 @@ -23,9 +23,9 @@ [% INCLUDE 'catalogue-search-box.inc' %]
    -
  • - [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]
  • [% END %] - [% IF ( CAN_user_catalogue ) %]
  • [% END %] +
  • + [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]
  • [% END %] + [% IF ( CAN_user_catalogue ) %]
  • [% 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 31ebf269ad..f1e3b7e066 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 @@ -20,9 +20,9 @@ [% INCLUDE 'catalogue-search-box.inc' %]
    -
  • Z39.50
  • - [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]
  • [% END %] - [% IF ( CAN_user_catalogue ) %]
  • [% END %] +
  • Z39.50
  • + [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]
  • [% END %] + [% IF ( CAN_user_catalogue ) %]
  • [% END %]
-- 2.39.5