From 3c609249390aa37ba09a7fa4f71816456fa2e8ac Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Wed, 10 Jan 2018 16:10:44 +0000 Subject: [PATCH] Bug 19946: Update popup window templates to use Bootstrap grid: Authority Z39.50 search This patch updates the authority Z39.50 search template to use the Bootstrap grid instead of the YUI grid. Also fixed: Some capitalization corrections, better handling. This patch does not fix Bug 17119. To test, apply the patch and go to Authorities -> New from Z39.50. In the popup window, both the search form and search results pages should look correct. Signed-off-by: Te Rauhina Jackson <terauhina.jackson@gmail.com> Signed-off-by: Te Rauhina Jackson <terauhina.jackson@gmail.com> Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de> Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org> --- .../modules/cataloguing/z3950_auth_search.tt | 158 ++++++++++-------- 1 file changed, 89 insertions(+), 69 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/z3950_auth_search.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/z3950_auth_search.tt index b0b278e3f5..99ee70a2ce 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/z3950_auth_search.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/z3950_auth_search.tt @@ -1,37 +1,26 @@ [% SET footerjs = 1 %] [% INCLUDE 'doc-head-open.inc' %] -<title>Koha › Z39.50 search results +[% IF ( opsearch ) %] + Koha › Z39.50 authority search points +[% ELSE %] + Koha › Z39.50 authority search results + [% END %] [% INCLUDE 'doc-head-close.inc' %] -[% IF ( opsearch ) %] - - - -
-[% ELSE %] - + +
- -
-[% END %] - -
[% IF ( opsearch ) %] -

Z39.50 Authority search points

+

Z39.50 authority search points

-
-
+
+
    2. @@ -43,37 +32,41 @@ tr.selected { background-color : #FFFFCC; } tr.selected td { background-color :
-
-
-
    -
    2. -
    3. -
    4. -
    5. -
  5. Clear search form
    6. -
-
-
-
-

Search targets

-
- Select all | Clear all - [% FOREACH serverloo IN serverloop %] -

- [% IF ( serverloo.checked ) %] - - [% ELSE %] - +

+
+
+
    +
    2. +
    3. +
    4. +
    5. +
  5. Clear search form
    6. +
+
+
+ +
+

Search targets

+
+ Select all | Clear all + [% FOREACH serverloo IN serverloop %] +

+ [% IF ( serverloo.checked ) %] + + [% ELSE %] + + [% END %] + +

[% END %] - -

- [% END %] +
+
Cancel
[% ELSE %] -

Results for Authority Records

+

Results for authority records

[% IF ( breeding_loop ) %] @@ -85,12 +78,19 @@ tr.selected { background-color : #FFFFCC; } tr.selected td { background-color : [% FOREACH breeding_loo IN breeding_loop %] [% IF ( breeding_loo.breedingid ) %] - + [% END %] @@ -158,8 +158,6 @@ tr.selected { background-color : #FFFFCC; } tr.selected td { background-color : [% END %] [% END %] - - [% IF ( numberpending ) %]

Still [% numberpending %] servers to search

[% END %] @@ -169,30 +167,52 @@ tr.selected { background-color : #FFFFCC; } tr.selected td { background-color : -- 2.39.5
[% breeding_loo.server %]
Preview MARC Import X
[% breeding_loo.server %] [% breeding_loo.heading %] [% breeding_loo.heading_code %] - Show MARC - Import +
+ + Actions + + +