Attachment 71700 Details for Bug 19932 – Bug 19932: Update popup window templates to use Bootstrap grid: Cataloging Z39.50 search

[patch] Bug 19932: Update popup window templates to use Bootstrap grid: Cataloging Z39.50 search

Bug-19932-Update-popup-window-templates-to-use-Boo.patch (text/plain), 6.09 KB, created by Katrin Fischer on 2018-02-16 06:51:08 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Katrin Fischer

Created: 2018-02-16 06:51:08 UTC

Size: 6.09 KB

patch

obsolete

>From 881296a6520b848c506346e883df61572fe38bae Mon Sep 17 00:00:00 2001
>From: Owen Leonard <oleonard@myacpl.org>
>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 <zoebennett1308@gmail.com>
>
>Signed-off-by: Claire Gravely <claire.gravely@bsz-bw.de>
>
>Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
>
>Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
>---
> .../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 c3bdb40c48..a66a4eb987 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; } }
> </style>
>-      [% IF ( opsearch ) %]
>-   <style type="text/css">
>-	   #custom-doc { width:53em;*width:51.72em;min-width:689px; margin:auto; text-align:left; }
>-   </style>
> </head>
> 
>-<body id="cat_z3950_search" class="cat">
>+    <body id="cat_z3950_search" class="cat">
>+    <div class="container-fluid">
> 
>-<div id="custom-doc" class="yui-t7">
>-[% ELSE %]
>-</head>
>-<body id="cat_z3950_search" class="cat" style="padding:.5em;">
>-<div>
>-[% END %]
>-      <div id="bd">
> 	  [% IF ( opsearch ) %]
> <h2>Z39.50/SRU search</h2>
>     <form method="post" action="z3950_search.pl" name="f" class="checkboxed">
>+    <div class="row">
>+    <div class="col-xs-6">
>     <input type="hidden" name="op" id="op" value="do_search" />
>-	<div class="yui-g">
>-    <div class="yui-u first">
> 	    <fieldset class="rows"> 
>         <ol>
>         <li><label for="isbn">ISBN: </label> <input type="text" id="isbn" name="isbn" value="[% isbn | html %]" /></li>
>@@ -48,7 +38,7 @@ tr.selected { background-color : #FFFFCC; } tr.selected td { background-color :
>     <input type="hidden" name="biblionumber" value="[% biblionumber | html %]" />
>     <input type="hidden" name="frameworkcode" value="[% frameworkcode | html %]" />
>     </div>
>-    <div class="yui-g">
>+    <div class="col-xs-6">
>       <h2>Search targets</h2>
>       <div id="z3950_search_targets">
>         <span class="z3950checks"><span class="checkall"><a id="CheckAll" href="#"><i class="fa fa-check"></i> Select all</a></span> | <span class="clearall"><a id="CheckNone" href="#"><i class="fa fa-remove"></i> Clear all</a></span></span>
>@@ -64,24 +54,31 @@ tr.selected { background-color : #FFFFCC; } tr.selected td { background-color :
>         </p>
>     [% END %]
>       </div>
>+      </div>
>+    </div>
>+    <div class="row">
>+        <div class="col-xs-12">
>+            <fieldset class="action"><input type="submit"  class="submit" value="Search" /> <a class="cancel close" href="#">Cancel</a></fieldset>
>+        </div>
>     </div>
>-    <fieldset class="action"><input type="submit"  class="submit" value="Search" /> <a class="cancel close" href="#">Cancel</a></fieldset>
>     </form>
> 
> 
> [% ELSE %]
>+    <div class="row">
>+        <div class="col-xs-12">
>     <h2>Results</h2>
>     <p>You searched for:
>-        [% IF ( title ) %]<em>Title: </em><span class=term>[% title | html %]</span> [% END %]
>-        [% IF ( author ) %]<em>Author: </em><span class=term>[% author | html %]</span> [% END %]
>-        [% IF ( isbn ) %]<em>ISBN: </em><span class=term>[% isbn | html %]</span> [% END %]
>-        [% IF ( issn ) %]<em>ISSN: </em><span class=term>[% issn | html %]</span> [% END %]
>-        [% IF ( lccall ) %]<em>LC call number: </em><span class=term>[% lccall | html %]</span> [% END %]
>-        [% IF ( subject ) %]<em>Subject heading: </em><span class=term>[% subject | html %]</span> [% END %]
>-        [% IF ( controlnumber ) %]<em>Control no: </em><span class=term>[% controlnumber | html %]</span> [% END %]
>-        [% IF ( dewey ) %]<em>Dewey: </em><span class=term>[% dewey | html %]</span> [%END %]
>-        [% IF ( srchany ) %]<em>Raw (any): </em><span class=term>[% srchany | html %]</span> [% END %]
>-        [% IF ( stdid ) %]<em>Standard ID: </em><span class=term>[% stdid | html %]</span> [% END %]
>+        [% IF ( title ) %]<em>Title: </em><span class="term">[% title | html %]</span> [% END %]
>+        [% IF ( author ) %]<em>Author: </em><span class="term">[% author | html %]</span> [% END %]
>+        [% IF ( isbn ) %]<em>ISBN: </em><span class="term">[% isbn | html %]</span> [% END %]
>+        [% IF ( issn ) %]<em>ISSN: </em><span class="term">[% issn | html %]</span> [% END %]
>+        [% IF ( lccall ) %]<em>LC call number: </em><span class="term">[% lccall | html %]</span> [% END %]
>+        [% IF ( subject ) %]<em>Subject heading: </em><span class="term">[% subject | html %]</span> [% END %]
>+        [% IF ( controlnumber ) %]<em>Control no: </em><span class="term">[% controlnumber | html %]</span> [% END %]
>+        [% IF ( dewey ) %]<em>Dewey: </em><span class="term">[% dewey | html %]</span> [%END %]
>+        [% IF ( srchany ) %]<em>Raw (any): </em><span class="term">[% srchany | html %]</span> [% END %]
>+        [% IF ( stdid ) %]<em>Standard ID: </em><span class="term">[% stdid | html %]</span> [% END %]
>     </p>
>     [% IF ( errconn ) %]
>             <div class="dialog alert">
>@@ -181,7 +178,7 @@ tr.selected { background-color : #FFFFCC; } tr.selected td { background-color :
> 
> [% END %]
> 
>-	</div>
>+</div>
> </div>
> [% IF ( numberpending ) %]<h3 align="center">Still [% numberpending %] servers to search</h3>[% END %]
> 
>-- 
>2.14.1

Actions: View | Diff | Splinter Review

Attachments on bug 19932: 70341 | 70713 | 71284 | 71334 | 71335 | 71700 | 71701