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

(-)a/koha-tmpl/opac-tmpl/bootstrap/en/includes/account-table.inc (-4 / +4 lines)
Lines 6-12 Link Here
6
            <thead>
6
            <thead>
7
                <tr>
7
                <tr>
8
                    [% IF ENABLE_OPAC_PAYMENTS %]<th>&nbsp;</th>[% END %]
8
                    [% IF ENABLE_OPAC_PAYMENTS %]<th>&nbsp;</th>[% END %]
9
                    <th class="title-string">Date</th>
9
                    <th>Date</th>
10
                    <th>Type</th>
10
                    <th>Type</th>
11
                    <th>Description</th>
11
                    <th>Description</th>
12
                    <th>Amount</th>
12
                    <th>Amount</th>
Lines 26-32 Link Here
26
                                [% END %]
26
                                [% END %]
27
                            </td>
27
                            </td>
28
                        [% END %]
28
                        [% END %]
29
                        <td><span title="[% ACCOUNT_LINE.date | html %]">[% ACCOUNT_LINE.date | $KohaDates %]</span></td>
29
                        <td data-order="[% ACCOUNT_LINE.date | html %]">[% ACCOUNT_LINE.date | $KohaDates %]</td>
30
                        <td>
30
                        <td>
31
                            [% PROCESS account_type_description account=ACCOUNT_LINE %]
31
                            [% PROCESS account_type_description account=ACCOUNT_LINE %]
32
                        </td>
32
                        </td>
Lines 89-95 Link Here
89
            <thead>
89
            <thead>
90
                <tr>
90
                <tr>
91
                    [% IF ENABLE_OPAC_PAYMENTS %]<th>&nbsp;</th>[% END %]
91
                    [% IF ENABLE_OPAC_PAYMENTS %]<th>&nbsp;</th>[% END %]
92
                    <th class="title-string">Date</th>
92
                    <th>Date</th>
93
                    <th>Description</th>
93
                    <th>Description</th>
94
                    <th>Fine amount</th>
94
                    <th>Fine amount</th>
95
                    <th>Amount outstanding</th>
95
                    <th>Amount outstanding</th>
Lines 110-116 Link Here
110
                                [% END %]
110
                                [% END %]
111
                            </td>
111
                            </td>
112
                        [% END %]
112
                        [% END %]
113
                        <td><span title="[% a.date | html %]">[% a.date | $KohaDates %]</span></td>
113
                        <td data-order="[% a.date | html %]">[% a.date | $KohaDates %]</td>
114
                        <td>
114
                        <td>
115
                            [% PROCESS account_type_description account=a %]
115
                            [% PROCESS account_type_description account=a %]
116
                            [%- IF a.payment_type %], [% AuthorisedValues.GetByCode('PAYMENT_TYPE', a.payment_type, 1) | html %][% END %]
116
                            [%- IF a.payment_type %], [% AuthorisedValues.GetByCode('PAYMENT_TYPE', a.payment_type, 1) | html %][% END %]
(-)a/koha-tmpl/opac-tmpl/bootstrap/en/includes/columns_settings.inc (-2 / +1 lines)
Lines 99-108 function KohaTable(selector, dt_parameters, columns_settings) { Link Here
99
    var new_parameters = {}
99
    var new_parameters = {}
100
    $.extend(true, new_parameters, dataTablesDefaults, dt_parameters);
100
    $.extend(true, new_parameters, dataTablesDefaults, dt_parameters);
101
    var default_column_defs = [
101
    var default_column_defs = [
102
        { "aTargets": ["title-string"], "sType": "title-string" },
103
        { "aTargets": ["string-sort"], "sType": "string" },
102
        { "aTargets": ["string-sort"], "sType": "string" },
104
        { "aTargets": ["anti-the"], "sType": "anti-the" },
103
        { "aTargets": ["anti-the"], "sType": "anti-the" },
105
        { "aTargets": ["NoSort"], "bSortable": false, "bSearchable": false },
104
        { "aTargets": ["NoSort"], "bSortable": false, "bSearchable": false }
106
    ];
105
    ];
107
    if (new_parameters["aoColumnDefs"] === undefined) {
106
    if (new_parameters["aoColumnDefs"] === undefined) {
108
        new_parameters["aoColumnDefs"] = default_column_defs;
107
        new_parameters["aoColumnDefs"] = default_column_defs;
(-)a/koha-tmpl/opac-tmpl/bootstrap/en/includes/holds-table.inc (-19 / +15 lines)
Lines 12-22 Link Here
12
                <tr>
12
                <tr>
13
                    <th class="anti-the">Title</th>
13
                    <th class="anti-the">Title</th>
14
                    [% IF ( showpriority ) %]
14
                    [% IF ( showpriority ) %]
15
                        <th class="title-string">Placed on</th>
15
                        <th>Placed on</th>
16
                    [% ELSE %]
16
                    [% ELSE %]
17
                        <th class="psort title-string">Placed on</th>
17
                        <th class="psort">Placed on</th>
18
                    [% END %]
18
                    [% END %]
19
                    <th class="title-string">Expires on</th>
19
                    <th>Expires on</th>
20
                    [% UNLESS( singleBranchMode) %]
20
                    [% UNLESS( singleBranchMode) %]
21
                        <th>Pick up location</th>
21
                        <th>Pick up location</th>
22
                    [% END %]
22
                    [% END %]
Lines 62-89 Link Here
62
                                <p class="hint">Item on hold: [% HOLD.item.barcode | html %]</p>
62
                                <p class="hint">Item on hold: [% HOLD.item.barcode | html %]</p>
63
                            [% END %]
63
                            [% END %]
64
                        </td>
64
                        </td>
65
                        <td class="reservedate">
65
                        <td class="reservedate" data-order="[% HOLD.reservedate | html %]">
66
                            <span title="[% HOLD.reservedate | html %]">
66
                            <span class="tdlabel">Hold date:</span>
67
                                <span class="tdlabel">Hold date:</span>
68
                                [% HOLD.reservedate | $KohaDates %]
67
                                [% HOLD.reservedate | $KohaDates %]
69
                            </span>
68
                            </span>
70
                        </td>
69
                        </td>
71
                        <td class="expirationdate">
70
                        [% IF ! HOLD.found %]
72
                            [% IF ! HOLD.found %]
71
                            <td class="expirationdate" data-order="[% HOLD.expirationdate | html %]">
73
                                [% IF ( HOLD.expirationdate ) %]
72
                                [% IF ( HOLD.expirationdate ) %]
74
                                    <span title="[% HOLD.expirationdate | html %]">
73
                                    <span class="tdlabel">Expiration:</span>
75
                                        <span class="tdlabel">Expiration:</span>
74
                                    [% HOLD.expirationdate | $KohaDates %]
76
                                            [% HOLD.expirationdate | $KohaDates %]
77
                                    </span>
78
                                [% ELSE %]
75
                                [% ELSE %]
79
                                    <span title="0000-00-00">
76
                                    <span class="tdlabel">Expiration:</span>
80
                                        <span class="tdlabel">Expiration:</span>
77
                                    Never expires
81
                                        Never expires
82
                                    </span>
83
                                [% END %]
78
                                [% END %]
84
                            [% ELSE %]
79
                        [% ELSE %]
85
                                <span title="0000-00-00">-</span>
80
                            <td class="expirationdate" data-order="0000-00-00">
86
                            [% END %]
81
                                -
82
                        [% END %]
87
                        </td>
83
                        </td>
88
                        [% UNLESS( singleBranchMode) %]
84
                        [% UNLESS( singleBranchMode) %]
89
                            <td class="branch">
85
                            <td class="branch">
(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-account.tt (-3 lines)
Lines 93-101 $( document ).ready(function() { Link Here
93
    var txtInactivefilter = _("Show all transactions");
93
    var txtInactivefilter = _("Show all transactions");
94
94
95
    var fines_table = $("#finestable").dataTable($.extend(true, {}, dataTablesDefaults, {
95
    var fines_table = $("#finestable").dataTable($.extend(true, {}, dataTablesDefaults, {
96
        "columnDefs": [
97
             { "type": "title-string", "targets" : [ "title-string" ] }
98
         ],
99
         [% IF ENABLE_OPAC_PAYMENTS %]
96
         [% IF ENABLE_OPAC_PAYMENTS %]
100
         "order": [[ 1, "desc" ]],
97
         "order": [[ 1, "desc" ]],
101
         [% ELSE %]
98
         [% ELSE %]
(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-course-details.tt (-2 / +2 lines)
Lines 69-75 Link Here
69
                                    <th>Call number</th>
69
                                    <th>Call number</th>
70
                                    <th>Copy number</th>
70
                                    <th>Copy number</th>
71
                                    <th>Status</th>
71
                                    <th>Status</th>
72
                                    <th class="title-string">Date due</th>
72
                                    <th>Date due</th>
73
                                    <th>Notes</th>
73
                                    <th>Notes</th>
74
                                    <th>Link</th>
74
                                    <th>Link</th>
75
                                </tr>
75
                                </tr>
Lines 86-92 Link Here
86
                                        <td>[% cr.item.itemcallnumber | html %]</td>
86
                                        <td>[% cr.item.itemcallnumber | html %]</td>
87
                                        <td>[% cr.item.copynumber | html %]</td>
87
                                        <td>[% cr.item.copynumber | html %]</td>
88
                                        <td>[% INCLUDE 'item-status.inc' item=cr.item issue=cr.issue %]</td>
88
                                        <td>[% INCLUDE 'item-status.inc' item=cr.item issue=cr.issue %]</td>
89
                                        <td><span title="[% cr.issue.date_due | html %]">[% cr.issue.date_due | $KohaDates  as_due_date => 1 %]</span></td>
89
                                        <td data-order="[% cr.issue.date_due | html %]">[% cr.issue.date_due | $KohaDates  as_due_date => 1 %]</td>
90
                                        <td>[% IF ( cr.public_note ) %]
90
                                        <td>[% IF ( cr.public_note ) %]
91
                                                [% cr.public_note | $raw %]
91
                                                [% cr.public_note | $raw %]
92
                                            [% ELSIF ( cr.item.itemnotes ) %]
92
                                            [% ELSIF ( cr.item.itemnotes ) %]
(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-detail.tt (-5 / +5 lines)
Lines 823-830 Link Here
823
                                        <thead>
823
                                        <thead>
824
                                            <tr>
824
                                            <tr>
825
                                                <th id="serial_serialseq" data-colname="serial_serialseq">Issue #</th>
825
                                                <th id="serial_serialseq" data-colname="serial_serialseq">Issue #</th>
826
                                                <th id="serial_publisheddate" data-colname="serial_publisheddate" class="title-string">Publication date</th>
826
                                                <th id="serial_publisheddate" data-colname="serial_publisheddate">Publication date</th>
827
                                                <th id="serial_planneddate" data-colname="serial_planneddate" class="title-string">Received date</th>
827
                                                <th id="serial_planneddate" data-colname="serial_planneddate">Received date</th>
828
                                                <th id="serial_status" data-colname="serial_status">Status</th>
828
                                                <th id="serial_status" data-colname="serial_status">Status</th>
829
                                                <th id="serial_notes" data-colname="serial_notes">Note</th>
829
                                                <th id="serial_notes" data-colname="serial_notes">Note</th>
830
                                            </tr>
830
                                            </tr>
Lines 833-840 Link Here
833
                                            [% FOREACH latestserial IN subscription.latestserials %]
833
                                            [% FOREACH latestserial IN subscription.latestserials %]
834
                                                <tr>
834
                                                <tr>
835
                                                    <td class="serialseq">[% latestserial.serialseq | html %]</td>
835
                                                    <td class="serialseq">[% latestserial.serialseq | html %]</td>
836
                                                    <td class="publisheddate"><span title="[% latestserial.publisheddate | html %]">[% latestserial.publisheddate | $KohaDates %]</span></td>
836
                                                    <td class="publisheddate" data-order="[% latestserial.publisheddate | html %]">[% latestserial.publisheddate | $KohaDates %]</td>
837
                                                    <td class="planneddate"><span title="[% latestserial.planneddate | html %]">[% latestserial.planneddate | $KohaDates %]</span></td>
837
                                                    <td class="planneddate" data-order="[% latestserial.planneddate | html %]">[% latestserial.planneddate | $KohaDates %]</td>
838
                                                    <td class="serial_status">
838
                                                    <td class="serial_status">
839
                                                        [% IF (latestserial.status1 ) %]<span>Expected</span>[% END %]
839
                                                        [% IF (latestserial.status1 ) %]<span>Expected</span>[% END %]
840
                                                        [% IF (latestserial.status2 ) %]<span>Arrived</span>[% END %]
840
                                                        [% IF (latestserial.status2 ) %]<span>Arrived</span>[% END %]
Lines 1398-1404 Link Here
1398
                [% IF ( itemdata_copynumber ) %]<td class="copynumber">[% ITEM_RESULT.copynumber | html %]</td>[% END %]
1398
                [% IF ( itemdata_copynumber ) %]<td class="copynumber">[% ITEM_RESULT.copynumber | html %]</td>[% END %]
1399
                <td class="status">[% INCLUDE 'item-status-schema-org.inc' item = ITEM_RESULT %][% INCLUDE 'item-status.inc' item = ITEM_RESULT %]</td>
1399
                <td class="status">[% INCLUDE 'item-status-schema-org.inc' item = ITEM_RESULT %][% INCLUDE 'item-status.inc' item = ITEM_RESULT %]</td>
1400
                [% IF ( itemdata_itemnotes ) %]<td class="notes" property="description">[% ITEM_RESULT.itemnotes | $raw %]</td>[% END %]
1400
                [% IF ( itemdata_itemnotes ) %]<td class="notes" property="description">[% ITEM_RESULT.itemnotes | $raw %]</td>[% END %]
1401
                <td class="date_due"><span title="[% ITEM_RESULT.datedue | html %]">[% ITEM_RESULT.datedue | $KohaDates  as_due_date => 1 %]</span></td>
1401
                <td class="date_due" data-order="[% ITEM_RESULT.datedue | html %]">[% ITEM_RESULT.datedue | $KohaDates  as_due_date => 1 %]</td>
1402
                    <td class="barcode" property="serialNumber">[% ITEM_RESULT.barcode | html %]</td>
1402
                    <td class="barcode" property="serialNumber">[% ITEM_RESULT.barcode | html %]</td>
1403
                [% IF holds_count.defined || show_priority %]
1403
                [% IF holds_count.defined || show_priority %]
1404
                    <td class="holds_count">
1404
                    <td class="holds_count">
(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-full-serial-issues.tt (-24 / +14 lines)
Lines 135-161 Link Here
135
                                    <tbody>
135
                                    <tbody>
136
                                        [% FOREACH serial IN year.serials %]
136
                                        [% FOREACH serial IN year.serials %]
137
                                            <tr>
137
                                            <tr>
138
                                                <td>
138
                                                <td data-order="[% serial.publisheddate | html %]">
139
                                                    [% IF ( serial.publisheddate ) %]
139
                                                    [% IF ( serial.publisheddate ) %]
140
                                                        <span title="[% serial.publisheddate | html %]">
140
                                                        [% IF serial.publisheddatetext %]
141
                                                            [% IF serial.publisheddatetext %]
141
                                                            [% serial.publisheddatetext | html %]
142
                                                                [% serial.publisheddatetext | html %]
142
                                                        [% ELSE %]
143
                                                            [% ELSE %]
143
                                                            [% serial.publisheddate | $KohaDates %]
144
                                                                [% serial.publisheddate | $KohaDates %]
144
                                                        [% END %]
145
                                                            [% END %]
146
                                                        </span>
147
                                                    [% ELSE %]
145
                                                    [% ELSE %]
148
                                                        &nbsp;
146
                                                        &nbsp;
149
                                                    [% END %]
147
                                                    [% END %]
150
                                                </td>
148
                                                </td>
151
                                                <td class="libraryfilterclass">[% Branches.GetName( serial.branchcode ) | html %]</td>
149
                                                <td class="libraryfilterclass">[% Branches.GetName( serial.branchcode ) | html %]</td>
152
                                                <td>[% serial.notes | html %]</td>
150
                                                <td>[% serial.notes | html %]</td>
153
                                                <td>
151
                                                [% IF ( serial.status2 && serial.planneddate ) %]
154
                                                    [% IF ( serial.status2 && serial.planneddate ) %]
152
                                                    <td data-order="[% serial.planneddate | html %]">
155
                                                        <span title="[% serial.planneddate | html %]">[% serial.planneddate | $KohaDates %]</span>
153
                                                        [% serial.planneddate | $KohaDates %]
156
                                                    [% ELSE %]
154
                                                [% ELSE %]
157
                                                        <span title="9999-12-31">&nbsp;</span>
155
                                                    <td data-order="9999-12-31">
158
                                                    [% END %]
156
                                                        &nbsp;
157
                                                [% END %]
159
                                                </td>
158
                                                </td>
160
                                                <td>[% serial.serialseq | html %]</td>
159
                                                <td>[% serial.serialseq | html %]</td>
161
                                                <td>
160
                                                <td>
Lines 210-225 Link Here
210
                $(this).addClass("currentsubtab");
209
                $(this).addClass("currentsubtab");
211
            });
210
            });
212
            $(".subscriptionstclass").dataTable($.extend(true, {}, dataTablesDefaults, {
211
            $(".subscriptionstclass").dataTable($.extend(true, {}, dataTablesDefaults, {
213
                "order": [[ 0, "desc" ]],
212
                "order": [[ 0, "desc" ]]
214
                "columns": [
215
                    { "type": "title-string" },
216
                    null,
217
                    null,
218
                    { "type": "title-string" },
219
                    null,
220
                    null,
221
                    null
222
                ]
223
            }));
213
            }));
224
        });
214
        });
225
215
(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-holdshistory.tt (-27 / +27 lines)
Lines 2-7 Link Here
2
[% USE Koha %]
2
[% USE Koha %]
3
[% USE Branches %]
3
[% USE Branches %]
4
[% USE KohaDates %]
4
[% USE KohaDates %]
5
[% USE TablesSettings %]
5
[% INCLUDE 'doc-head-open.inc' %]
6
[% INCLUDE 'doc-head-open.inc' %]
6
<title>[% IF ( LibraryNameTitle ) %][% LibraryNameTitle | html %][% ELSE %]Koha online[% END %] catalog &rsaquo; Your holds history</title>
7
<title>[% IF ( LibraryNameTitle ) %][% LibraryNameTitle | html %][% ELSE %]Koha online[% END %] catalog &rsaquo; Your holds history</title>
7
[% INCLUDE 'doc-head-close.inc' %]
8
[% INCLUDE 'doc-head-close.inc' %]
Lines 58-64 Link Here
58
                        You have never placed a hold from this library.
59
                        You have never placed a hold from this library.
59
                    [% ELSE %]
60
                    [% ELSE %]
60
                        <div id="opac-user-holdsrec">
61
                        <div id="opac-user-holdsrec">
61
                            <div id="tabs-container" style="overflow:auto">
62
                            <div id="tabs-container">
62
                                <div class="controls">
63
                                <div class="controls">
63
                                    <div class="resultscontrol resort">
64
                                    <div class="resultscontrol resort">
64
                                        <form id="sortform" action="/cgi-bin/koha/opac-holdshistory.pl" method="get">
65
                                        <form id="sortform" action="/cgi-bin/koha/opac-holdshistory.pl" method="get">
Lines 89-98 Link Here
89
                                        <th>Author</th>
90
                                        <th>Author</th>
90
                                        <th>Barcode</th>
91
                                        <th>Barcode</th>
91
                                        <th>Library</th>
92
                                        <th>Library</th>
92
                                        <th class="title-string">Hold date</th>
93
                                        <th>Hold date</th>
93
                                        <th class="title-string">Expiration date</th>
94
                                        <th>Expiration date</th>
94
                                        <th class="title-string">Waiting date</th>
95
                                        <th>Waiting date</th>
95
                                        <th class="title-string">Cancellation date</th>
96
                                        <th>Cancellation date</th>
96
                                        [% IF show_itemtype_column %]
97
                                        [% IF show_itemtype_column %]
97
                                        <th>Requested item type</th>
98
                                        <th>Requested item type</th>
98
                                        [% END %]
99
                                        [% END %]
Lines 106-131 Link Here
106
                                        <td>[% hold.biblio.author | html %]</td>
107
                                        <td>[% hold.biblio.author | html %]</td>
107
                                        <td>[% hold.item.barcode | html %]</td>
108
                                        <td>[% hold.item.barcode | html %]</td>
108
                                        <td>[% Branches.GetName( hold.branchcode ) | html %]</td>
109
                                        <td>[% Branches.GetName( hold.branchcode ) | html %]</td>
109
                                        <td><span title="[% hold.reservedate | html %]">[% hold.reservedate | $KohaDates %]</span></td>
110
                                        <td data-order="[% hold.reservedate | html %]">[% hold.reservedate | $KohaDates %]</td>
110
                                        <td>
111
                                        <td data-order="[% hold.expirationdate | html %]">
111
                                            [% IF hold.expirationdate %]
112
                                            [% IF hold.expirationdate %]
112
                                                <span title="[% hold.expirationdate | html %]">[% hold.expirationdate | $KohaDates %]</span>
113
                                                [% hold.expirationdate | $KohaDates %]
113
                                            [% ELSE %]
114
                                                <span title="0000-00-00"></span>
115
                                            [% END %]
114
                                            [% END %]
116
                                        </td>
115
                                        </td>
117
                                        <td>
116
                                        <td data-order="[% hold.waitingdate | html %]">
118
                                            [% IF hold.waitingdate %]
117
                                            [% IF hold.waitingdate %]
119
                                                <span title="[% hold.waitingdate | html %]">[% hold.waitingdate | $KohaDates %]</span>
118
                                                [% hold.waitingdate | $KohaDates %]
120
                                            [% ELSE %]
121
                                                <span title="0000-00-00"></span>
122
                                            [% END %]
119
                                            [% END %]
123
                                        </td>
120
                                        </td>
124
                                        <td>
121
                                        <td data-order="[% hold.cancellationdate | html %]">
125
                                            [% IF hold.cancellationdate %]
122
                                            [% IF hold.cancellationdate %]
126
                                                <span title="[% hold.cancellationdate | html %]">[% hold.cancellationdate | $KohaDates %]</span>
123
                                                [% hold.cancellationdate | $KohaDates %]
127
                                            [% ELSE %]
128
                                                <span title="0000-00-00"></span>
129
                                            [% END %]
124
                                            [% END %]
130
                                        </td>
125
                                        </td>
131
                                        [% IF show_itemtype_column %]
126
                                        [% IF show_itemtype_column %]
Lines 166-185 Link Here
166
[% INCLUDE 'opac-bottom.inc' %]
161
[% INCLUDE 'opac-bottom.inc' %]
167
[% BLOCK jsinclude %]
162
[% BLOCK jsinclude %]
168
[% INCLUDE 'datatables.inc' %]
163
[% INCLUDE 'datatables.inc' %]
164
[% INCLUDE 'columns_settings.inc' %]
169
<script>
165
<script>
170
    $(document).ready(function() {
166
    $(document).ready(function() {
171
        $('#sort').change(function() {
167
        $('#sort').change(function() {
172
            $('#sortform').submit();
168
            $('#sortform').submit();
173
        });
169
        });
174
        var table = $("table_holdshistory").dataTable($.extend(true, {}, dataTablesDefaults, {
170
        var columns_settings = []; // Empty because there are no columns we want to be configurable
175
            "sPaginationType": "four_button",
171
        var table = KohaTable("#table_holdshistory", {
176
            "aaSorting": [[4, 'desc']],
172
            "dom": '<"top"<"table_entries"i><"table_controls"fB>>t',
177
            "sDom": 'C<"top pager"ilpfB><"#filter_c">tr<"bottom pager"ip>',
173
            "autoWidth": false,
178
            "aoColumnDefs": [
174
            "sorting": [[4, 'desc']],
179
                { "sType": "anti-the", "aTargets" : [ "anti-the" ] },
175
            "columnDefs": [
180
                { "sType": "title-string", "aTargets" : [ "title-string" ] }
176
                { "sType": "anti-the", "aTargets" : [ "anti-the" ] }
181
            ]
177
            ],
182
        }));
178
            "language": {
179
                "search": "_INPUT_",
180
                "searchPlaceholder": _("Search")
181
            }
182
        }, columns_settings);
183
    });
183
    });
184
</script>
184
</script>
185
[% END %]
185
[% END %]
(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-illrequests.tt (-6 / +5 lines)
Lines 133-140 Link Here
133
                                        <th>Requested from</th>
133
                                        <th>Requested from</th>
134
                                        <th>Request type</th>
134
                                        <th>Request type</th>
135
                                        <th>Status</th>
135
                                        <th>Status</th>
136
                                        <th class="title-string">Request placed</th>
136
                                        <th>Request placed</th>
137
                                        <th class="title-string">Last updated</th>
137
                                        <th>Last updated</th>
138
                                        <th></th>
138
                                        <th></th>
139
                                    </tr>
139
                                    </tr>
140
                                </thead>
140
                                </thead>
Lines 155-162 Link Here
155
                                                [% IF type %][% type | html %][% ELSE %]<span>N/A</span>[% END %]
155
                                                [% IF type %][% type | html %][% ELSE %]<span>N/A</span>[% END %]
156
                                            </td>
156
                                            </td>
157
                                            <td>[% request.status_alias ? request.statusalias.lib_opac : request.capabilities.$status.name | html %]</td>
157
                                            <td>[% request.status_alias ? request.statusalias.lib_opac : request.capabilities.$status.name | html %]</td>
158
                                            <td><span title="[% request.placed | html %]">[% request.placed | $KohaDates %]</span></td>
158
                                            <td data-order="[% request.placed | html %]">[% request.placed | $KohaDates %]</td>
159
                                            <td><span title="[% request.updated | html %]">[% request.updated | $KohaDates %]</span></td>
159
                                            <td data-order="[% request.updated | html %]">[% request.updated | $KohaDates %]</td>
160
                                            <td>
160
                                            <td>
161
                                                <a href="/cgi-bin/koha/opac-illrequests.pl?method=view&amp;illrequest_id=[% request.id | uri %]" class="btn btn-primary btn-sm pull-right">View</a>
161
                                                <a href="/cgi-bin/koha/opac-illrequests.pl?method=view&amp;illrequest_id=[% request.id | uri %]" class="btn btn-primary btn-sm pull-right">View</a>
162
                                            </td>
162
                                            </td>
Lines 284-291 Link Here
284
    <script>
284
    <script>
285
        $("#illrequestlist").dataTable($.extend(true, {}, dataTablesDefaults, {
285
        $("#illrequestlist").dataTable($.extend(true, {}, dataTablesDefaults, {
286
            "columnDefs": [
286
            "columnDefs": [
287
                { "targets": [ -1 ], "sortable": false, "searchable": false },
287
                { "targets": [ -1 ], "sortable": false, "searchable": false }
288
                { "type": "title-string", "targets" : [ "title-string" ] }
289
            ],
288
            ],
290
            "order": [[ 3, "desc" ]],
289
            "order": [[ 3, "desc" ]],
291
            "deferRender": true
290
            "deferRender": true
(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-readingrecord.tt (-7 / +8 lines)
Lines 91-97 Link Here
91
                                                <th class="anti-the">Title</th>
91
                                                <th class="anti-the">Title</th>
92
                                                <th>Item type</th>
92
                                                <th>Item type</th>
93
                                                <th>Call no.</th>
93
                                                <th>Call no.</th>
94
                                                <th class="title-string">Date</th>
94
                                                <th>Date</th>
95
                                                [% IF ( OPACMySummaryHTML ) %]
95
                                                [% IF ( OPACMySummaryHTML ) %]
96
                                                    <th class="NoSort noExport">Links</th>
96
                                                    <th class="NoSort noExport">Links</th>
97
                                                [% END %]
97
                                                [% END %]
Lines 173-185 Link Here
173
                                                <span class="tdlabel">Call number:</span>
173
                                                <span class="tdlabel">Call number:</span>
174
                                                [% issue.itemcallnumber | html %]
174
                                                [% issue.itemcallnumber | html %]
175
                                                </td>
175
                                                </td>
176
                                                <td>
176
                                                [% IF issue.returndate %]
177
                                                    [% IF issue.returndate %]
177
                                                    <td data-order="[% issue.returndate | html %]">
178
                                                        <span class="tdlabel">Check-in date:</span>
178
                                                        <span class="tdlabel">Check-in date:</span>
179
                                                        <span title="[% issue.returndate | html %]">[% issue.returndate | $KohaDates %]</span>
179
                                                        [% issue.returndate | $KohaDates %]
180
                                                    [% ELSE %]
180
                                                [% ELSE %]
181
                                                        <span title="Checked out"><em>(Checked out)</em></span>
181
                                                    <td data-order="Checked out">
182
                                                    [% END %]
182
                                                        <em>(Checked out)</em>
183
                                                [% END %]
183
                                                </td>
184
                                                </td>
184
                                                [% IF OPACMySummaryHTML %]
185
                                                [% IF OPACMySummaryHTML %]
185
                                                    <td>[% issue.MySummaryHTML | $raw %]</td>
186
                                                    <td>[% issue.MySummaryHTML | $raw %]</td>
(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-search-history.tt (-10 / +9 lines)
Lines 76-84 Link Here
76
                                                        <td class="selectcol">
76
                                                        <td class="selectcol">
77
                                                            <input type="checkbox" name="id" value="[% s.id | html %]" id="result[% s.id | html %]" />
77
                                                            <input type="checkbox" name="id" value="[% s.id | html %]" id="result[% s.id | html %]" />
78
                                                        </td>
78
                                                        </td>
79
                                                        <td>
79
                                                        <td data-order="[% s.time | html %]">
80
                                                            <label for="result[% s.id | html %]">
80
                                                            <label for="result[% s.id | html %]">
81
                                                                <span title="[% s.time | html %]">[% s.time |$KohaDates  with_hours => 1 %]</span>
81
                                                                [% s.time |$KohaDates  with_hours => 1 %]
82
                                                            </label>
82
                                                            </label>
83
                                                        </td>
83
                                                        </td>
84
                                                        <td>
84
                                                        <td>
Lines 119-127 Link Here
119
                                                    <td class="selectcol">
119
                                                    <td class="selectcol">
120
                                                        <input type="checkbox" name="id" value="[% s.id | html %]" id="result[% s.id | html %]" />
120
                                                        <input type="checkbox" name="id" value="[% s.id | html %]" id="result[% s.id | html %]" />
121
                                                    </td>
121
                                                    </td>
122
                                                    <td>
122
                                                    <td data-order="[% s.time | html %]">
123
                                                        <label for="result[% s.id | html %]">
123
                                                        <label for="result[% s.id | html %]">
124
                                                            <span title="[% s.time | html %]">[% s.time |$KohaDates  with_hours => 1 %]</span>
124
                                                            [% s.time |$KohaDates  with_hours => 1 %]
125
                                                        </label>
125
                                                        </label>
126
                                                    </td>
126
                                                    </td>
127
                                                    <td>
127
                                                    <td>
Lines 169-177 Link Here
169
                                                        <td class="selectcol">
169
                                                        <td class="selectcol">
170
                                                            <input type="checkbox" name="id" value="[% s.id | html %]" id="result[% s.id | html %]" />
170
                                                            <input type="checkbox" name="id" value="[% s.id | html %]" id="result[% s.id | html %]" />
171
                                                        </td>
171
                                                        </td>
172
                                                        <td>
172
                                                        <td data-order="[% s.time | html %]">
173
                                                            <label for="result[% s.id | html %]">
173
                                                            <label for="result[% s.id | html %]">
174
                                                                <span title="[% s.time | html %]">[% s.time |$KohaDates  with_hours => 1 %]</span>
174
                                                                [% s.time |$KohaDates  with_hours => 1 %]
175
                                                            </label>
175
                                                            </label>
176
                                                        </td>
176
                                                        </td>
177
                                                        <td><a href="/cgi-bin/koha/opac-authorities-home.pl?[% s.query_cgi | $raw %]">[% s.query_desc | html %]</a></td>
177
                                                        <td><a href="/cgi-bin/koha/opac-authorities-home.pl?[% s.query_cgi | $raw %]">[% s.query_desc | html %]</a></td>
Lines 204-212 Link Here
204
                                                        <td class="selectcol">
204
                                                        <td class="selectcol">
205
                                                            <input type="checkbox" name="id" value="[% s.id | html %]" id="result[% s.id | html %]" />
205
                                                            <input type="checkbox" name="id" value="[% s.id | html %]" id="result[% s.id | html %]" />
206
                                                        </td>
206
                                                        </td>
207
                                                        <td>
207
                                                        <td data-order="[% s.time | html %]">
208
                                                            <label for="result[% s.id | html %]">
208
                                                            <label for="result[% s.id | html %]">
209
                                                                <span title="[% s.time | html %]">[% s.time |$KohaDates  with_hours => 1 %]</span>
209
                                                                [% s.time |$KohaDates  with_hours => 1 %]
210
                                                            </label>
210
                                                            </label>
211
                                                        </td>
211
                                                        </td>
212
                                                        <td><a href="/cgi-bin/koha/opac-authorities-home.pl?[% s.query_cgi | $raw %]">[% s.query_desc | html %]</a></td>
212
                                                        <td><a href="/cgi-bin/koha/opac-authorities-home.pl?[% s.query_cgi | $raw %]">[% s.query_desc | html %]</a></td>
Lines 259-266 Link Here
259
            "order": [[ 1, "desc" ]],
259
            "order": [[ 1, "desc" ]],
260
            "dom": '<"top"<"table_entries"><"table_controls"fB>>t',
260
            "dom": '<"top"<"table_entries"><"table_controls"fB>>t',
261
            "columnDefs": [
261
            "columnDefs": [
262
                { "targets": [ 0 ], "sortable": false, "searchable": false },
262
                { "targets": [ 0 ], "sortable": false, "searchable": false }
263
                { "targets": [ 1 ], "type": "title-string" },
264
            ],
263
            ],
265
            "language": {
264
            "language": {
266
                "search": "_INPUT_",
265
                "search": "_INPUT_",
(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-tags.tt (-13 / +13 lines)
Lines 133-139 Link Here
133
                        <form id="deletetags" method="post" action="opac-tags.pl">
133
                        <form id="deletetags" method="post" action="opac-tags.pl">
134
                            <h2>Your tags</h2>
134
                            <h2>Your tags</h2>
135
                            <table id="mytagst" class="table table-bordered table-striped">
135
                            <table id="mytagst" class="table table-bordered table-striped">
136
                                <thead><tr><th>&nbsp;</th><th>Term</th><th>Title</th><th>Date added</th></tr></thead>
136
                                <thead>
137
                                    <tr>
138
                                        <th>&nbsp;</th>
139
                                        <th>Term</th>
140
                                        <th class="anti-the">Title</th>
141
                                        <th>Date added</th>
142
                                    </tr>
143
                                </thead>
137
                                <tbody>
144
                                <tbody>
138
                                    [% FOREACH MY_TAG IN MY_TAGS %]
145
                                    [% FOREACH MY_TAG IN MY_TAGS %]
139
                                        [% IF MY_TAG.visible %]
146
                                        [% IF MY_TAG.visible %]
Lines 164-174 Link Here
164
171
165
                                                [% INCLUDE 'title-actions-menu.inc' items=MY_TAG %]
172
                                                [% INCLUDE 'title-actions-menu.inc' items=MY_TAG %]
166
                                            </td>
173
                                            </td>
167
                                            <td>
174
                                            <td data-order="[% MY_TAG.date_created | html %]">
168
                                                <span title="[% MY_TAG.date_created | html %]">
175
                                                <span class="tdlabel">Date added:</span>
169
                                                    <span class="tdlabel">Date added:</span>
176
                                                [% MY_TAG.date_created | $KohaDates %]
170
                                                    [% MY_TAG.date_created | $KohaDates %]
171
                                                </span>
172
                                            </td>
177
                                            </td>
173
                                        </tr>
178
                                        </tr>
174
                                        [% END %]
179
                                        [% END %]
Lines 211-223 Link Here
211
        $("#mytagst").dataTable($.extend(true, {}, dataTablesDefaults, {
216
        $("#mytagst").dataTable($.extend(true, {}, dataTablesDefaults, {
212
            "sorting": [[ 2, "asc" ]],
217
            "sorting": [[ 2, "asc" ]],
213
            "columnDefs": [
218
            "columnDefs": [
214
              { "targets": [ 0 ], "sortable": false, "searchable": false }
219
                { "targets": [ 0 ], "sortable": false, "searchable": false },
215
            ],
220
                { "sType": "anti-the", "aTargets" : [ "anti-the" ] }
216
            "columns": [
217
                null,
218
                { "type": "anti-the" },
219
                { "type": "title-string" },
220
                null
221
            ]
221
            ]
222
        }));
222
        }));
223
    });
223
    });
(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt (-19 / +12 lines)
Lines 239-245 Link Here
239
                                                [% IF ( JacketImages || AdlibrisEnabled ) %]<th class="nosort">&nbsp;</th>[% END %]
239
                                                [% IF ( JacketImages || AdlibrisEnabled ) %]<th class="nosort">&nbsp;</th>[% END %]
240
                                                <th class="anti-the">Title</th>
240
                                                <th class="anti-the">Title</th>
241
                                                <th>Author</th>
241
                                                <th>Author</th>
242
                                                <th class="title-string psort">Due</th>
242
                                                <th class="psort">Due</th>
243
                                                [% UNLESS ( item_level_itypes ) %]
243
                                                [% UNLESS ( item_level_itypes ) %]
244
                                                    <th>Item type</th>
244
                                                    <th>Item type</th>
245
                                                [% END %]
245
                                                [% END %]
Lines 319-336 Link Here
319
319
320
                                                <td class="author">[% ISSUE.author | html %]</td>
320
                                                <td class="author">[% ISSUE.author | html %]</td>
321
                                                [% IF ( ISSUE.overdue ) %]
321
                                                [% IF ( ISSUE.overdue ) %]
322
                                                    <td class="date_due overdue">
322
                                                    <td class="date_due overdue" data-order="[% ISSUE.date_due | html %]">
323
                                                        <span title="[% ISSUE.date_due | html %]">
323
                                                        <span class="tdlabel">Date due:</span>
324
                                                            <span class="tdlabel">Date due:</span>
324
                                                        [% ISSUE.date_due | $KohaDates  as_due_date => 1 %]
325
                                                            [% ISSUE.date_due | $KohaDates  as_due_date => 1 %]
326
                                                        </span>
327
                                                    </td>
325
                                                    </td>
328
                                                [% ELSE %]
326
                                                [% ELSE %]
329
                                                    <td class="date_due">
327
                                                    <td class="date_due" data-order="[% ISSUE.date_due | html %]">
330
                                                        <span title="[% ISSUE.date_due | html %]">
328
                                                        <span class="tdlabel">Date due:</span>
331
                                                            <span class="tdlabel">Date due:</span>
329
                                                        [% ISSUE.date_due | $KohaDates  as_due_date => 1 %]
332
                                                            [% ISSUE.date_due | $KohaDates  as_due_date => 1 %]
333
                                                        </span>
334
                                                    </td>
330
                                                    </td>
335
                                                [% END %]
331
                                                [% END %]
336
                                                [% UNLESS ( item_level_itypes ) %]
332
                                                [% UNLESS ( item_level_itypes ) %]
Lines 589-595 Link Here
589
                                            [% UNLESS ( item_level_itypes ) %]<th>Item type</th> [% END %]
585
                                            [% UNLESS ( item_level_itypes ) %]<th>Item type</th> [% END %]
590
                                            [% IF ( show_barcode ) %]<th>Barcode</th>[% END %]
586
                                            [% IF ( show_barcode ) %]<th>Barcode</th>[% END %]
591
                                            <th>Call no.</th>
587
                                            <th>Call no.</th>
592
                                            <th class="title-string psort">Due</th>
588
                                            <th class="psort">Due</th>
593
                                            [% IF ( OpacRenewalAllowed ) %]
589
                                            [% IF ( OpacRenewalAllowed ) %]
594
                                                <th class="nosort">Renew</th>
590
                                                <th class="nosort">Renew</th>
595
                                            [% END %]
591
                                            [% END %]
Lines 659-669 Link Here
659
                                                    <span class="tdlabel">Call no.:</span>
655
                                                    <span class="tdlabel">Call no.:</span>
660
                                                    [% OVERDUE.itemcallnumber | html %]
656
                                                    [% OVERDUE.itemcallnumber | html %]
661
                                                </td>
657
                                                </td>
662
                                                <td>
658
                                                <td data-order="[% OVERDUE.date_due | html %]">
663
                                                    <span title="[% OVERDUE.date_due | html %]">
659
                                                    <span class="tdlabel">Date due:</span>
664
                                                        <span class="tdlabel">Date due:</span>
660
                                                    [% OVERDUE.date_due | $KohaDates  as_due_date => 1 %]
665
                                                        [% OVERDUE.date_due | $KohaDates  as_due_date => 1 %]
666
                                                    </span>
667
                                                </td>
661
                                                </td>
668
                                                [% IF ( OpacRenewalAllowed ) %]
662
                                                [% IF ( OpacRenewalAllowed ) %]
669
                                                    <td>
663
                                                    <td>
Lines 906-913 Link Here
906
                    "dom": '<"top"<"table_entries"><"table_controls"fB>>t',
900
                    "dom": '<"top"<"table_entries"><"table_controls"fB>>t',
907
                    "columnDefs": [
901
                    "columnDefs": [
908
                        { "targets": [ "nosort" ],"sortable": false,"searchable": false },
902
                        { "targets": [ "nosort" ],"sortable": false,"searchable": false },
909
                        { "type": "anti-the", "targets" : [ "anti-the" ] },
903
                        { "type": "anti-the", "targets" : [ "anti-the" ] }
910
                        { "type": "title-string", "targets" : [ "title-string" ] }
911
                    ],
904
                    ],
912
                    "language": {
905
                    "language": {
913
                        "search": "_INPUT_",
906
                        "search": "_INPUT_",
(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/sco/sco-main.tt (-5 / +9 lines)
Lines 294-300 Link Here
294
                                                <th class="noshow">Checked out on</th>
294
                                                <th class="noshow">Checked out on</th>
295
                                                <th class="anti-the">Title</th>
295
                                                <th class="anti-the">Title</th>
296
                                                <th>Call no.</th>
296
                                                <th>Call no.</th>
297
                                                <th class="title-string">Due</th>
297
                                                <th>Due</th>
298
                                                <th class="nosort">Renew</th>
298
                                                <th class="nosort">Renew</th>
299
                                                [% UNLESS ( nofines ) %]
299
                                                [% UNLESS ( nofines ) %]
300
                                                    <th>Fines</th>
300
                                                    <th>Fines</th>
Lines 319-327 Link Here
319
                                                    </td>
319
                                                    </td>
320
                                                    <td>[% ISSUE.itemcallnumber | html %]</td>
320
                                                    <td>[% ISSUE.itemcallnumber | html %]</td>
321
                                                    [% IF ( ISSUE.overdue ) %]
321
                                                    [% IF ( ISSUE.overdue ) %]
322
                                                        <td class="overdue"><span title="[% ISSUE.date_due | html %]">[% ISSUE.date_due | $KohaDates  as_due_date => 1 %]</span></td>
322
                                                        <td class="overdue" data-order="[% ISSUE.date_due | html %]">
323
                                                            [% ISSUE.date_due | $KohaDates  as_due_date => 1 %]
324
                                                        </td>
323
                                                    [% ELSE   %]
325
                                                    [% ELSE   %]
324
                                                        <td><span title="[% ISSUE.date_due | html %]">[% ISSUE.date_due | $KohaDates  as_due_date => 1 %]</span></td>
326
                                                        <td data-order="[% ISSUE.date_due | html %]">
327
                                                            [% ISSUE.date_due | $KohaDates  as_due_date => 1 %]
328
                                                        </td>
325
                                                    [% END %]
329
                                                    [% END %]
326
                                                    <td>
330
                                                    <td>
327
                                                        <form action="/cgi-bin/koha/sco/sco-main.pl" method="post">
331
                                                        <form action="/cgi-bin/koha/sco/sco-main.pl" method="post">
Lines 483-494 Link Here
483
            dofocus();
487
            dofocus();
484
            [% IF ( patronid ) %]sco_init();[% END %]
488
            [% IF ( patronid ) %]sco_init();[% END %]
485
            $("#loanTable").dataTable($.extend(true, {}, dataTablesDefaults, {
489
            $("#loanTable").dataTable($.extend(true, {}, dataTablesDefaults, {
490
                "dom": "t",
486
                "order": [ 0 ],
491
                "order": [ 0 ],
487
                "columnDefs": [
492
                "columnDefs": [
488
                    { "targets": [ "nosort" ], "sortable": false, "searchable": false },
493
                    { "targets": [ "nosort" ], "sortable": false, "searchable": false },
489
                    { "targets": [ "noshow" ], "visible": false, "searchable": false },
494
                    { "targets": [ "noshow" ], "visible": false, "searchable": false },
490
                    { "type": "anti-the", "targets" : [ "anti-the" ] },
495
                    { "type": "anti-the", "targets" : [ "anti-the" ] }
491
                    { "type": "title-string", "targets" : [ "title-string" ] }
492
                ]
496
                ]
493
            }));
497
            }));
494
498
(-)a/koha-tmpl/opac-tmpl/bootstrap/js/datatables.js (-29 lines)
Lines 70-103 $.fn.dataTable.ext.buttons.clearFilter = { Link Here
70
    }
70
    }
71
};
71
};
72
72
73
/* Plugin to allow sorting on data stored in a span's title attribute
74
 *
75
 * Ex: <td><span title="[% ISO_date %]">[% formatted_date %]</span></td>
76
 *
77
 * In DataTables config:
78
 *     "aoColumns": [
79
 *        { "sType": "title-string" },
80
 *      ]
81
 * http://datatables.net/plug-ins/sorting#hidden_title_string
82
 */
83
jQuery.extend( jQuery.fn.dataTableExt.oSort, {
84
    "title-string-pre": function ( a ) {
85
        var m = a.match(/title="(.*?)"/);
86
        if ( null !== m && m.length ) {
87
            return m[1].toLowerCase();
88
        }
89
        return "";
90
    },
91
92
    "title-string-asc": function ( a, b ) {
93
        return ((a < b) ? -1 : ((a > b) ? 1 : 0));
94
    },
95
96
    "title-string-desc": function ( a, b ) {
97
        return ((a < b) ? 1 : ((a > b) ? -1 : 0));
98
    }
99
} );
100
101
/* Plugin to allow sorting on numeric data stored in a span's title attribute
73
/* Plugin to allow sorting on numeric data stored in a span's title attribute
102
 *
74
 *
103
 * Ex: <td><span title="[% decimal_number_that_JS_parseFloat_accepts %]">
75
 * Ex: <td><span title="[% decimal_number_that_JS_parseFloat_accepts %]">
104
- 

Return to bug 28018