@@ -, +, @@ by window.location.href button re-loading in any way. pop-up --- basket/basket.pl | 2 - koha-tmpl/intranet-tmpl/prog/css/print.css | 30 +++++++++++- koha-tmpl/intranet-tmpl/prog/css/staff-global.css | 5 ++ .../intranet-tmpl/prog/en/modules/basket/basket.tt | 55 +++++++--------------- koha-tmpl/intranet-tmpl/prog/js/basket.js | 3 +- .../opac-tmpl/bootstrap/en/modules/opac-basket.tt | 4 +- koha-tmpl/opac-tmpl/bootstrap/less/print.less | 17 ++++++- 7 files changed, 70 insertions(+), 46 deletions(-) --- a/basket/basket.pl +++ a/basket/basket.pl @@ -39,11 +39,9 @@ my ( $template, $borrowernumber, $cookie ) = get_template_and_user ( ); my $bib_list = $query->param('bib_list'); -my $print_basket = $query->param('print'); my $verbose = $query->param('verbose'); if ($verbose) { $template->param( verbose => 1 ); } -if ($print_basket) { $template->param( print_basket => 1 ); } my @bibs = split( /\//, $bib_list ); my @results; --- a/koha-tmpl/intranet-tmpl/prog/css/print.css +++ a/koha-tmpl/intranet-tmpl/prog/css/print.css @@ -302,7 +302,8 @@ form#sortbyform, fieldset.action, .list-actions, .print, -.ui-tabs-nav { +.ui-tabs-nav, +.cart-controls { display: none; } @@ -329,3 +330,30 @@ p#upload_image { display: none; } + +th { + text-align: left; +} + +#cart_basket .container, +#cart_basket table, +#cart_basket tr, +#cart_basket th, +#cart_basket td, +#cart_basket .sorting_asc, +#cart_basket .sorting, +#cart_basket .sorting_desc, +#cart_basket .sorting_disabled, +#cart_basket tbody tr:nth-child(2n+1) td { + background: transparent none; + border: 0; +} + +#cart_basket tr { + border-collapse: collapse; + border-bottom: 1px solid #DDD; +} + +.container { + width:100%; +} --- a/koha-tmpl/intranet-tmpl/prog/css/staff-global.css +++ a/koha-tmpl/intranet-tmpl/prog/css/staff-global.css @@ -3347,3 +3347,8 @@ span.name { margin: auto; margin-bottom: 2px; } + +.cart-controls { + border-top: 1px solid #E8E8E8; + padding: 7px 0; +} --- a/koha-tmpl/intranet-tmpl/prog/en/modules/basket/basket.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/basket/basket.tt @@ -1,7 +1,7 @@ [% USE Asset %] [% SET footerjs = 1 %] [% BLOCK controls %] -

+

Select all Clear all | Selected items : Remove @@ -24,26 +24,18 @@

[% END %] [% INCLUDE 'doc-head-open.inc' %] -[% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha online[% END %] Catalog › Your cart - [% IF ( print_basket ) %] - - - - - [% ELSE %][% INCLUDE 'doc-head-close.inc' %] -[% Asset.css("css/datatables.css") %] - [% END %] +Koha › Catalog › Your cart +[% INCLUDE 'doc-head-close.inc' %] -[% IF ( print_basket ) %][% ELSE %][% END %] + +
-[% UNLESS ( print_basket ) %] +

Your cart

@@ -69,25 +61,17 @@ Empty and close Hide window
- [% END %] + [% IF ( verbose ) %] - [% UNLESS ( print_basket ) %] [% PROCESS controls %] - [% END %]
[% FOREACH BIBLIO_RESULT IN BIBLIO_RESULTS %]

- [% IF ( print_basket ) %] - [% BIBLIO_RESULT.title |html %] - [% FOREACH subtitl IN BIBLIO_RESULT.subtitle %] [% subtitl.subfield | html %][% END %] - [% IF ( BIBLIO_RESULT.author ) %] [% BIBLIO_RESULT.author %][% END %] - [% ELSE %] - - [% BIBLIO_RESULT.title |html %] - [% FOREACH subtitl IN BIBLIO_RESULT.subtitle %] [% subtitl.subfield | html %][% END %] - [% IF ( BIBLIO_RESULT.author ) %] [% BIBLIO_RESULT.author %][% END %] - [% END %] + + [% BIBLIO_RESULT.title |html %] + [% FOREACH subtitl IN BIBLIO_RESULT.subtitle %] [% subtitl.subfield | html %][% END %] + [% IF ( BIBLIO_RESULT.author ) %] [% BIBLIO_RESULT.author %][% END %]

@@ -235,14 +219,13 @@
[% ELSE %] -[% UNLESS ( print_basket ) %] +
[% PROCESS controls %] -[% END %] - [% UNLESS ( print_basket ) %][% END %] + @@ -250,10 +233,10 @@ [% FOREACH BIBLIO_RESULT IN BIBLIO_RESULTS %] - [% UNLESS ( print_basket ) %] [% END %] +
   Title Item type Items
+ - [% BIBLIO_RESULT.title |html %] [% FOREACH subtitl IN BIBLIO_RESULT.subtitle %] [% subtitl.subfield | html %][% END %] @@ -294,10 +277,8 @@ [% INCLUDE js_includes.inc %] - [% UNLESS ( print_basket ) %] - [% INCLUDE 'datatables.inc' %] - [% Asset.js("js/cart.js") %] - [% Asset.js("lib/jquery/plugins/jquery.checkboxes.min.js") %] - [% END %] + [% INCLUDE 'datatables.inc' %] + [% Asset.js("js/cart.js") %] + [% Asset.js("lib/jquery/plugins/jquery.checkboxes.min.js") %] --- a/koha-tmpl/intranet-tmpl/prog/js/basket.js +++ a/koha-tmpl/intranet-tmpl/prog/js/basket.js @@ -381,8 +381,7 @@ function downloadBasket() { } function printBasket() { - var loc = document.location + "&print=1"; - document.location = loc; + window.print(); } function showMore() { --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-basket.tt +++ a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-basket.tt @@ -15,7 +15,7 @@

Your cart

-
+
[% IF ( verbose ) %] Brief display [% ELSE %] @@ -32,7 +32,7 @@ [% END %]
-
+
Select all Clear all | --- a/koha-tmpl/opac-tmpl/bootstrap/less/print.less +++ a/koha-tmpl/opac-tmpl/bootstrap/less/print.less @@ -153,32 +153,40 @@ body#basket a { } body#basket table { - border-top : 1px solid #EEE; - border-left : 1px solid #EEE; + border-collapse: collapse; } + body#basket td, body#basket th { background-color : transparent; + border: 0; padding : 2px; } body#basket th { background-color : #EEE; + border: 0; } body#basket th, body#basket th[scope=col] { + border: 0; text-align : center; vertical-align : middle; } body#basket th[scope=row] { + border: 0; font-size : 89%; text-align : right; vertical-align : top; width : 10%; } +#basket tr { + border-bottom: 1px solid #DDD; +} + body#basket p { font-size : 85%; margin : .2em 0; @@ -243,3 +251,8 @@ div#userupdate input,div#userupdate textarea { #ulactioncontainer { display: none; } + +.main, +.table-bordered { + border: 0; +} --