From 717e6d247275f1e067c48a8fafdd0c62d51f38b7 Mon Sep 17 00:00:00 2001
From: Kyle M Hall <kyle@bywatersolutions.com>
Date: Tue, 21 Apr 2015 14:44:57 -0400
Subject: [PATCH] Bug 13986 - Implement fix for OPAC

---
 .../opac-tmpl/bootstrap/en/modules/opac-shelves.tt |   13 +++++++++----
 opac/opac-shelves.pl                               |    6 +++++-
 2 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-shelves.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-shelves.tt
index da28e97..d13fe9f 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-shelves.tt
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-shelves.tt
@@ -43,7 +43,7 @@
 
 [% INCLUDE 'masthead.inc' %]
 <div class="main">
-    <ul class="breadcrumb">
+    <ul class="breadcrumb noprint">
         <li><a href="/cgi-bin/koha/opac-main.pl">Home</a> <span class="divider">&rsaquo;</span></li>
         [% IF ( loggedinusername ) %]
             <li><a href="/cgi-bin/koha/opac-user.pl">[% FOREACH USER_INF IN USER_INFO %][% USER_INF.title %] [% USER_INF.firstname %] [% USER_INF.surname %][% END %]</a> <span class="divider">&rsaquo;</span></li>
@@ -91,7 +91,7 @@
 
     <div class="container-fluid">
         <div class="row-fluid">
-            [% IF ( OpacNav||loggedinusername ) %]
+            [% IF ( OpacNav||loggedinusername ) && !print %]
                 <div class="span2">
                     <div id="navigation">
                         [% INCLUDE 'navigation.inc' IsPatronPage=1 %]
@@ -162,7 +162,7 @@
                                         <span class="sendlist"><a href="/cgi-bin/koha/opac-sendshelf.pl?shelfid=[% shelfnumber | html %]" class="send" onclick="open('/cgi-bin/koha/opac-sendshelf.pl?shelfid=[% shelfnumber | html %]','win_form','scrollbars=no,resizable=no,height=300,width=450,top=50,left=100'); return false; ">Send list</a></span>
                                     [% END %]
 
-                                    <a class="print-small" href="/cgi-bin/koha/opac-shelves.pl" onclick="print(); return false;">Print list</a>
+                                    <a class="print-small" target="_blank" href="/cgi-bin/koha/opac-shelves.pl?viewshelf=[% shelfnumber %]&sort=[% sort %]&direction=[% direction %]&print=1">Print list</a>
 
                                     [% IF ( manageshelf ) %]
                                         <span class="sep">|</span>
@@ -242,7 +242,7 @@
 
                             </div> <!-- / #toolbar -->
 
-                            <div id="selections-toolbar" class="toolbar">
+                            <div id="selections-toolbar" class="toolbar noprint">
                                 <span class="checkall"></span> <span class="clearall"></span> <span class="sep">|</span>
                                 <span class="links">
                                     <span id="selections">Select titles to: </span>
@@ -1017,6 +1017,11 @@ $(function() {
     [% IF OPACLocalCoverImages %]KOHA.LocalCover.GetCoverFromBibnumber(false);[% END %]
     [% IF ( GoogleJackets ) %]KOHA.Google.GetCoverFromIsbn();[% END %]
     $('#sort-submit').hide();
+
+    [% IF print %]
+        window.print();
+        setTimeout('window.close()', 1);
+    [% END %]
 }); // document.ready
 
 function Check(f) {
diff --git a/opac/opac-shelves.pl b/opac/opac-shelves.pl
index 4231926..643e796 100755
--- a/opac/opac-shelves.pl
+++ b/opac/opac-shelves.pl
@@ -31,6 +31,10 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user({
         type            => "opac",
         authnotrequired => ( C4::Context->preference("OpacPublic") ? 1 : 0 ),
     });
-$template->param(listsview => 1);
+
+$template->param(
+    listsview => 1,
+    print     => $query->param('print')
+);
 
 shelfpage('opac', $query, $template, $loggedinuser, $cookie);
-- 
1.7.2.5