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 66-82 Link Here
66
                    [% END %]
66
                    [% END %]
67
                </td>
67
                </td>
68
                <td class="reservedate" data-order="[% HOLD.reservedate | html %]">
68
                <td class="reservedate" data-order="[% HOLD.reservedate | html %]">
69
                    <span class="tdlabel">Hold date:</span>
69
                    [% HOLD.reservedate | $KohaDates %]
70
                        [% HOLD.reservedate | $KohaDates %]
71
                    </span>
72
                </td>
70
                </td>
73
                [% IF ! HOLD.found %]
71
                [% IF ! HOLD.found %]
74
                    <td class="expirationdate" data-order="[% HOLD.expirationdate | html %]">
72
                    <td class="expirationdate" data-order="[% HOLD.expirationdate | html %]">
75
                        [% IF ( HOLD.expirationdate ) %]
73
                        [% IF ( HOLD.expirationdate ) %]
76
                            <span class="tdlabel">Expiration:</span>
77
                            [% HOLD.expirationdate | $KohaDates %]
74
                            [% HOLD.expirationdate | $KohaDates %]
78
                        [% ELSE %]
75
                        [% ELSE %]
79
                            <span class="tdlabel">Expiration:</span>
80
                            Never expires
76
                            Never expires
81
                        [% END %]
77
                        [% END %]
82
                [% ELSE %]
78
                [% ELSE %]
Lines 86-92 Link Here
86
                </td>
82
                </td>
87
                [% UNLESS( singleBranchMode) %]
83
                [% UNLESS( singleBranchMode) %]
88
                    <td class="branch">
84
                    <td class="branch">
89
                        <span class="tdlabel">Pickup location:</span>
90
                        [% HOLD.branch.branchname | html %]
85
                        [% HOLD.branch.branchname | html %]
91
                        [% IF ( HOLD.can_update_pickup_location_opac ) %]
86
                        [% IF ( HOLD.can_update_pickup_location_opac ) %]
92
                            <button type="button" class="btn btn-sm btn-link" data-toggle="modal" data-target="#changePickup[% HOLD.reserve_id | html %]">
87
                            <button type="button" class="btn btn-sm btn-link" data-toggle="modal" data-target="#changePickup[% HOLD.reserve_id | html %]">
Lines 125-131 Link Here
125
                [% END %]
120
                [% END %]
126
                [% IF ( showpriority ) %]
121
                [% IF ( showpriority ) %]
127
                        <td data-order="[% HOLD.priority | html %]" class="priority">
122
                        <td data-order="[% HOLD.priority | html %]" class="priority">
128
                        <span class="tdlabel">Priority:</span>
129
                        [% HOLD.priority | html %]
123
                        [% HOLD.priority | html %]
130
                    </td>
124
                    </td>
131
                [% END %]
125
                [% END %]
Lines 133-139 Link Here
133
                    <td>[% HOLD.reservenotes | html | html_line_break %]</td>
127
                    <td>[% HOLD.reservenotes | html | html_line_break %]</td>
134
                [% END %]
128
                [% END %]
135
                <td class="status">
129
                <td class="status">
136
                    <span class="tdlabel">Status:</span>
137
                    [% IF ( HOLD.is_waiting ) %]
130
                    [% IF ( HOLD.is_waiting ) %]
138
                        <i class="fa fa-exclamation-circle text-warning" aria-hidden="true"></i>
131
                        <i class="fa fa-exclamation-circle text-warning" aria-hidden="true"></i>
139
                        [% IF ( HOLD.is_at_destination ) %]
132
                        [% IF ( HOLD.is_at_destination ) %]
Lines 206-213 Link Here
206
                            </form>
199
                            </form>
207
                        [% END %]
200
                        [% END %]
208
                    </td>
201
                    </td>
209
                    <td></td>
210
                [% END # / IF onlyinfo %]
202
                [% END # / IF onlyinfo %]
203
                <td></td>
211
            </tr>
204
            </tr>
212
        [% END # /FOREACH HOLDS %]
205
        [% END # /FOREACH HOLDS %]
213
    </tbody>
206
    </tbody>
(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/sco/sco-main.tt (-16 / +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 313-325 Link Here
313
                                        <thead>
314
                                        <thead>
314
                                            <tr>
315
                                            <tr>
315
                                                <th class="noshow">Checked out on</th>
316
                                                <th class="noshow">Checked out on</th>
316
                                                <th class="anti-the">Title</th>
317
                                                <th class="all anti-the">Title</th>
317
                                                <th>Call number</th>
318
                                                <th>Call number</th>
318
                                                <th>Due</th>
319
                                                <th class="psort">Due</th>
319
                                                <th class="nosort">Renew</th>
320
                                                <th class="all nosort">Renew</th>
320
                                                [% UNLESS ( nofines ) %]
321
                                                [% UNLESS ( nofines ) %]
321
                                                    <th>Fines</th>
322
                                                    <th>Fines</th>
322
                                                [% END %]
323
                                                [% END %]
324
                                                <th></th>
323
                                            </tr>
325
                                            </tr>
324
                                        </thead>
326
                                        </thead>
325
                                        <tbody>
327
                                        <tbody>
Lines 373-381 Link Here
373
                                                                    <span>No renewals allowed</span>
375
                                                                    <span>No renewals allowed</span>
374
                                                                [% END %]
376
                                                                [% END %]
375
                                                                [% IF Koha.Preference('SCOAllowCheckin') %]
377
                                                                [% IF Koha.Preference('SCOAllowCheckin') %]
376
                                                                    <input type="submit" value="Check in item" name="confirm" class="btn btn-info btn-sm return" />
378
                                                                    <div>
377
                                                                    <input type="hidden" name="op" value="returnbook" />
379
                                                                        <input type="submit" value="Check in item" name="confirm" class="btn btn-info btn-sm return" />
378
                                                                    <input type="hidden" name="confirmed" value=""  />
380
                                                                        <input type="hidden" name="op" value="returnbook" />
381
                                                                        <input type="hidden" name="confirmed" value=""  />
382
                                                                    </div>
379
                                                                [% END %]
383
                                                                [% END %]
380
                                                            [% END %]
384
                                                            [% END %]
381
                                                            [% IF ISSUE.auto_renew %]
385
                                                            [% IF ISSUE.auto_renew %]
Lines 388-393 Link Here
388
                                                            [% IF ( ISSUE.charges ) %]Yes[% ELSE %]No[% END %]
392
                                                            [% IF ( ISSUE.charges ) %]Yes[% ELSE %]No[% END %]
389
                                                        </td>
393
                                                        </td>
390
                                                    [% END %]
394
                                                    [% END %]
395
                                                    <td></td>
391
                                                </tr>
396
                                                </tr>
392
                                            [% END # / FOREACH ISSUE %]
397
                                            [% END # / FOREACH ISSUE %]
393
                                        </tbody>
398
                                        </tbody>
Lines 518-532 Link Here
518
        $(document).ready(function() {
523
        $(document).ready(function() {
519
            dofocus();
524
            dofocus();
520
            [% IF ( patronid ) %]sco_init();[% END %]
525
            [% IF ( patronid ) %]sco_init();[% END %]
521
            $("#loanTable").dataTable($.extend(true, {}, dataTablesDefaults, {
526
522
                "dom": "t",
527
            var dTables = $("#loanTable, #holdst, #finestable");
523
                "order": [ 0 ],
528
            dTables.each(function(){
524
                "columnDefs": [
529
                var thIndex = $(this).find("th.psort").index();
525
                    { "targets": [ "nosort" ], "sortable": false, "searchable": false },
530
                $(this).dataTable($.extend(true, {}, dataTablesDefaults, {
526
                    { "targets": [ "noshow" ], "visible": false, "searchable": false },
531
                    "sorting" : [[ thIndex, 'asc' ]],
527
                    { "type": "anti-the", "targets" : [ "anti-the" ] }
532
                    "dom": '<"top"<"table_entries"><"table_controls"fB>>t',
528
                ]
533
                    "columnDefs": [
529
            }));
534
                        { "targets": [ "nosort" ],"sortable": false,"searchable": false },
535
                        { "targets": [ "noshow" ], "visible": false, "searchable": false },
536
                        { "type": "anti-the", "targets" : [ "anti-the" ] },
537
                        { "visible": false, "targets" : [ "hidden" ] },
538
                        { "className": 'dtr-control', "orderable": false, "targets": -1 }
539
                    ],
540
                    "language": {
541
                        "search": "_INPUT_",
542
                        "searchPlaceholder": _("Search")
543
                    },
544
                    "autoWidth": false,
545
                    "responsive": {
546
                        details: {
547
                            type: 'column',
548
                            target: -1
549
                        }
550
                    }
551
                }));
552
            });
553
554
            $('a[data-toggle="tab"]').on('shown.bs.tab', function (event) {
555
                dTables.DataTable().responsive.recalc();
556
                dataTables.DataTable().responsive.recalc();
557
            } );
530
558
531
            $("#logout_form").on("click", function(e){
559
            $("#logout_form").on("click", function(e){
532
                e.preventDefault(e);
560
                e.preventDefault(e);
533
- 

Return to bug 35007