diff --git a/circ/circulation.pl b/circ/circulation.pl index 9904e62ee8..0b660de5b5 100755 --- a/circ/circulation.pl +++ b/circ/circulation.pl @@ -702,7 +702,8 @@ $template->param( picture => 1 ) if $picture; $template->param( SpecifyDueDate => C4::Context->preference("SpecifyDueDate"), - CircAutocompl => C4::Context->preference("CircAutocompl") , + CircAutocompl => C4::Context->preference("CircAutocompl"), + dateformat => C4::Context->preference("dateformat"), DHTMLcalendar_dateformat => C4::Dates->DHTMLcalendar(), ); output_html_with_http_headers $query, $cookie, $template->output; diff --git a/circ/pendingreserves.pl b/circ/pendingreserves.pl index 0a6fa2fa6d..04230529c8 100755 --- a/circ/pendingreserves.pl +++ b/circ/pendingreserves.pl @@ -259,6 +259,7 @@ $template->param( reserveloop => \@reservedata, "BiblioDefaultView".C4::Context->preference("BiblioDefaultView") => 1, DHTMLcalendar_dateformat => C4::Dates->DHTMLcalendar(), + dateformat => C4::Context->preference("dateformat"), ); output_html_with_http_headers $input, $cookie, $template->output; diff --git a/circ/transferstodo.pl b/circ/transferstodo.pl index 340dc34b59..1837e331ae 100755 --- a/circ/transferstodo.pl +++ b/circ/transferstodo.pl @@ -129,6 +129,7 @@ foreach my $br ( keys %$branches ) { $template->param( branchesloop => \@branchesloop, show_date => format_date(C4::Dates->today('iso')), + dateformat => C4::Context->preference("dateformat"), ); output_html_with_http_headers $input, $cookie, $template->output; diff --git a/circ/transferstoreceive.pl b/circ/transferstoreceive.pl index 0917292a47..f148dd5526 100755 --- a/circ/transferstoreceive.pl +++ b/circ/transferstoreceive.pl @@ -125,6 +125,7 @@ foreach my $br ( keys %$branches ) { $template->param( branchesloop => \@branchesloop, show_date => format_date(C4::Dates->today('iso')), + dateformat => C4::Context->preference("dateformat"), ); output_html_with_http_headers $input, $cookie, $template->output; diff --git a/circ/waitingreserves.pl b/circ/waitingreserves.pl index 574edca5b2..01b4df0ca1 100755 --- a/circ/waitingreserves.pl +++ b/circ/waitingreserves.pl @@ -159,6 +159,7 @@ foreach my $num (@getreserves) { $template->param( reserveloop => \@reservloop, show_date => format_date(C4::Dates->today('iso')), + dateformat => C4::Context->preference("dateformat"), ); output_html_with_http_headers $input, $cookie, $template->output; diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tmpl index 219166b5dd..0f3dee9461 100755 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tmpl @@ -17,14 +17,15 @@ $.tablesorter.addParser({ $(document).ready(function() { $('#patronlists > ul').tabs(); $.tablesorter.defaults.widgets = ['zebra']; - $("#issuest").tablesorter({ -// sortList: [[0,0]], don't sort by default to preserve 'previous checkouts' header + $("#issuest").tablesorter({ + dateFormat: 'uk', headers: { 1: { sorter: 'articles' },4:{sorter:false},5: { sorter: false },6:{sorter:false}} }); $("#issuest").bind("sortEnd",function() { $("#previous").parents("tr").remove(); // 'previous checkouts' header chokes table sorter }); - $("#holdst").tablesorter({ + $("#holdst").tablesorter({ + dateFormat: 'uk', sortList: [[0,0]], headers: { 1: { sorter: 'articles' }} }); diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/pendingreserves.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/pendingreserves.tmpl index 74cba1c567..7fd76b2153 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/pendingreserves.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/pendingreserves.tmpl @@ -20,7 +20,8 @@ $.tablesorter.addParser({ $(document).ready(function() { $("th a").hide(); $.tablesorter.defaults.widgets = ['zebra']; - $("#holdst").tablesorter({ + $("#holdst").tablesorter({ + dateFormat: 'uk', sortList: [[3,0]], headers: { 0:{sorter:false},1:{sorter:false},3: { sorter: 'articles' },7:{sorter:false}} }); diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/transferstodo.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/transferstodo.tmpl index 3b25d5ace3..64333b1eeb 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/transferstodo.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/transferstodo.tmpl @@ -11,11 +11,14 @@ $.tablesorter.addParser({ type: 'text' }); $(document).ready(function() { + $.tablesorter.defaults.widgets = ['zebra']; - $("#transferst").tablesorter({ + $("#transferst").tablesorter({ + dateFormat: 'uk', sortList: [[1,0]], headers: { 1: { sorter: 'articles' },4:{sorter:false}} }); + }); //]]> @@ -39,7 +42,7 @@ $.tablesorter.addParser({