From 16414374aa7e3e8cb6863943646ea57e8128be96 Mon Sep 17 00:00:00 2001 From: Aleisha Amohia Date: Mon, 19 Dec 2016 22:56:12 +0000 Subject: [PATCH] Bug 17793: Make sysprefs search show on all Admin pages This patch is amended to use the sysprefs search on all Administration pages that do not have their own custom search. To test: 1) Go to Administration 2) Notice Catalogue search at the top - seems out of place. 3) Apply patch and refresh page. 4) Notice admin / sysprefs search now shows and is more appropriate. 5) Confirm searching for sysprefs still works This patch affects the following pages: - admin-home.pl - audio_alerts.pl - authtypes.pl - auth_tag_structure.pl - authorised_values.pl - biblio_framework.pl - marctagstructure.pl - branch_transfer_limits.pl - branches.pl - checkmarc.pl - classsources.pl - columns_settings.pl - didyoumean.pl - edi_accounts.pl - edi_ean_accounts.pl - fieldmapping.pl - item_circulation_alerts.pl - items_search_fields.pl - items_search_field.pl - item_types.pl - koha2marklinks.pl - matching-rules.pl - oai_sets.pl - oai_set_mappings.pl - patron-attr-types.pl - smart-rules.pl - transport-cost-matrix.pl - sms_providers.pl Sponsored-by: Catalyst IT Signed-off-by: Mark Tompsett Signed-off-by: Jonathan Druart Signed-off-by: Kyle M Hall --- koha-tmpl/intranet-tmpl/prog/en/modules/admin/admin-home.tt | 2 +- koha-tmpl/intranet-tmpl/prog/en/modules/admin/audio_alerts.tt | 2 +- .../intranet-tmpl/prog/en/modules/admin/auth_tag_structure.tt | 2 +- .../intranet-tmpl/prog/en/modules/admin/authorised_values.tt | 2 +- koha-tmpl/intranet-tmpl/prog/en/modules/admin/authtypes.tt | 2 +- .../intranet-tmpl/prog/en/modules/admin/biblio_framework.tt | 2 +- .../prog/en/modules/admin/branch_transfer_limits.tt | 2 +- koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tt | 2 +- koha-tmpl/intranet-tmpl/prog/en/modules/admin/checkmarc.tt | 2 +- koha-tmpl/intranet-tmpl/prog/en/modules/admin/classsources.tt | 2 +- .../intranet-tmpl/prog/en/modules/admin/columns_settings.tt | 2 +- koha-tmpl/intranet-tmpl/prog/en/modules/admin/didyoumean.tt | 2 +- koha-tmpl/intranet-tmpl/prog/en/modules/admin/edi_accounts.tt | 2 +- .../intranet-tmpl/prog/en/modules/admin/edi_ean_accounts.tt | 2 +- koha-tmpl/intranet-tmpl/prog/en/modules/admin/fieldmapping.tt | 2 +- .../prog/en/modules/admin/item_circulation_alerts.tt | 2 +- .../intranet-tmpl/prog/en/modules/admin/items_search_field.tt | 2 +- .../intranet-tmpl/prog/en/modules/admin/items_search_fields.tt | 2 +- koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tt | 2 +- koha-tmpl/intranet-tmpl/prog/en/modules/admin/koha2marclinks.tt | 2 +- .../intranet-tmpl/prog/en/modules/admin/marctagstructure.tt | 2 +- koha-tmpl/intranet-tmpl/prog/en/modules/admin/matching-rules.tt | 2 +- .../intranet-tmpl/prog/en/modules/admin/oai_set_mappings.tt | 2 +- koha-tmpl/intranet-tmpl/prog/en/modules/admin/oai_sets.tt | 2 +- .../intranet-tmpl/prog/en/modules/admin/patron-attr-types.tt | 2 +- koha-tmpl/intranet-tmpl/prog/en/modules/admin/smart-rules.tt | 2 +- koha-tmpl/intranet-tmpl/prog/en/modules/admin/sms_providers.tt | 2 +- .../prog/en/modules/admin/transport-cost-matrix.tt | 2 +- 28 files changed, 28 insertions(+), 28 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/admin-home.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/admin-home.tt index 6c128d6baf..25c0e70e22 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/admin-home.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/admin-home.tt @@ -5,7 +5,7 @@ [% INCLUDE 'header.inc' %] -[% INCLUDE 'cat-search.inc' %] +[% INCLUDE 'prefs-admin-search.inc' %]

Home › Administration

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/audio_alerts.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/audio_alerts.tt index 400ffe3f89..340198e0cd 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/audio_alerts.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/audio_alerts.tt @@ -11,7 +11,7 @@ [% INCLUDE 'header.inc' %] -[% INCLUDE 'cat-search.inc' %] +[% INCLUDE 'prefs-admin-search.inc' %]

Home › Administration › Audio alerts

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_tag_structure.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_tag_structure.tt index 72810919f4..f083e25ad8 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_tag_structure.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_tag_structure.tt @@ -23,7 +23,7 @@ [% INCLUDE 'header.inc' %] -[% INCLUDE 'cat-search.inc' %] +[% INCLUDE 'prefs-admin-search.inc' %]

Home › Administration › Authority types › diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/authorised_values.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/authorised_values.tt index 34aad4465d..5aee840622 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/authorised_values.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/authorised_values.tt @@ -55,7 +55,7 @@ $(document).ready(function() { [% INCLUDE 'header.inc' %] -[% INCLUDE 'cat-search.inc' %] +[% INCLUDE 'prefs-admin-search.inc' %]

Home › Administration › [% IF op == 'add_form' %] Authorized values › [% IF ( action_modify ) %]Modify authorized value[% END %] [% IF ( action_add_value ) %]New authorized value[% END %] [% IF ( action_add_category ) %]New category[% END %][% END %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/authtypes.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/authtypes.tt index 699549e3e1..f76f394f73 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/authtypes.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/authtypes.tt @@ -28,7 +28,7 @@ [% INCLUDE 'header.inc' %] -[% INCLUDE 'cat-search.inc' %] +[% INCLUDE 'prefs-admin-search.inc' %]

Home diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/biblio_framework.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/biblio_framework.tt index 7da5110bfd..4edc86188f 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/biblio_framework.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/biblio_framework.tt @@ -22,7 +22,7 @@ [% INCLUDE 'header.inc' %] -[% INCLUDE 'cat-search.inc' %] +[% INCLUDE 'prefs-admin-search.inc' %]

Home diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branch_transfer_limits.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branch_transfer_limits.tt index 3d041287da..2ff8f842f2 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branch_transfer_limits.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branch_transfer_limits.tt @@ -45,7 +45,7 @@ [% INCLUDE 'header.inc' %] -[% INCLUDE 'cat-search.inc' %] +[% INCLUDE 'prefs-admin-search.inc' %]

Home › Administration › Set library checkin and transfer policy

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tt index 5c1f98f9b9..1a156dec71 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tt @@ -56,7 +56,7 @@ tinyMCE.init({ [% INCLUDE 'header.inc' %] -[% INCLUDE 'cat-search.inc' %] +[% INCLUDE 'prefs-admin-search.inc' %]

Home diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/checkmarc.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/checkmarc.tt index de9129e7d7..7fdf2d0f1f 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/checkmarc.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/checkmarc.tt @@ -5,7 +5,7 @@ [% INCLUDE 'header.inc' %] -[% INCLUDE 'cat-search.inc' %] +[% INCLUDE 'prefs-admin-search.inc' %]

Home › Administration › MARC check [% IF ( total ) %]: [% total %] errors found[% ELSE %] : Configuration OK![% END %]

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/classsources.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/classsources.tt index bb79c38076..be817dc4b1 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/classsources.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/classsources.tt @@ -21,7 +21,7 @@ [% INCLUDE 'header.inc' %] -[% INCLUDE 'cat-search.inc' %] +[% INCLUDE 'prefs-admin-search.inc' %]

Home diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/columns_settings.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/columns_settings.tt index 4a7bb4e827..4bdaf07c54 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/columns_settings.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/columns_settings.tt @@ -105,7 +105,7 @@ [% INCLUDE 'header.inc' %] -[% INCLUDE 'cat-search.inc' %] +[% INCLUDE 'prefs-admin-search.inc' %]

Home › Administration › Columns settings

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/didyoumean.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/didyoumean.tt index 0fb602d288..fa4e52b92b 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/didyoumean.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/didyoumean.tt @@ -70,7 +70,7 @@ [% INCLUDE 'header.inc' %] -[% INCLUDE 'cat-search.inc' %] +[% INCLUDE 'prefs-admin-search.inc' %]

Home › Administration › Did you mean?

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/edi_accounts.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/edi_accounts.tt index 4779d33d4a..30791ad421 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/edi_accounts.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/edi_accounts.tt @@ -15,7 +15,7 @@ [% INCLUDE 'header.inc' %] -[% INCLUDE 'cat-search.inc' %] +[% INCLUDE 'prefs-admin-search.inc' %]

Home diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/edi_ean_accounts.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/edi_ean_accounts.tt index d4cac6894f..2620bf0ed0 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/edi_ean_accounts.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/edi_ean_accounts.tt @@ -15,7 +15,7 @@ [% INCLUDE 'header.inc' %] -[% INCLUDE 'cat-search.inc' %] +[% INCLUDE 'prefs-admin-search.inc' %]

Home diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/fieldmapping.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/fieldmapping.tt index 898e60ab08..fed90a93c5 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/fieldmapping.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/fieldmapping.tt @@ -18,7 +18,7 @@ $(document).ready(function() { [% INCLUDE 'header.inc' %] -[% INCLUDE 'cat-search.inc' %] +[% INCLUDE 'prefs-admin-search.inc' %]

Home › Administration › Keyword to MARC mapping

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/item_circulation_alerts.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/item_circulation_alerts.tt index d55801fc04..a765174943 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/item_circulation_alerts.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/item_circulation_alerts.tt @@ -88,7 +88,7 @@ $(function(){ [% INCLUDE 'header.inc' %] -[% INCLUDE 'cat-search.inc' %] +[% INCLUDE 'prefs-admin-search.inc' %]

Home › Administration › Item circulation alerts

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/items_search_field.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/items_search_field.tt index 5a69d716c4..cd29b2f995 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/items_search_field.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/items_search_field.tt @@ -5,7 +5,7 @@ [% INCLUDE 'header.inc' %] - [% INCLUDE 'cat-search.inc' %] + [% INCLUDE 'prefs-admin-search.inc' %]

Home › Administration › diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/items_search_fields.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/items_search_fields.tt index d3dc4f50fd..eb6774969f 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/items_search_fields.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/items_search_fields.tt @@ -9,7 +9,7 @@ [% INCLUDE 'header.inc' %] - [% INCLUDE 'cat-search.inc' %] + [% INCLUDE 'prefs-admin-search.inc' %]

Home › Administration › diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tt index 1d8c2cf166..040b52e538 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tt @@ -58,7 +58,7 @@ Data deleted [% INCLUDE 'header.inc' %] -[% INCLUDE 'cat-search.inc' %] +[% INCLUDE 'prefs-admin-search.inc' %]

Home › Administration › [% IF op == 'add_form' %] [% IF itemtype %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/koha2marclinks.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/koha2marclinks.tt index 5949983f25..1cf606ab85 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/koha2marclinks.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/koha2marclinks.tt @@ -20,7 +20,7 @@ $(document).ready(function() { [% INCLUDE 'header.inc' %] -[% INCLUDE 'cat-search.inc' %] +[% INCLUDE 'prefs-admin-search.inc' %]

Home › Administration › [% IF ( add_form ) %] Koha to MARC Mapping › Connect [% tablename %].[% kohafield %] to a MARC subfield[% END %] [% IF ( else ) %]Koha to MARC mapping[% tagfield %][% END %]

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marctagstructure.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marctagstructure.tt index b85885b74f..a5d354d9c0 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marctagstructure.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marctagstructure.tt @@ -32,7 +32,7 @@ $(document).ready(function() { [% INCLUDE 'header.inc' %] -[% INCLUDE 'cat-search.inc' %] +[% INCLUDE 'prefs-admin-search.inc' %]

Home diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/matching-rules.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/matching-rules.tt index ff878e9717..f6a33ad1c3 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/matching-rules.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/matching-rules.tt @@ -203,7 +203,7 @@ function CheckRuleForm(f) { [% INCLUDE 'header.inc' %] -[% INCLUDE 'cat-search.inc' %] +[% INCLUDE 'prefs-admin-search.inc' %]

Home › Administration › [% IF ( display_list ) %]Record matching rules[% ELSE %]Record matching rules[% END %] [% IF ( matching_rule_form ) %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/oai_set_mappings.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/oai_set_mappings.tt index ca36bc638e..f3f35b7706 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/oai_set_mappings.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/oai_set_mappings.tt @@ -41,7 +41,7 @@ function hideDialogBox() { [% INCLUDE 'header.inc' %] -[% INCLUDE 'cat-search.inc' %] +[% INCLUDE 'prefs-admin-search.inc' %]

Home › Administration › OAI sets configuration › OAI set mappings

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/oai_sets.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/oai_sets.tt index 7201733ad4..0576739a39 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/oai_sets.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/oai_sets.tt @@ -43,7 +43,7 @@ $(document).ready(function() { [% INCLUDE 'header.inc' %] -[% INCLUDE 'cat-search.inc' %] +[% INCLUDE 'prefs-admin-search.inc' %]

Home › Administration › [% IF ( op_new ) %]OAI sets configuration › Add a new OAI set[% ELSIF ( op_mod ) %]OAI sets configuration › Edit OAI set '[% spec %]'[% ELSE %] OAI sets configuration[% END %]

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/patron-attr-types.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/patron-attr-types.tt index f9f148db93..bd76e4c850 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/patron-attr-types.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/patron-attr-types.tt @@ -26,7 +26,7 @@ $(document).ready(function() { [% INCLUDE 'header.inc' %] -[% INCLUDE 'cat-search.inc' %] +[% INCLUDE 'prefs-admin-search.inc' %]

Home › Administration › [% IF ( display_list ) %]Patron attribute types[% ELSE %]Patron attribute types[% END %] [% IF ( attribute_type_form ) %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/smart-rules.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/smart-rules.tt index d4451de9ac..746d0c8696 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/smart-rules.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/smart-rules.tt @@ -111,7 +111,7 @@ $(document).ready(function() { [% INCLUDE 'header.inc' %] -[% INCLUDE 'cat-search.inc' %] +[% INCLUDE 'prefs-admin-search.inc' %]

Home › Administration › Circulation and fine rules

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/sms_providers.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/sms_providers.tt index c61fc86b31..c9744173ee 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/sms_providers.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/sms_providers.tt @@ -14,7 +14,7 @@ [% INCLUDE 'header.inc' %] -[% INCLUDE 'cat-search.inc' %] +[% INCLUDE 'prefs-admin-search.inc' %]

Home › Administration › SMS cellular providers

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/transport-cost-matrix.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/transport-cost-matrix.tt index 0231f641fd..7c6ee3f9ef 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/transport-cost-matrix.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/transport-cost-matrix.tt @@ -67,7 +67,7 @@ $(document).ready(function(){ [% INCLUDE 'header.inc' %] -[% INCLUDE 'cat-search.inc' %] +[% INCLUDE 'prefs-admin-search.inc' %]

Home › Administration › Transport cost matrix

-- 2.39.5