diff --git a/circ/circulation.pl b/circ/circulation.pl index 9c55595272..b664d4989a 100755 --- a/circ/circulation.pl +++ b/circ/circulation.pl @@ -466,7 +466,9 @@ sub build_issue_data { $totalprice += $it->{'replacementprice'} || 0; $it->{'itemtype'} = $itemtypeinfo->{'description'}; $it->{'itemtype_image'} = $itemtypeinfo->{'imageurl'}; + $it->{'dd_sort'} = $it->{'date_due'}; $it->{'dd'} = output_pref($it->{'date_due'}); + $it->{'displaydate_sort'} = $it->{'issuedate'}; $it->{'displaydate'} = output_pref($it->{'issuedate'}); #$it->{'od'} = ( $it->{'date_due'} lt $todaysdate ) ? 1 : 0 ; $it->{'od'} = $it->{'overdue'}; diff --git a/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css b/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css index 76130538a1..fcb47dc390 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css +++ b/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css @@ -256,15 +256,18 @@ table+table { .highlighted-row { background-color: orange !important } -tr.highlight td, tr.highlight th, tr.odd td { +tr.highlight td, +tr.highlight th, +tr.odd td, +tr.odd.highlight td { background-color : #F3F3F3; - border : 1px solid #DDDDDD; - border-right : 1px solid #DDDDDD; + border : 1px solid #BCBCBC; + border-right : 1px solid #BCBCBC; } tr.even td, tr.even.highlight td { background-color: #FFF; - border-right : 1px solid #DDDDDD; + border-right : 1px solid #BCBCBC; } td.od { diff --git a/koha-tmpl/intranet-tmpl/prog/en/js/datatables.js b/koha-tmpl/intranet-tmpl/prog/en/js/datatables.js index b350211fbe..703944ea75 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/js/datatables.js +++ b/koha-tmpl/intranet-tmpl/prog/en/js/datatables.js @@ -470,4 +470,27 @@ jQuery.extend( jQuery.fn.dataTableExt.oSort, { } } ); -}()); \ No newline at end of file +}()); +/* Plugin to allow sorting on data stored in a span's title attribute + * + * Ex: