From dd56ed3a17faf3205d113f375709ac22e93bfbb0 Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Tue, 9 Jan 2018 13:49:02 +0000 Subject: [PATCH] Bug 19932: Update popup window templates to use Bootstrap grid: Cataloging Z39.50 search This patch updates the cataloging Z39.50 search template to use the Bootstrap grid instead of the YUI grid. Also fixed: Several un-quoted HTML attributes have been corrected. To test, apply the patch and go to Cataloging -> New from Z39.50/SRU. In the popup window, both the search form and search results pages should look correct. Signed-off-by: Zoe Bennett --- .../prog/en/modules/cataloguing/z3950_search.tt | 51 ++++++++++------------ 1 file changed, 24 insertions(+), 27 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/z3950_search.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/z3950_search.tt index 23775f2..9f4653b 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/z3950_search.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/z3950_search.tt @@ -10,27 +10,17 @@ tr.selected { background-color : #FFFFCC; } tr.selected td { background-color : transparent; } #dataPreview { width : 90%; top: 5%; } .modal-body { max-height: 380px; } .modal-header { padding: 0 14px; } @media (max-width: 767px) { #dataPreview { margin: 0; width : auto; } } - [% IF ( opsearch ) %] - - + +
-
-[% ELSE %] - - -
-[% END %] -
[% IF ( opsearch ) %]

Z39.50/SRU search

+
+
-
-
    2. @@ -48,7 +38,7 @@ tr.selected { background-color : #FFFFCC; } tr.selected td { background-color :
-
+

Search targets

Select all | Clear all @@ -64,24 +54,31 @@ tr.selected { background-color : #FFFFCC; } tr.selected td { background-color :

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

Results

You searched for: - [% IF ( title ) %]Title: [% title | html %] [% END %] - [% IF ( author ) %]Author: [% author | html %] [% END %] - [% IF ( isbn ) %]ISBN: [% isbn | html %] [% END %] - [% IF ( issn ) %]ISSN: [% issn | html %] [% END %] - [% IF ( lccall ) %]LC call number: [% lccall | html %] [% END %] - [% IF ( subject ) %]Subject heading: [% subject | html %] [% END %] - [% IF ( controlnumber ) %]Control no: [% controlnumber | html %] [% END %] - [% IF ( dewey ) %]Dewey: [% dewey | html %] [%END %] - [% IF ( srchany ) %]Raw (any): [% srchany | html %] [% END %] - [% IF ( stdid ) %]Standard ID: [% stdid | html %] [% END %] + [% IF ( title ) %]Title: [% title | html %] [% END %] + [% IF ( author ) %]Author: [% author | html %] [% END %] + [% IF ( isbn ) %]ISBN: [% isbn | html %] [% END %] + [% IF ( issn ) %]ISSN: [% issn | html %] [% END %] + [% IF ( lccall ) %]LC call number: [% lccall | html %] [% END %] + [% IF ( subject ) %]Subject heading: [% subject | html %] [% END %] + [% IF ( controlnumber ) %]Control no: [% controlnumber | html %] [% END %] + [% IF ( dewey ) %]Dewey: [% dewey | html %] [%END %] + [% IF ( srchany ) %]Raw (any): [% srchany | html %] [% END %] + [% IF ( stdid ) %]Standard ID: [% stdid | html %] [% END %]

[% IF ( errconn ) %]
@@ -181,7 +178,7 @@ tr.selected { background-color : #FFFFCC; } tr.selected td { background-color : [% END %] -
+
[% IF ( numberpending ) %]

Still [% numberpending %] servers to search

[% END %] -- 2.1.4