From 06e05d8d5bb9eb2e65c298cfe9638820a96c1058 Mon Sep 17 00:00:00 2001
From: Aleisha Amohia <aleishaamohia@hotmail.com>
Date: Fri, 3 Feb 2017 00:02:39 +0000
Subject: [PATCH] Bug 18043: Updating buttons for z39.50 cataloguing search

1) Go to Cataloguing -> New from Z39.50
2) Do a search, noticing the ugly buttons from Comment 1
3) Apply patch and go back to a new search
4) Do a search again, noticing the new, nicer buttons
5) Confirm they still work as expected

Sponsored-by: Catalyst IT
---
 .../prog/en/modules/cataloguing/z3950_search.tt    | 38 ++++++++++++----------
 1 file changed, 21 insertions(+), 17 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 733c6b5..4b93ab7 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
@@ -12,7 +12,7 @@ $(document).ready(function(){
     $("#resultst").dataTable($.extend(true, {}, dataTablesDefaults, {
         "sDom": 't',
         "aoColumnDefs": [
-            { "aTargets": [ -1,-2,-3 ], "bSortable": false, "bSearchable": false },
+            { "aTargets": [ -1,-2 ], "bSortable": false, "bSearchable": false },
             { "aTargets": [ 1 ], "sType": "nsb-nse" },
         ],
         "aaSorting": [[ 1, "asc" ]],
@@ -102,7 +102,7 @@ tr.selected { background-color : #FFFFCC; } tr.selected td { background-color :
     [% END %]
       </div>
     </div>
-    <fieldset class="action"><input type="submit"  class="submit" value="Search" /> <a class="cancel close" href="#">Cancel</a></fieldset>
+    <fieldset class="action"><button type="submit" class="submit btn btn-default btn-sm">Search</button> <a class="cancel close" href="#">Cancel</a></fieldset>
     </form>
 
 
@@ -144,9 +144,8 @@ tr.selected { background-color : #FFFFCC; } tr.selected td { background-color :
         <th>Edition</th>
         <th>ISBN</th>
         <th>LCCN</th>
-        <th>MARC</th>
-        <th>Card</th>
-		<th>&nbsp;</th>
+        <th>View</th>
+        <th>&nbsp;</th>
     </tr></thead>
     <tbody>[% FOREACH breeding_loo IN breeding_loop %]
         [% IF ( breeding_loo.breedingid ) %]
@@ -159,9 +158,8 @@ tr.selected { background-color : #FFFFCC; } tr.selected td { background-color :
             <td>[% breeding_loo.edition %]</td>
             <td>[% breeding_loo.isbn %]</td>
             <td>[% breeding_loo.lccn %]</td>
-            <td><a href="/cgi-bin/koha/catalogue/showmarc.pl?importid=[% breeding_loo.breedingid %]" class="previewData">MARC</a></td>
-            <td><a href="/cgi-bin/koha/catalogue/showmarc.pl?viewas=card&amp;importid=[% breeding_loo.breedingid %]" class="previewData">Card</a></td>
-            <td><a href="#" class="import_record" data-breedingid="[% breeding_loo.breedingid %]" data-biblionumber="[% breeding_loo.biblionumber %]" data-frameworkcode="[% frameworkcode | uri %]">Import</a></td>
+            <td class="actions"><a href="/cgi-bin/koha/catalogue/showmarc.pl?importid=[% breeding_loo.breedingid %]" class="previewData btn btn-default btn-xs"><i class="fa fa-eye"></i> MARC</a> <a href="/cgi-bin/koha/catalogue/showmarc.pl?viewas=card&amp;importid=[% breeding_loo.breedingid %]" class="previewData btn btn-default btn-xs"><i class="fa fa-eye"></i> Card</a></td>
+            <td class="actions"><a href="#" class="import_record btn btn-default btn-xs" data-breedingid="[% breeding_loo.breedingid %]" data-biblionumber="[% breeding_loo.biblionumber %]" data-frameworkcode="[% frameworkcode | uri %]"><i class="fa fa-download"></i> Import</a></td>
         </tr>
         [% END %]
     [% END %]</tbody>
@@ -201,20 +199,26 @@ tr.selected { background-color : #FFFFCC; } tr.selected td { background-color :
         <input type="hidden" name="id" id="z3950_[% server.id %]" value="[% server.id %]" />
         [% END %]
 
-        [% IF ( show_prevbutton ) %]
-            <input type="button" name="changepage_prev" value="Previous page" data-currentpage="[% current_page %]" />
-        [% END %]
-        Page [% current_page %] / [% total_pages %]
-        [% IF ( show_nextbutton ) %]
-            <input type="button" name="changepage_next" value="Next page" data-currentpage="[% current_page %]" />
-        [% END %]
-        <br />Go to page : <input id="goto_page" name="goto_page" value="[% current_page %]" size="4" /><input type="submit" name="changepage_goto" value="Go" />
+        <fieldset class="action">
+            [% IF ( show_prevbutton ) %]
+                <button type="submit" name="changepage_prev" data-currentpage="[% current_page %]" class="btn btn-default btn-sm">Previous page</button>
+            [% END %]
+            Page [% current_page %] / [% total_pages %]
+            [% IF ( show_nextbutton ) %]
+                <button type="submit" name="changepage_next" data-currentpage="[% current_page %]" class="btn btn-default btn-sm">Next page</button>
+            [% END %]
+        </fieldset>
+        <fieldset class="action">
+            Go to page : <input id="goto_page" name="goto_page" value="[% current_page %]" size="4" /> <button type="submit" name="changepage_goto" class="btn btn-default btn-sm">Go</button>
+        </fieldset>
     </form>
 
     [% ELSE %]
         <div class="dialog message">Nothing found.</div>
     [% END %]
-<p><form method="get" action="/cgi-bin/koha/cataloguing/z3950_search.pl"><input type="hidden" name="biblionumber" value="[% biblionumber | html %]"/><input type="hidden" name="frameworkcode" value="[% frameworkcode | html %]"/><input type="submit" value="Try another search"/></form></p>
+    <fieldset class="action">
+        <form method="get" action="/cgi-bin/koha/cataloguing/z3950_search.pl"><input type="hidden" name="biblionumber" value="[% biblionumber | html %]"/><input type="hidden" name="frameworkcode" value="[% frameworkcode | html %]"/><button type="submit" class="btn btn-default btn-sm">Try another search</button></form>
+    </fieldset>
 
 [% END %]
 
-- 
2.1.4