Bug 16575: Irregular behaviour using window.print() followed by window.location.href

[koha.git] / koha-tmpl / opac-tmpl / bootstrap / en / modules / opac-basket.tt

diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-basket.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-basket.tt
index 6eca240..282c0d8 100644 (file)
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-basket.tt
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-basket.tt
@@ -1,11 +1,12 @@
 [% USE Koha %]
 [% USE KohaDates %]
+[% USE Asset %]
 [% SET TagsInputEnabled = ( ( Koha.Preference( 'opacuserlogin' ) == 1 ) && TagsEnabled && TagsInputOnList ) %]
 
 [% INCLUDE 'doc-head-open.inc' %]
 <title>[% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha online[% END %] catalog &rsaquo; Your cart</title>
 [% INCLUDE 'doc-head-close.inc' %]
-[% BLOCK cssinclude %]<style type="text/css">.item-status { display: inline; } @media print { body { height: 99%; } }</style>[% END %]
+[% BLOCK cssinclude %]<style type="text/css">.item-status, .dt-buttons { display: inline; } @media print { body { height: 99%; } }</style>[% END %]
 </head>
 [% INCLUDE 'bodytag.inc' bodyid='basket' %]
     <div class="main">
@@ -14,7 +15,7 @@
                 <div class="span12">
                     <div id="userbasket">
                         <h2>Your cart</h2>
-                            <div id="toolbar" class="toolbar">
+                            <div id="toolbar" class="toolbar noprint">
                                 [% IF ( verbose ) %]
                                     <a href="opac-basket.pl" class="brief">Brief display</a>
                                 [% ELSE %]
@@ -24,12 +25,14 @@
                                     <a class="send" href="opac-basket.pl">Send</a>
                                 [% END %]
                                 <a class="download" href="opac-basket.pl">Download</a>
-                                <a class="print-large" href="#">Print</a>
                                 <a class="empty" href="opac-basket.pl">Empty and close</a>
                                 <a class="hide close" href="opac-basket.pl">Hide window</a>
+                                [% IF ( verbose ) %]
+                                    <a class="print-large" href="#">Print</a>
+                                [% END %]
                             </div>
 
-                            <div id="selections-toolbar" class="toolbar">
+                            <div id="selections-toolbar" class="toolbar noprint">
                                 <a id="CheckAll" href="#">Select all</a>
                                 <a id="CheckNone" href="#">Clear all</a>
                                 <span class="sep">|</span>
@@ -297,9 +300,9 @@
 [% INCLUDE 'opac-bottom.inc' %]
 
 [% BLOCK jsinclude %]
-        <script type="text/javascript" src="[% interface %]/[% theme %]/lib/jquery/plugins/jquery.checkboxes.min.js"></script>
+    [% Asset.js("lib/jquery/plugins/jquery.checkboxes.min.js") %]
         [% INCLUDE 'datatables.inc' %]
-        <script type="text/javascript">
+        <script>
             //<![CDATA[
 
             [% IF ( TagsInputEnabled && loggedinusername ) %]
@@ -424,20 +427,27 @@
                     return false;
                 });
 
-                $("#itemst").dataTable($.extend(true, {}, dataTablesDefaults, {
-                    "aaSorting": [[ 1, "asc" ]],
-                    "aoColumnDefs": [
-                      { "aTargets": [ 0,-1 ], "bSortable": false, "bSearchable": false }
+                var itemst = $("#itemst").dataTable($.extend(true, {}, dataTablesDefaults, {
+                    "order": [[ 1, "asc" ]],
+                    "columnDefs": [
+                      { "targets": [ 0,-1 ], "sortable": false, "searchable": false }
                     ],
-                    "aoColumns": [
+                    "columns": [
                         null,
-                        { "sType": "anti-the" },
+                        { "type": "anti-the" },
                         null,
                         null,
                         null
-                    ]
+                    ],
+
                 }));
 
+                var buttons = new $.fn.dataTable.Buttons(itemst, {
+                     buttons: [
+                        'print'
+                    ]
+                }).container().appendTo($('#toolbar'));
+
                 $(".cb").change(function(){
                     selRecord( $(this).val(), $(this).prop("checked") );
                     enableCheckboxActions();