@@ -, +, @@
---
.../opac-tmpl/bootstrap/css/src/_common.scss | 3 +-
.../bootstrap/en/includes/account-table.inc | 4 +-
.../bootstrap/en/includes/holds-table.inc | 13 +---
.../bootstrap/en/modules/sco/sco-main.tt | 59 ++++++++++++++-----
4 files changed, 50 insertions(+), 29 deletions(-)
--- a/koha-tmpl/opac-tmpl/bootstrap/css/src/_common.scss
+++ a/koha-tmpl/opac-tmpl/bootstrap/css/src/_common.scss
@@ -705,7 +705,8 @@ table {
.nosort,
.nosort.sorting_asc,
.nosort.sorting_desc,
- .nosort.sorting {
+ .nosort.sorting,
+ .sorting_disabled {
background: #E2E8E8 none;
padding-right: 19px;
}
--- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/account-table.inc
+++ a/koha-tmpl/opac-tmpl/bootstrap/en/includes/account-table.inc
@@ -7,8 +7,8 @@
[% IF ENABLE_OPAC_PAYMENTS %] | [% END %]
Created |
- Updated |
- Type |
+ Updated |
+ Type |
Description |
Amount |
Amount outstanding |
--- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/holds-table.inc
+++ a/koha-tmpl/opac-tmpl/bootstrap/en/includes/holds-table.inc
@@ -8,7 +8,7 @@
- Title |
+ Title |
[% IF ( showpriority ) %]
Placed on |
[% ELSE %]
@@ -63,17 +63,13 @@
[% END %]
- Hold date:
- [% HOLD.reservedate | $KohaDates %]
-
+ [% HOLD.reservedate | $KohaDates %]
|
[% IF ! HOLD.found %]
[% IF ( HOLD.expirationdate ) %]
- Expiration:
[% HOLD.expirationdate | $KohaDates %]
[% ELSE %]
- Expiration:
Never expires
[% END %]
[% ELSE %]
@@ -83,7 +79,6 @@
|
[% UNLESS( singleBranchMode) %]
- Pickup location:
[% HOLD.branch.branchname | html %]
[% IF ( HOLD.can_update_pickup_location_opac ) %]
|
[% END # /FOREACH HOLDS %]
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/sco/sco-main.tt
+++ a/koha-tmpl/opac-tmpl/bootstrap/en/modules/sco/sco-main.tt
@@ -14,6 +14,7 @@
[% ELSE %]
[% END %]
+[% Asset.css("lib/jquery/responsive.dataTables.min.css") | $raw %]
[% Asset.css("lib/fontawesome/css/fontawesome.min.css") | $raw %]
[% Asset.css("lib/fontawesome/css/brands.min.css") | $raw %]
[% Asset.css("lib/fontawesome/css/solid.min.css") | $raw %]
@@ -308,13 +309,14 @@
Checked out on |
- Title |
+ Title |
Call number |
- Due |
- Renew |
+ Due |
+ Renew |
[% UNLESS ( nofines ) %]
Fines |
[% END %]
+ |
@@ -368,9 +370,11 @@
No renewals allowed
[% END %]
[% IF Koha.Preference('SCOAllowCheckin') %]
-
-
-
+
+
+
+
+
[% END %]
[% END %]
[% IF ISSUE.auto_renew %]
@@ -383,6 +387,7 @@
[% IF ( ISSUE.charges ) %]Yes[% ELSE %]No[% END %]
[% END %]
+ |
[% END # / FOREACH ISSUE %]
@@ -502,19 +507,41 @@
}
[% END %]
-
$(document).ready(function() {
dofocus();
[% IF ( patronid ) %]sco_init();[% END %]
- $("#loanTable").dataTable($.extend(true, {}, dataTablesDefaults, {
- "dom": "t",
- "order": [ 0 ],
- "columnDefs": [
- { "targets": [ "nosort" ], "sortable": false, "searchable": false },
- { "targets": [ "noshow" ], "visible": false, "searchable": false },
- { "type": "anti-the", "targets" : [ "anti-the" ] }
- ]
- }));
+
+ var dTables = $("#loanTable, #holdst, #finestable");
+ dTables.each(function(){
+ var thIndex = $(this).find("th.psort").index();
+ $(this).dataTable($.extend(true, {}, dataTablesDefaults, {
+ "sorting" : [[ thIndex, 'asc' ]],
+ "dom": '<"top"<"table_entries"><"table_controls"fB>>t',
+ "columnDefs": [
+ { "targets": [ "nosort" ],"sortable": false,"searchable": false },
+ { "targets": [ "noshow" ], "visible": false, "searchable": false },
+ { "type": "anti-the", "targets" : [ "anti-the" ] },
+ { "visible": false, "targets" : [ "hidden" ] },
+ { "className": 'dtr-control', "orderable": false, "targets": -1 }
+ ],
+ "language": {
+ "search": "_INPUT_",
+ "searchPlaceholder": _("Search")
+ },
+ "autoWidth": false,
+ "responsive": {
+ details: {
+ type: 'column',
+ target: -1
+ }
+ }
+ }));
+ });
+
+ $('a[data-toggle="tab"]').on('shown.bs.tab', function (event) {
+ dTables.DataTable().responsive.recalc();
+ dataTables.DataTable().responsive.recalc();
+ } );
$("#logout_form").on("click", function(e){
e.preventDefault(e);
--