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

(-)a/koha-tmpl/opac-tmpl/bootstrap/css/src/_common.scss (-1 / +2 lines)
Lines 705-711 table { Link Here
705
    .nosort,
705
    .nosort,
706
    .nosort.sorting_asc,
706
    .nosort.sorting_asc,
707
    .nosort.sorting_desc,
707
    .nosort.sorting_desc,
708
    .nosort.sorting {
708
    .nosort.sorting,
709
    .sorting_disabled {
709
        background: #E2E8E8 none;
710
        background: #E2E8E8 none;
710
        padding-right: 19px;
711
        padding-right: 19px;
711
    }
712
    }
(-)a/koha-tmpl/opac-tmpl/bootstrap/en/includes/account-table.inc (-2 / +2 lines)
Lines 7-14 Link Here
7
                <tr>
7
                <tr>
8
                    [% IF ENABLE_OPAC_PAYMENTS %]<th>&nbsp;</th>[% END %]
8
                    [% IF ENABLE_OPAC_PAYMENTS %]<th>&nbsp;</th>[% END %]
9
                    <th>Created</th>
9
                    <th>Created</th>
10
                    <th>Updated</th>
10
                    <th class="psort">Updated</th>
11
                    <th>Type</th>
11
                    <th class="all">Type</th>
12
                    <th>Description</th>
12
                    <th>Description</th>
13
                    <th>Amount</th>
13
                    <th>Amount</th>
14
                    <th>Amount outstanding</th>
14
                    <th>Amount outstanding</th>
(-)a/koha-tmpl/opac-tmpl/bootstrap/en/includes/holds-table.inc (-10 / +3 lines)
Lines 8-14 Link Here
8
    <!-- HOLDS TABLE ROWS -->
8
    <!-- HOLDS TABLE ROWS -->
9
    <thead>
9
    <thead>
10
        <tr>
10
        <tr>
11
            <th class="anti-the">Title</th>
11
            <th class="all anti-the">Title</th>
12
            [% IF ( showpriority ) %]
12
            [% IF ( showpriority ) %]
13
                <th>Placed on</th>
13
                <th>Placed on</th>
14
            [% ELSE %]
14
            [% ELSE %]
Lines 63-79 Link Here
63
                    [% END %]
63
                    [% END %]
64
                </td>
64
                </td>
65
                <td class="reservedate" data-order="[% HOLD.reservedate | html %]">
65
                <td class="reservedate" data-order="[% HOLD.reservedate | html %]">
66
                    <span class="tdlabel">Hold date:</span>
66
                    [% HOLD.reservedate | $KohaDates %]
67
                        [% HOLD.reservedate | $KohaDates %]
68
                    </span>
69
                </td>
67
                </td>
70
                [% IF ! HOLD.found %]
68
                [% IF ! HOLD.found %]
71
                    <td class="expirationdate" data-order="[% HOLD.expirationdate | html %]">
69
                    <td class="expirationdate" data-order="[% HOLD.expirationdate | html %]">
72
                        [% IF ( HOLD.expirationdate ) %]
70
                        [% IF ( HOLD.expirationdate ) %]
73
                            <span class="tdlabel">Expiration:</span>
74
                            [% HOLD.expirationdate | $KohaDates %]
71
                            [% HOLD.expirationdate | $KohaDates %]
75
                        [% ELSE %]
72
                        [% ELSE %]
76
                            <span class="tdlabel">Expiration:</span>
77
                            Never expires
73
                            Never expires
78
                        [% END %]
74
                        [% END %]
79
                [% ELSE %]
75
                [% ELSE %]
Lines 83-89 Link Here
83
                </td>
79
                </td>
84
                [% UNLESS( singleBranchMode) %]
80
                [% UNLESS( singleBranchMode) %]
85
                    <td class="branch">
81
                    <td class="branch">
86
                        <span class="tdlabel">Pickup location:</span>
87
                        [% HOLD.branch.branchname | html %]
82
                        [% HOLD.branch.branchname | html %]
88
                        [% IF ( HOLD.can_update_pickup_location_opac ) %]
83
                        [% IF ( HOLD.can_update_pickup_location_opac ) %]
89
                            <button type="button" class="btn btn-sm btn-link" data-toggle="modal" data-target="#changePickup[% HOLD.reserve_id | html %]">
84
                            <button type="button" class="btn btn-sm btn-link" data-toggle="modal" data-target="#changePickup[% HOLD.reserve_id | html %]">
Lines 122-133 Link Here
122
                [% END %]
117
                [% END %]
123
                [% IF ( showpriority ) %]
118
                [% IF ( showpriority ) %]
124
                        <td data-order="[% HOLD.priority | html %]" class="priority">
119
                        <td data-order="[% HOLD.priority | html %]" class="priority">
125
                        <span class="tdlabel">Priority:</span>
126
                        [% HOLD.priority | html %]
120
                        [% HOLD.priority | html %]
127
                    </td>
121
                    </td>
128
                [% END %]
122
                [% END %]
129
                <td class="status">
123
                <td class="status">
130
                    <span class="tdlabel">Status:</span>
131
                    [% IF ( HOLD.is_waiting ) %]
124
                    [% IF ( HOLD.is_waiting ) %]
132
                        <i class="fa fa-exclamation-circle text-warning" aria-hidden="true"></i>
125
                        <i class="fa fa-exclamation-circle text-warning" aria-hidden="true"></i>
133
                        [% IF ( HOLD.is_at_destination ) %]
126
                        [% IF ( HOLD.is_at_destination ) %]
Lines 200-207 Link Here
200
                            </form>
193
                            </form>
201
                        [% END %]
194
                        [% END %]
202
                    </td>
195
                    </td>
203
                    <td></td>
204
                [% END # / IF onlyinfo %]
196
                [% END # / IF onlyinfo %]
197
                <td></td>
205
            </tr>
198
            </tr>
206
        [% END # /FOREACH HOLDS %]
199
        [% END # /FOREACH HOLDS %]
207
    </tbody>
200
    </tbody>
(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/sco/sco-main.tt (-17 / +43 lines)
Lines 14-19 Link Here
14
[% ELSE %]
14
[% ELSE %]
15
<link rel="shortcut icon" href="[% interface | html %]/[% theme | html %]/images/favicon.ico" type="image/x-icon" />
15
<link rel="shortcut icon" href="[% interface | html %]/[% theme | html %]/images/favicon.ico" type="image/x-icon" />
16
[% END %]
16
[% END %]
17
[% Asset.css("lib/jquery/responsive.dataTables.min.css") | $raw %]
17
[% Asset.css("lib/fontawesome/css/fontawesome.min.css") | $raw %]
18
[% Asset.css("lib/fontawesome/css/fontawesome.min.css") | $raw %]
18
[% Asset.css("lib/fontawesome/css/brands.min.css") | $raw %]
19
[% Asset.css("lib/fontawesome/css/brands.min.css") | $raw %]
19
[% Asset.css("lib/fontawesome/css/solid.min.css") | $raw %]
20
[% Asset.css("lib/fontawesome/css/solid.min.css") | $raw %]
Lines 308-320 Link Here
308
                                        <thead>
309
                                        <thead>
309
                                            <tr>
310
                                            <tr>
310
                                                <th class="noshow">Checked out on</th>
311
                                                <th class="noshow">Checked out on</th>
311
                                                <th class="anti-the">Title</th>
312
                                                <th class="all anti-the">Title</th>
312
                                                <th>Call number</th>
313
                                                <th>Call number</th>
313
                                                <th>Due</th>
314
                                                <th class="psort">Due</th>
314
                                                <th class="nosort">Renew</th>
315
                                                <th class="all nosort">Renew</th>
315
                                                [% UNLESS ( nofines ) %]
316
                                                [% UNLESS ( nofines ) %]
316
                                                    <th>Fines</th>
317
                                                    <th>Fines</th>
317
                                                [% END %]
318
                                                [% END %]
319
                                                <th></th>
318
                                            </tr>
320
                                            </tr>
319
                                        </thead>
321
                                        </thead>
320
                                        <tbody>
322
                                        <tbody>
Lines 368-376 Link Here
368
                                                                    <span>No renewals allowed</span>
370
                                                                    <span>No renewals allowed</span>
369
                                                                [% END %]
371
                                                                [% END %]
370
                                                                [% IF Koha.Preference('SCOAllowCheckin') %]
372
                                                                [% IF Koha.Preference('SCOAllowCheckin') %]
371
                                                                    <input type="submit" value="Check in item" name="confirm" class="btn btn-info btn-sm return" />
373
                                                                    <div>
372
                                                                    <input type="hidden" name="op" value="returnbook" />
374
                                                                        <input type="submit" value="Check in item" name="confirm" class="btn btn-info btn-sm return" />
373
                                                                    <input type="hidden" name="confirmed" value=""  />
375
                                                                        <input type="hidden" name="op" value="returnbook" />
376
                                                                        <input type="hidden" name="confirmed" value=""  />
377
                                                                    </div>
374
                                                                [% END %]
378
                                                                [% END %]
375
                                                            [% END %]
379
                                                            [% END %]
376
                                                            [% IF ISSUE.auto_renew %]
380
                                                            [% IF ISSUE.auto_renew %]
Lines 383-388 Link Here
383
                                                            [% IF ( ISSUE.charges ) %]Yes[% ELSE %]No[% END %]
387
                                                            [% IF ( ISSUE.charges ) %]Yes[% ELSE %]No[% END %]
384
                                                        </td>
388
                                                        </td>
385
                                                    [% END %]
389
                                                    [% END %]
390
                                                    <td></td>
386
                                                </tr>
391
                                                </tr>
387
                                            [% END # / FOREACH ISSUE %]
392
                                            [% END # / FOREACH ISSUE %]
388
                                        </tbody>
393
                                        </tbody>
Lines 502-520 Link Here
502
            }
507
            }
503
        [% END %]
508
        [% END %]
504
509
505
506
        $(document).ready(function() {
510
        $(document).ready(function() {
507
            dofocus();
511
            dofocus();
508
            [% IF ( patronid ) %]sco_init();[% END %]
512
            [% IF ( patronid ) %]sco_init();[% END %]
509
            $("#loanTable").dataTable($.extend(true, {}, dataTablesDefaults, {
513
510
                "dom": "t",
514
            var dTables = $("#loanTable, #holdst, #finestable");
511
                "order": [ 0 ],
515
            dTables.each(function(){
512
                "columnDefs": [
516
                var thIndex = $(this).find("th.psort").index();
513
                    { "targets": [ "nosort" ], "sortable": false, "searchable": false },
517
                $(this).dataTable($.extend(true, {}, dataTablesDefaults, {
514
                    { "targets": [ "noshow" ], "visible": false, "searchable": false },
518
                    "sorting" : [[ thIndex, 'asc' ]],
515
                    { "type": "anti-the", "targets" : [ "anti-the" ] }
519
                    "dom": '<"top"<"table_entries"><"table_controls"fB>>t',
516
                ]
520
                    "columnDefs": [
517
            }));
521
                        { "targets": [ "nosort" ],"sortable": false,"searchable": false },
522
                        { "targets": [ "noshow" ], "visible": false, "searchable": false },
523
                        { "type": "anti-the", "targets" : [ "anti-the" ] },
524
                        { "visible": false, "targets" : [ "hidden" ] },
525
                        { "className": 'dtr-control', "orderable": false, "targets": -1 }
526
                    ],
527
                    "language": {
528
                        "search": "_INPUT_",
529
                        "searchPlaceholder": _("Search")
530
                    },
531
                    "autoWidth": false,
532
                    "responsive": {
533
                        details: {
534
                            type: 'column',
535
                            target: -1
536
                        }
537
                    }
538
                }));
539
            });
540
541
            $('a[data-toggle="tab"]').on('shown.bs.tab', function (event) {
542
                dTables.DataTable().responsive.recalc();
543
                dataTables.DataTable().responsive.recalc();
544
            } );
518
545
519
            $("#logout_form").on("click", function(e){
546
            $("#logout_form").on("click", function(e){
520
                e.preventDefault(e);
547
                e.preventDefault(e);
521
- 

Return to bug 35007