View | Details | Raw Unified | Return to bug 16575
Collapse All | Expand All

(-)a/basket/basket.pl (-2 lines)
Lines 39-49 my ( $template, $borrowernumber, $cookie ) = get_template_and_user ( Link Here
39
);
39
);
40
40
41
my $bib_list     = $query->param('bib_list');
41
my $bib_list     = $query->param('bib_list');
42
my $print_basket = $query->param('print');
43
my $verbose      = $query->param('verbose');
42
my $verbose      = $query->param('verbose');
44
43
45
if ($verbose)      { $template->param( verbose      => 1 ); }
44
if ($verbose)      { $template->param( verbose      => 1 ); }
46
if ($print_basket) { $template->param( print_basket => 1 ); }
47
45
48
my @bibs = split( /\//, $bib_list );
46
my @bibs = split( /\//, $bib_list );
49
my @results;
47
my @results;
(-)a/koha-tmpl/intranet-tmpl/prog/css/print.css (-1 / +29 lines)
Lines 302-308 form#sortbyform, Link Here
302
fieldset.action,
302
fieldset.action,
303
.list-actions,
303
.list-actions,
304
.print,
304
.print,
305
.ui-tabs-nav {
305
.ui-tabs-nav,
306
.cart-controls {
306
    display: none;
307
    display: none;
307
}
308
}
308
309
Lines 329-331 p#upload_image Link Here
329
{
330
{
330
    display: none;
331
    display: none;
331
}
332
}
333
334
th {
335
    text-align: left;
336
}
337
338
#cart_basket .container,
339
#cart_basket table,
340
#cart_basket tr,
341
#cart_basket th,
342
#cart_basket td,
343
#cart_basket .sorting_asc,
344
#cart_basket .sorting,
345
#cart_basket .sorting_desc,
346
#cart_basket .sorting_disabled,
347
#cart_basket tbody tr:nth-child(2n+1) td {
348
    background: transparent none;
349
    border: 0;
350
}
351
352
#cart_basket tr {
353
    border-collapse: collapse;
354
    border-bottom: 1px solid #DDD;
355
}
356
357
.container {
358
    width:100%;
359
}
(-)a/koha-tmpl/intranet-tmpl/prog/css/staff-global.css (+5 lines)
Lines 3347-3349 span.name { Link Here
3347
    margin: auto;
3347
    margin: auto;
3348
    margin-bottom: 2px;
3348
    margin-bottom: 2px;
3349
}
3349
}
3350
3351
.cart-controls {
3352
    border-top: 1px solid #E8E8E8;
3353
    padding: 7px 0;
3354
}
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/basket/basket.tt (-37 / +18 lines)
Lines 1-7 Link Here
1
[% USE Asset %]
1
[% USE Asset %]
2
[% SET footerjs = 1 %]
2
[% SET footerjs = 1 %]
3
[% BLOCK controls %]
3
[% BLOCK controls %]
4
    <p style="padding: 7px 0; border-top : 1px solid #E8E8E8;">
4
    <p class="cart-controls">
5
        <a id="CheckAll" href="#"><i class="fa fa-check"></i> Select all</a> <a id="CheckNone" href="#"><i class="fa fa-remove"></i> Clear all</a>
5
        <a id="CheckAll" href="#"><i class="fa fa-check"></i> Select all</a> <a id="CheckNone" href="#"><i class="fa fa-remove"></i> Clear all</a>
6
        | <b>Selected items :</b>
6
        | <b>Selected items :</b>
7
        <a href="#" id="remove_from_cart">Remove</a>
7
        <a href="#" id="remove_from_cart">Remove</a>
Lines 24-49 Link Here
24
    </p>
24
    </p>
25
[% END %]
25
[% END %]
26
[% INCLUDE 'doc-head-open.inc' %]
26
[% INCLUDE 'doc-head-open.inc' %]
27
<title>[% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha online[% END %] Catalog &rsaquo; Your cart</title>
27
<title>Koha &rsaquo; Catalog &rsaquo; Your cart</title>
28
    [% IF ( print_basket ) %]
28
[% INCLUDE 'doc-head-close.inc' %]
29
30
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
31
<link rel="shortcut icon" href="[% IF ( IntranetFavicon ) %][% IntranetFavicon %][% ELSE %][% interface %]/[% theme %]/img/favicon.ico[% END %]" type="image/x-icon" />
32
<style type="text/css">
33
    @import url([% interface %]/[% theme %]/css/print.css);
34
</style>
35
    [% ELSE %][% INCLUDE 'doc-head-close.inc' %]
36
[% Asset.css("css/datatables.css") %]
37
	[% END %]
38
</head>
29
</head>
39
[% IF ( print_basket ) %]<body id="cart_basket" class="cart" onload="print();history.back();">[% ELSE %]<body id="cart_basket" class="cart">[% END %]
30
31
<body id="cart_basket" class="cart">
40
32
41
<div class="main container-fluid">
33
<div class="main container-fluid">
42
    <div class="row">
34
    <div class="row">
43
        <div class="col-md-12">
35
        <div class="col-md-12">
44
36
45
<div class="container">
37
<div class="container">
46
[% UNLESS ( print_basket ) %]
38
47
<h1>Your cart</h1>
39
<h1>Your cart</h1>
48
40
49
<div id="toolbar" class="btn-toolbar">
41
<div id="toolbar" class="btn-toolbar">
Lines 69-93 Link Here
69
    <a class="btn btn-default btn-sm" href="basket.pl" id="empty_cart"><i class="fa fa-trash"></i> Empty and close</a>
61
    <a class="btn btn-default btn-sm" href="basket.pl" id="empty_cart"><i class="fa fa-trash"></i> Empty and close</a>
70
    <a class="btn btn-default btn-sm close" href="basket.pl"><i class="fa fa-times-circle"></i> Hide window</a>
62
    <a class="btn btn-default btn-sm close" href="basket.pl"><i class="fa fa-times-circle"></i> Hide window</a>
71
</div>
63
</div>
72
        [% END %]
64
73
65
74
[% IF ( verbose ) %]
66
[% IF ( verbose ) %]
75
    [% UNLESS ( print_basket ) %]
76
        [% PROCESS controls %]
67
        [% PROCESS controls %]
77
    [% END %]
78
            <form action="basket.pl" method="get" name="bookbag_form" id="bookbag_form">
68
            <form action="basket.pl" method="get" name="bookbag_form" id="bookbag_form">
79
    [% FOREACH BIBLIO_RESULT IN BIBLIO_RESULTS %]
69
    [% FOREACH BIBLIO_RESULT IN BIBLIO_RESULTS %]
80
    <h3>
70
    <h3>
81
        [% IF ( print_basket ) %]
71
        <input type="checkbox" class="select_record noprint" value="[% BIBLIO_RESULT.biblionumber %]" name="bib[% BIBLIO_RESULT.biblionumber %]" id="bib[% BIBLIO_RESULT.biblionumber %]" />
82
            [% BIBLIO_RESULT.title |html %]
72
        [% BIBLIO_RESULT.title |html %]
83
                [% FOREACH subtitl IN BIBLIO_RESULT.subtitle %] [% subtitl.subfield | html %][% END %]
73
        [% FOREACH subtitl IN BIBLIO_RESULT.subtitle %] [% subtitl.subfield | html %][% END %]
84
                [% IF ( BIBLIO_RESULT.author ) %] [% BIBLIO_RESULT.author %][% END %]
74
        [% IF ( BIBLIO_RESULT.author ) %] [% BIBLIO_RESULT.author %][% END %]
85
        [% ELSE %]
86
                <input type="checkbox" class="select_record" value="[% BIBLIO_RESULT.biblionumber %]" name="bib[% BIBLIO_RESULT.biblionumber %]" id="bib[% BIBLIO_RESULT.biblionumber %]" />
87
                [% BIBLIO_RESULT.title |html %]
88
                [% FOREACH subtitl IN BIBLIO_RESULT.subtitle %] [% subtitl.subfield | html %][% END %]
89
                [% IF ( BIBLIO_RESULT.author ) %] [% BIBLIO_RESULT.author %][% END %]
90
        [% END %]
91
    </h3>
75
    </h3>
92
	    <!-- COinS / Openurl -->
76
	    <!-- COinS / Openurl -->
93
    <span class="Z3988" title="ctx_ver=Z39.88-2004&amp;rft_val_fmt=info%3Aofi%2Ffmt%3Akev%3Amtx%3Abook&amp;rft.au=[% BIBLIO_RESULT.author %]&amp;rft.btitle=[% BIBLIO_RESULT.title |url %]&amp;rft.date=[% BIBLIO_RESULT.publicationyear %]&amp;rft.tpages=[% BIBLIO_RESULT.item('size') %]&amp;rft.isbn=[% BIBLIO_RESULT.isbn |url %]&amp;rft.aucorp=&amp;rft.place=[% BIBLIO_RESULT.place %]&amp;rft.pub=[% BIBLIO_RESULT.publisher |url %]&amp;rft.edition=[% BIBLIO_RESULT.edition %]&amp;rft.series=[% BIBLIO_RESULT.series %]&amp;rft.genre="></span>
77
    <span class="Z3988" title="ctx_ver=Z39.88-2004&amp;rft_val_fmt=info%3Aofi%2Ffmt%3Akev%3Amtx%3Abook&amp;rft.au=[% BIBLIO_RESULT.author %]&amp;rft.btitle=[% BIBLIO_RESULT.title |url %]&amp;rft.date=[% BIBLIO_RESULT.publicationyear %]&amp;rft.tpages=[% BIBLIO_RESULT.item('size') %]&amp;rft.isbn=[% BIBLIO_RESULT.isbn |url %]&amp;rft.aucorp=&amp;rft.place=[% BIBLIO_RESULT.place %]&amp;rft.pub=[% BIBLIO_RESULT.publisher |url %]&amp;rft.edition=[% BIBLIO_RESULT.edition %]&amp;rft.series=[% BIBLIO_RESULT.series %]&amp;rft.genre="></span>
Lines 235-248 Link Here
235
            </form>
219
            </form>
236
220
237
[% ELSE %]
221
[% ELSE %]
238
[% UNLESS ( print_basket ) %]
222
239
    <form action="/cgi-bin/koha/basket/basket.pl" method="get" name="bookbag_form" id="bookbag_form">
223
    <form action="/cgi-bin/koha/basket/basket.pl" method="get" name="bookbag_form" id="bookbag_form">
240
    [% PROCESS controls %]
224
    [% PROCESS controls %]
241
[% END %]
242
225
243
    <table id="itemst">
226
    <table id="itemst">
244
	<thead><tr>
227
	<thead><tr>
245
        [% UNLESS ( print_basket ) %]<th class="NoSort">&nbsp;</th>[% END %]
228
        <th class="NoSort noprint">&nbsp;</th>
246
        <th class="anti-the">Title</th>
229
        <th class="anti-the">Title</th>
247
        <th>Item type</th>
230
        <th>Item type</th>
248
        <th><a id="items-popover" href="#" data-trigger="hover" data-toggle="popover" data-placement="top" title="Item sorting" data-content="Items are sorted by the highest or lowest callnumber in a group of items respectively.">Items</a></th>
231
        <th><a id="items-popover" href="#" data-trigger="hover" data-toggle="popover" data-placement="top" title="Item sorting" data-content="Items are sorted by the highest or lowest callnumber in a group of items respectively.">Items</a></th>
Lines 250-259 Link Here
250
233
251
        [% FOREACH BIBLIO_RESULT IN BIBLIO_RESULTS %]
234
        [% FOREACH BIBLIO_RESULT IN BIBLIO_RESULTS %]
252
                <tr>
235
                <tr>
253
            [% UNLESS ( print_basket ) %]<td>
236
                    <td class="noprint">
254
                        <input type="checkbox" class="select_record" value="[% BIBLIO_RESULT.biblionumber %]" name="bib[% BIBLIO_RESULT.biblionumber %]" id="bib[% BIBLIO_RESULT.biblionumber %]" />
237
                        <input type="checkbox" class="select_record" value="[% BIBLIO_RESULT.biblionumber %]" name="bib[% BIBLIO_RESULT.biblionumber %]" id="bib[% BIBLIO_RESULT.biblionumber %]" />
255
238
256
                </td> [% END %]
239
                </td>
257
            <td><a href="[% BIBLIO_RESULT.dest %]?biblionumber=[% BIBLIO_RESULT.biblionumber %]" class="open_title">
240
            <td><a href="[% BIBLIO_RESULT.dest %]?biblionumber=[% BIBLIO_RESULT.biblionumber %]" class="open_title">
258
                        [% BIBLIO_RESULT.title |html %] [% FOREACH subtitl IN BIBLIO_RESULT.subtitle %] [% subtitl.subfield | html %][% END %]
241
                        [% BIBLIO_RESULT.title |html %] [% FOREACH subtitl IN BIBLIO_RESULT.subtitle %] [% subtitl.subfield | html %][% END %]
259
                    </a>
242
                    </a>
Lines 294-303 Link Here
294
    </div>
277
    </div>
295
</div>
278
</div>
296
            [% INCLUDE js_includes.inc %]
279
            [% INCLUDE js_includes.inc %]
297
            [% UNLESS ( print_basket ) %]
280
            [% INCLUDE 'datatables.inc' %]
298
                [% INCLUDE 'datatables.inc' %]
281
            [% Asset.js("js/cart.js") %]
299
                [% Asset.js("js/cart.js") %]
282
            [% Asset.js("lib/jquery/plugins/jquery.checkboxes.min.js") %]
300
                [% Asset.js("lib/jquery/plugins/jquery.checkboxes.min.js") %]
301
            [% END %]
302
    </body>
283
    </body>
303
</html>
284
</html>
(-)a/koha-tmpl/intranet-tmpl/prog/js/basket.js (-2 / +1 lines)
Lines 381-388 function downloadBasket() { Link Here
381
}
381
}
382
382
383
function printBasket() {
383
function printBasket() {
384
    var loc = document.location + "&print=1";
384
    window.print();
385
    document.location = loc;
386
}
385
}
387
386
388
function showMore() {
387
function showMore() {
(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-basket.tt (-2 / +2 lines)
Lines 15-21 Link Here
15
                <div class="span12">
15
                <div class="span12">
16
                    <div id="userbasket">
16
                    <div id="userbasket">
17
                        <h2>Your cart</h2>
17
                        <h2>Your cart</h2>
18
                            <div id="toolbar" class="toolbar">
18
                            <div id="toolbar" class="toolbar noprint">
19
                                [% IF ( verbose ) %]
19
                                [% IF ( verbose ) %]
20
                                    <a href="opac-basket.pl" class="brief">Brief display</a>
20
                                    <a href="opac-basket.pl" class="brief">Brief display</a>
21
                                [% ELSE %]
21
                                [% ELSE %]
Lines 32-38 Link Here
32
                                [% END %]
32
                                [% END %]
33
                            </div>
33
                            </div>
34
34
35
                            <div id="selections-toolbar" class="toolbar">
35
                            <div id="selections-toolbar" class="toolbar noprint">
36
                                <a id="CheckAll" href="#">Select all</a>
36
                                <a id="CheckAll" href="#">Select all</a>
37
                                <a id="CheckNone" href="#">Clear all</a>
37
                                <a id="CheckNone" href="#">Clear all</a>
38
                                <span class="sep">|</span>
38
                                <span class="sep">|</span>
(-)a/koha-tmpl/opac-tmpl/bootstrap/less/print.less (-3 / +15 lines)
Lines 153-184 body#basket a { Link Here
153
}
153
}
154
154
155
body#basket table {
155
body#basket table {
156
	border-top : 1px solid #EEE;
156
    border-collapse: collapse;
157
	border-left : 1px solid #EEE;
158
}
157
}
158
159
body#basket td,
159
body#basket td,
160
body#basket th {
160
body#basket th {
161
	background-color : transparent;
161
	background-color : transparent;
162
    border: 0;
162
	padding : 2px;
163
	padding : 2px;
163
}
164
}
164
165
165
body#basket th {
166
body#basket th {
166
	background-color : #EEE;
167
	background-color : #EEE;
168
    border: 0;
167
}
169
}
168
170
169
body#basket th,
171
body#basket th,
170
body#basket th[scope=col] {
172
body#basket th[scope=col] {
173
    border: 0;
171
	text-align : center;
174
	text-align : center;
172
	vertical-align : middle;
175
	vertical-align : middle;
173
}
176
}
174
177
175
body#basket th[scope=row] {
178
body#basket th[scope=row] {
179
    border: 0;
176
	font-size : 89%;
180
	font-size : 89%;
177
	text-align : right;
181
	text-align : right;
178
	vertical-align : top;
182
	vertical-align : top;
179
	width : 10%;
183
	width : 10%;
180
}
184
}
181
185
186
#basket tr {
187
    border-bottom: 1px solid #DDD;
188
}
189
182
body#basket p {
190
body#basket p {
183
	font-size : 85%;
191
	font-size : 85%;
184
	margin : .2em 0;
192
	margin : .2em 0;
Lines 243-245 div#userupdate input,div#userupdate textarea { Link Here
243
#ulactioncontainer {
251
#ulactioncontainer {
244
    display: none;
252
    display: none;
245
}
253
}
246
- 
254
255
.main,
256
.table-bordered {
257
    border: 0;
258
}

Return to bug 16575