From aa1c7633a3c4288db16f29bdce461c0b03ba857d Mon Sep 17 00:00:00 2001 From: Gaetan Boisson Date: Fri, 9 Oct 2015 14:44:44 +0200 Subject: [PATCH] BUG 14991 Improve consistency of authority search At the moment we can search authorities from two places: authorities-home.pl and auth_finder.pl (while cataloguing). The auth_finder.pl page offers searching specifically in the $a of the main heading, while the authorities home page doesn't. Additionally, the wording and order of the options is different. authorities-home.pl has: Search main heading Search all headings Keyword search while auth_finder.pl has: Main entry ($a only) Main entry Anywhere Heading match This patch will add some consistency so that both pages offer: Search main heading ($a only) Search main heading Search all headings Search entire record Test plan: - apply patch - go to authorities home - check that previous searches are still working - check that the new ($a only) search is working - go to auth finder (from cataloguing) - check that searches are still working - check that we do have the same wording in both pages and that forms are now consistent Signed-off-by: Aleisha Signed-off-by: Jonathan Druart --- .../prog/en/includes/auth-finder-search.inc | 35 ++++++----- .../prog/en/includes/authorities-search.inc | 67 ++++++++++++++++++++-- 2 files changed, 79 insertions(+), 23 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/auth-finder-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/auth-finder-search.inc index b1906a9..bb2d3a8 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/auth-finder-search.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/auth-finder-search.inc @@ -121,7 +121,7 @@ function finderjumpfull(page)
  • - + @@ -147,7 +147,7 @@ function finderjumpfull(page)
  • - + @@ -171,55 +171,54 @@ function finderjumpfull(page)
  • -
  • - - + + - + [% IF ( operator_match == 'contains' ) %] [% ELSE %] [% END %] - [% IF ( operator_any == 'start' ) %] + [% IF ( operator_match == 'start' ) %] [% ELSE %] [% END %] - [% IF ( operator_any == 'is' ) %] + [% IF ( operator_match == 'is' ) %] [% ELSE %] [% END %] - -
    +
  • - - + + - + [% IF ( operator_any == 'contains' ) %] [% ELSE %] [% END %] - [% IF ( operator_match == 'start' ) %] + [% IF ( operator_any == 'start' ) %] [% ELSE %] [% END %] - [% IF ( operator_match == 'is' ) %] + [% IF ( operator_any == 'is' ) %] [% ELSE %] [% 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 d7ce46d..571e6b0 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/authorities-search.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/authorities-search.inc @@ -18,8 +18,64 @@ //]]> -- 2.1.0