Bugzilla – Attachment 14189 Details for
Bug 9108
Add uk/euro date sort filter to pages which require it
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 9108: Followup: send the dateformat value from C4::Auth
Bug-9108-Followup-send-the-dateformat-value-from-C.patch (text/plain), 47.82 KB, created by
Jonathan Druart
on 2012-12-18 14:36:28 UTC
(
hide
)
Description:
Bug 9108: Followup: send the dateformat value from C4::Auth
Filename:
MIME Type:
Creator:
Jonathan Druart
Created:
2012-12-18 14:36:28 UTC
Size:
47.82 KB
patch
obsolete
>From 6a5e484833efbd888068fbc7816cec78ef547554 Mon Sep 17 00:00:00 2001 >From: Jonathan Druart <jonathan.druart@biblibre.com> >Date: Tue, 18 Dec 2012 15:09:22 +0100 >Subject: [PATCH] Bug 9108: Followup: send the dateformat value from C4::Auth > >- the dateformat value is send to all templates (from > C4::Auth::get_template_and_user) >- remove all assignment of dateformat in all .pl files >- the DHTMLcalendar_dateformat variable is unused > >- Remove "all" occurrences (those I found!) of dateformat_* >From now the only way to get the date format is a string comparaison >(dateformat == "metric") >--- > C4/Auth.pm | 10 +----- > acqui/booksellers.pl | 1 - > acqui/histsearch.pl | 2 -- > acqui/invoice.pl | 1 - > acqui/invoices.pl | 1 - > acqui/lateorders.pl | 1 - > acqui/parcels.pl | 1 - > acqui/supplier.pl | 1 - > admin/aqbudgetperiods.pl | 3 -- > admin/aqbudgets.pl | 1 - > admin/aqcontract.pl | 4 --- > admin/categorie.pl | 1 - > circ/circulation.pl | 2 -- > circ/overdue.pl | 1 - > circ/pendingreserves.pl | 2 -- > circ/reserveratios.pl | 1 - > circ/transferstoreceive.pl | 1 - > circ/view_holdsqueue.pl | 1 - > circ/waitingreserves.pl | 1 - > .../intranet-tmpl/prog/en/includes/calendar.inc | 4 +-- > .../intranet-tmpl/prog/en/includes/date-format.inc | 2 +- > .../prog/en/modules/circ/circulation.tt | 36 ++++++++++++-------- > .../prog/en/modules/circ/transferstoreceive.tt | 6 ++-- > .../prog/en/modules/members/memberentrygen.tt | 16 ++++----- > .../prog/en/modules/members/moremember.tt | 30 +++++++++------- > .../prog/en/modules/serials/serials-collection.tt | 2 +- > .../prog/en/modules/serials/subscription-add.tt | 6 ++-- > .../prog/en/modules/tools/holidays.tt | 16 ++++----- > .../opac-tmpl/prog/en/modules/sco/sco-main.tt | 2 +- > labels/label-item-search.pl | 1 - > members/memberentry.pl | 3 -- > members/moremember.pl | 4 --- > opac/opac-reserve.pl | 2 -- > opac/opac-search-history.pl | 2 -- > opac/opac-tags.pl | 3 +- > opac/opac-topissues.pl | 1 - > opac/opac-user.pl | 2 -- > opac/sco/sco-main.pl | 1 - > reports/acquisitions_stats.pl | 1 - > reports/bor_issues_top.pl | 1 - > reports/borrowers_out.pl | 1 - > reports/borrowers_stats.pl | 1 - > reports/cat_issues_top.pl | 1 - > reports/dictionary.pl | 1 - > reports/guided_reports.pl | 1 - > reports/issues_avg_stats.pl | 1 - > reports/issues_stats.pl | 1 - > reports/reserves_stats.pl | 1 - > reports/stats.screen.pl | 1 - > reserve/request.pl | 1 - > serials/checkexpiration.pl | 1 - > serials/claims.pl | 2 -- > serials/serials-collection.pl | 1 - > serials/subscription-add.pl | 2 -- > suggestion/suggestion.pl | 2 -- > tags/review.pl | 1 - > tools/cleanborrowers.pl | 1 - > tools/export.pl | 1 - > tools/holidays.pl | 1 - > tools/inventory.pl | 1 - > tools/koha-news.pl | 4 --- > tools/modborrowers.pl | 1 - > tools/scheduler.pl | 2 -- > tools/viewlog.pl | 2 -- > 64 files changed, 70 insertions(+), 139 deletions(-) > >diff --git a/C4/Auth.pm b/C4/Auth.pm >index 4ea03c0..29aecda 100644 >--- a/C4/Auth.pm >+++ b/C4/Auth.pm >@@ -300,15 +300,7 @@ sub get_template_and_user { > } > > if(C4::Context->preference('dateformat')){ >- if(C4::Context->preference('dateformat') eq "metric"){ >- $template->param(dateformat_metric => 1); >- } elsif(C4::Context->preference('dateformat') eq "us"){ >- $template->param(dateformat_us => 1); >- } else { >- $template->param(dateformat_iso => 1); >- } >- } else { >- $template->param(dateformat_iso => 1); >+ $template->param(dateformat => C4::Context->preference('dateformat')) > } > > # these template parameters are set the same regardless of $in->{'type'} >diff --git a/acqui/booksellers.pl b/acqui/booksellers.pl >index 5a1c248..1341dc1 100755 >--- a/acqui/booksellers.pl >+++ b/acqui/booksellers.pl >@@ -148,7 +148,6 @@ $template->param( > loop_suppliers => $loop_suppliers, > supplier => ( $booksellerid || $supplier ), > count => $supplier_count, >- dateformat => C4::Context->preference('dateformat'), > ); > > output_html_with_http_headers $query, $cookie, $template->output; >diff --git a/acqui/histsearch.pl b/acqui/histsearch.pl >index e89bcae..1ffbffe 100755 >--- a/acqui/histsearch.pl >+++ b/acqui/histsearch.pl >@@ -132,8 +132,6 @@ $template->param( > basketgroupname => $basketgroupname, > from_placed_on => $from_date, > to_placed_on => $to_date, >- DHTMLcalendar_dateformat=> C4::Dates->DHTMLcalendar(), >- dateformat => C4::Dates->new()->format(), > debug => $debug || $input->param('debug') || 0, > uc(C4::Context->preference("marcflavour")) => 1 > ); >diff --git a/acqui/invoice.pl b/acqui/invoice.pl >index 7c51ebc..6e6bb25 100755 >--- a/acqui/invoice.pl >+++ b/acqui/invoice.pl >@@ -195,7 +195,6 @@ $template->param( > total_quantity => $total_quantity, > invoiceincgst => $bookseller->{invoiceincgst}, > currency => $bookseller->{listprice}, >- DHTMLcalendar_dateformat => C4::Dates->DHTMLcalendar(), > budgets_loop => \@budgets_loop, > ); > >diff --git a/acqui/invoices.pl b/acqui/invoices.pl >index 4b45e31..b7f360e 100755 >--- a/acqui/invoices.pl >+++ b/acqui/invoices.pl >@@ -151,7 +151,6 @@ $template->param( > branchname => $branchname, > suppliers_loop => \@suppliers_loop, > branches_loop => \@branches_loop, >- DHTMLcalendar_dateformat => C4::Dates->DHTMLcalendar(), > ); > > output_html_with_http_headers $input, $cookie, $template->output; >diff --git a/acqui/lateorders.pl b/acqui/lateorders.pl >index 544370d..6dea529 100755 >--- a/acqui/lateorders.pl >+++ b/acqui/lateorders.pl >@@ -173,6 +173,5 @@ $template->param( > estimateddeliverydateto => $estimateddeliverydateto, > total => $total, > intranetcolorstylesheet => C4::Context->preference("intranetcolorstylesheet"), >- DHTMLcalendar_dateformat => C4::Dates->DHTMLcalendar(), > ); > output_html_with_http_headers $input, $cookie, $template->output; >diff --git a/acqui/parcels.pl b/acqui/parcels.pl >index 4f2849d..de868df 100755 >--- a/acqui/parcels.pl >+++ b/acqui/parcels.pl >@@ -175,7 +175,6 @@ $template->param( > dateto => $dateto, > resultsperpage => $resultsperpage, > name => $bookseller->{'name'}, >- DHTMLcalendar_dateformat => C4::Dates->DHTMLcalendar(), > shipmentdate_today => C4::Dates->new()->output(), > booksellerid => $booksellerid, > GST => C4::Context->preference('gist'), >diff --git a/acqui/supplier.pl b/acqui/supplier.pl >index d113de2..df417c0 100755 >--- a/acqui/supplier.pl >+++ b/acqui/supplier.pl >@@ -105,7 +105,6 @@ if ( $op eq 'display' ) { > basketcount => $supplier->{'basketcount'}, > subscriptioncount => $supplier->{'subscriptioncount'}, > contracts => $contracts, >- dateformat => C4::Context->preference("dateformat"), > ); > } elsif ( $op eq 'delete' ) { > # no further message needed for the user >diff --git a/admin/aqbudgetperiods.pl b/admin/aqbudgetperiods.pl >index 5f34dc2..9371d01 100755 >--- a/admin/aqbudgetperiods.pl >+++ b/admin/aqbudgetperiods.pl >@@ -133,7 +133,6 @@ if ( $op eq 'add_form' ) { > %$budgetperiod_hash > ); > } # IF-MOD >- $template->param( DHTMLcalendar_dateformat => C4::Dates->DHTMLcalendar(),); > } > > elsif ( $op eq 'add_validate' ) { >@@ -175,7 +174,6 @@ elsif ( $op eq 'delete_confirmed' ) { > # display the form for duplicating > elsif ( $op eq 'duplicate_form'){ > $template->param( >- DHTMLcalendar_dateformat => C4::Dates->DHTMLcalendar(), > 'duplicate_form' => '1', > 'budget_period_id' => $budget_period_id, > ); >@@ -291,7 +289,6 @@ $template->param( > active_pagination_bar => $active_pagination_bar, > inactive_pagination_bar => $inactive_pagination_bar, > tab => $tab, >- dateformat => C4::Context->preference('dateformat'), > ); > > $template->param($op=>1); >diff --git a/admin/aqbudgets.pl b/admin/aqbudgets.pl >index c5f99e3..f7dcc75 100755 >--- a/admin/aqbudgets.pl >+++ b/admin/aqbudgets.pl >@@ -217,7 +217,6 @@ if ($op eq 'add_form') { > # if no buget_id is passed then its an add > $template->param( > add_validate => 1, >- dateformat => C4::Dates->new()->visual(), > budget_parent_id => $budget_parent->{'budget_id'}, > budget_parent_name => $budget_parent->{'budget_name'}, > branchloop_select => \@branchloop_select, >diff --git a/admin/aqcontract.pl b/admin/aqcontract.pl >index 9d3f0ac..d744953 100755 >--- a/admin/aqcontract.pl >+++ b/admin/aqcontract.pl >@@ -51,8 +51,6 @@ $template->param( > contractnumber => $contractnumber, > booksellerid => $booksellerid, > booksellername => $bookseller->{name}, >- DHTMLcalendar_dateformat => C4::Dates->DHTMLcalendar(), >- dateformat => C4::Context->preference("dateformat"), > ); > > #ADD_FORM: called if $op is 'add_form'. Used to create form to add or modify a record >@@ -70,7 +68,6 @@ if ( $op eq 'add_form' ) { > contractdescription => $contract->{contractdescription}, > contractstartdate => format_date( $contract->{contractstartdate} ), > contractenddate => format_date( $contract->{contractenddate} ), >- DHTMLcalendar_dateformat => C4::Dates->DHTMLcalendar, > ); > } else { > $template->param( >@@ -79,7 +76,6 @@ if ( $op eq 'add_form' ) { > contractdescription => undef, > contractstartdate => undef, > contractenddate => undef, >- DHTMLcalendar_dateformat => C4::Dates->DHTMLcalendar, > ); > } > >diff --git a/admin/categorie.pl b/admin/categorie.pl >index 4964158..952ef7a 100755 >--- a/admin/categorie.pl >+++ b/admin/categorie.pl >@@ -130,7 +130,6 @@ if ($op eq 'add_form') { > reservefee => sprintf("%.2f",$data->{'reservefee'}), > hidelostitems => $data->{'hidelostitems'}, > category_type => $data->{'category_type'}, >- DHTMLcalendar_dateformat => C4::Dates->DHTMLcalendar(), > SMSSendDriver => C4::Context->preference("SMSSendDriver"), > TalkingTechItivaPhone => C4::Context->preference("TalkingTechItivaPhoneNotification"), > "type_".$data->{'category_type'} => 1, >diff --git a/circ/circulation.pl b/circ/circulation.pl >index 91fd1a2..fe9ae60 100755 >--- a/circ/circulation.pl >+++ b/circ/circulation.pl >@@ -735,8 +735,6 @@ $template->param( > SpecifyDueDate => $duedatespec_allow, > CircAutocompl => C4::Context->preference("CircAutocompl"), > AllowRenewalLimitOverride => C4::Context->preference("AllowRenewalLimitOverride"), >- dateformat => C4::Context->preference("dateformat"), >- DHTMLcalendar_dateformat => C4::Dates->DHTMLcalendar(), > export_remove_fields => C4::Context->preference("ExportRemoveFields"), > export_with_csv_profile => C4::Context->preference("ExportWithCsvProfile"), > canned_bor_notes_loop => $canned_notes, >diff --git a/circ/overdue.pl b/circ/overdue.pl >index e44e792..cef345c 100755 >--- a/circ/overdue.pl >+++ b/circ/overdue.pl >@@ -221,7 +221,6 @@ $template->param( > borname => $bornamefilter, > order => $order, > showall => $showall, >- DHTMLcalendar_dateformat => C4::Dates->DHTMLcalendar(), > dateduefrom => $input->param( 'dateduefrom' ) || '', > datedueto => $input->param( 'datedueto' ) || '', > ); >diff --git a/circ/pendingreserves.pl b/circ/pendingreserves.pl >index e532faf..0f5d3da 100755 >--- a/circ/pendingreserves.pl >+++ b/circ/pendingreserves.pl >@@ -201,8 +201,6 @@ $template->param( > run_report => $run_report, > reserveloop => \@reservedata, > "BiblioDefaultView".C4::Context->preference("BiblioDefaultView") => 1, >- DHTMLcalendar_dateformat => C4::Dates->DHTMLcalendar(), >- dateformat => C4::Context->preference("dateformat"), > HoldsToPullStartDate => (C4::Context->preference('HoldsToPullStartDate')?C4::Context->preference('HoldsToPullStartDate'):2), > ); > >diff --git a/circ/reserveratios.pl b/circ/reserveratios.pl >index 1517adf..209a09e 100755 >--- a/circ/reserveratios.pl >+++ b/circ/reserveratios.pl >@@ -185,7 +185,6 @@ $template->param( > to => $enddate, > ratio => $ratio, > reserveloop => \@reservedata, >- DHTMLcalendar_dateformat => C4::Dates->DHTMLcalendar(), > ); > > output_html_with_http_headers $input, $cookie, $template->output; >diff --git a/circ/transferstoreceive.pl b/circ/transferstoreceive.pl >index 86f7992..a037726 100755 >--- a/circ/transferstoreceive.pl >+++ b/circ/transferstoreceive.pl >@@ -120,7 +120,6 @@ foreach my $br ( keys %$branches ) { > $template->param( > branchesloop => \@branchesloop, > show_date => format_date(C4::Dates->today('iso')), >- 'dateformat_' . (C4::Context->preference("dateformat") || '') => 1, > TransfersMaxDaysWarning => C4::Context->preference('TransfersMaxDaysWarning'), > latetransfers => $latetransfers ? 1 : 0, > ); >diff --git a/circ/view_holdsqueue.pl b/circ/view_holdsqueue.pl >index cf529f0..80bb609 100755 >--- a/circ/view_holdsqueue.pl >+++ b/circ/view_holdsqueue.pl >@@ -58,7 +58,6 @@ if ( $run_report ) { > total => scalar @$items, > itemsloop => $items, > run_report => $run_report, >- dateformat => C4::Context->preference("dateformat"), > ); > } > >diff --git a/circ/waitingreserves.pl b/circ/waitingreserves.pl >index ec3feb5..158b847 100755 >--- a/circ/waitingreserves.pl >+++ b/circ/waitingreserves.pl >@@ -155,7 +155,6 @@ $template->param( > overloop => \@overloop, > overcount => $overcount, > show_date => format_date(C4::Dates->today('iso')), >- dateformat => C4::Context->preference("dateformat"), > ReservesMaxPickUpDelay => C4::Context->preference('ReservesMaxPickUpDelay') > ); > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/calendar.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/calendar.inc >index fc8a1a3..484e664 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/calendar.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/calendar.inc >@@ -37,7 +37,7 @@ jQuery(function($){ > dayNamesShort: [_('Sun'), _('Mon'), _('Tue'), _('Wed'), _('Thu'), _('Fri'), _('Sat')], > dayNamesMin: [_('Su'),_('Mo'),_('Tu'),_('We'),_('Th'),_('Fr'),_('Sa')], > weekHeader: _('Wk'), >- dateFormat: '[% IF ( dateformat_us ) %]mm/dd/yy[% ELSIF ( dateformat_metric ) %]dd/mm/yy[% ELSE %]yy-mm-dd[% END %]', >+ dateFormat: '[% IF ( dateformat == "us" ) %]mm/dd/yy[% ELSIF ( dateformat == "metric" ) %]dd/mm/yy[% ELSE %]yy-mm-dd[% END %]', > firstDay: [% CalendarFirstDayOfWeek %], > isRTL: [% IF ( bidi ) %]true[% ELSE %]false[% END %], > showMonthAfterYear: false, >@@ -75,4 +75,4 @@ $.datepicker.setDefaults({ > }); > }); > //]]> >-</script> >\ No newline at end of file >+</script> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/date-format.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/date-format.inc >index 8aafb04..53dae71 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/date-format.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/date-format.inc >@@ -1 +1 @@ >-[% IF ( dateformat_us ) %](MM/DD/YYYY)[% ELSIF ( dateformat_metric ) %](DD/MM/YYYY)[% ELSE %](YYYY-MM-DD)[% END %] >\ No newline at end of file >+[% IF ( dateformat == "us" ) %](MM/DD/YYYY)[% ELSIF ( dateformat == "metric" ) %](DD/MM/YYYY)[% ELSE %](YYYY-MM-DD)[% END %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt >index c860ed6..94e55b3 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt >@@ -23,15 +23,20 @@ > $(document).ready(function() { > > $('#patronlists').tabs(); >- [% IF ( UseTablesortForCirc ) %]$.tablesorter.defaults.widgets = ['zebra']; >- $("#issuest").tablesorter({[% IF ( dateformat_metric ) %] >- dateFormat: 'uk',[% END %] >- headers: { 1: { sorter: 'articles' },6: { sorter: false },7:{sorter:false},8:{sorter:false},9:{sorter:false}} >- }); >- $("#relissuest").tablesorter({[% IF ( dateformat_metric ) %] >- dateFormat: 'uk',[% END %] >- headers: { 1: { sorter: 'articles' },6: { sorter: false },7:{sorter:false},8:{sorter:false},9:{sorter:false}} >- }); >+ [% IF ( UseTablesortForCirc ) %] >+ $.tablesorter.defaults.widgets = ['zebra']; >+ $("#issuest").tablesorter({ >+ [% IF ( dateformat == "metric" ) %] >+ dateFormat: 'uk', >+ [% END %] >+ headers: { 1: { sorter: 'articles' },6: { sorter: false },7:{sorter:false},8:{sorter:false},9:{sorter:false}} >+ }); >+ $("#relissuest").tablesorter({ >+ [% IF ( dateformat == "metric" ) %] >+ dateFormat: 'uk', >+ [% END %] >+ headers: { 1: { sorter: 'articles' },6: { sorter: false },7:{sorter:false},8:{sorter:false},9:{sorter:false}} >+ }); > > //FIXME: Sorting does not work when there are previous checkouts only > // (It works fine when there are only checkouts of the day, or both previous and today checkouts) >@@ -41,11 +46,14 @@ > $("#relissuest").bind("sortEnd",function() { > $("#relprevious").parents("tr").remove(); // 'previous checkouts' header chokes table sorter > }); >- $("#holdst").tablesorter({[% IF ( dateformat_metric ) %] >- dateFormat: 'uk',[% END %] >- sortList: [[0,0]], >- headers: { 1: { sorter: 'articles' },5: { sorter: false }} >- });[% END %] >+ $("#holdst").tablesorter({ >+ [% IF ( dateformat == "metric" ) %] >+ dateFormat: 'uk', >+ [% END %] >+ sortList: [[0,0]], >+ headers: { 1: { sorter: 'articles' },5: { sorter: false }} >+ }); >+ [% END %] > [% IF ( AllowRenewalLimitOverride ) %] > $( '#override_limit' ).click( function () { > if ( this.checked ) { >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/transferstoreceive.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/transferstoreceive.tt >index 6542ac3..0a0ce97 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/transferstoreceive.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/transferstoreceive.tt >@@ -13,8 +13,10 @@ $.tablesorter.addParser({ > $(document).ready(function() { > [% FOREACH branchesloo IN branchesloop %] > $.tablesorter.defaults.widgets = ['zebra']; >- $("#transferst[% branchesloo.branchcode %]").tablesorter({[% IF ( dateformat_metric ) %] >- dateFormat: 'uk',[% END %] >+ $("#transferst[% branchesloo.branchcode %]").tablesorter({ >+ [% IF ( dateformat == "metric" ) %] >+ dateFormat: 'uk', >+ [% END %] > sortList: [[0,0]], > headers: { 1: { sorter: 'articles' }} > }); >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt >index e327d03..3ed5199 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt >@@ -278,12 +278,12 @@ > <label for="dateofbirth"> > [% END %] > Date of birth: </label> >- >- [% IF ( metric ) %] >+ >+ [% IF ( dateformat == "metric" ) %] > <input type="text" id="dateofbirth" name="dateofbirth" size="20" onchange="CheckDate(document.form.dateofbirth);" value="[% IF ( opduplicate ) %][% ELSE %][% dateofbirth %][% END %]" /> >-[% ELSE %] >+ [% ELSE %] > <input type="text" id="dateofbirth" name="dateofbirth" size="20" value="[% IF ( opduplicate ) %][% ELSE %][% dateofbirth %][% END %]" /> >-[% END %] >+ [% END %] > > [% IF ( mandatorydateofbirth ) %]<span class="required">Required</span>[% END %] > [% IF ( ERROR_dateofbirth ) %]<span class="required">(Error)</span>[% END %] >@@ -1077,11 +1077,11 @@ > <label for="from"> > [% END %] > Registration date: </label> >- [% IF ( metric ) %] >+ [% IF ( dateformat == "metric" ) %] > <input type="text" id="from" name="dateenrolled" maxlength="10" size="10" onchange="CheckDate(document.form.dateenrolled);check_manip_date('verify');" value="[% dateenrolled %]" class="datepickerfrom" /> >- [% ELSE %] >+ [% ELSE %] > <input type="text" id="from" name="dateenrolled" maxlength="10" size="10" value="[% dateenrolled %]" class="datepickerfrom" /> >- [% END %] >+ [% END %] > [% IF ( mandatorydateenrolled ) %]<span class="required">Required</span>[% END %] > [% IF ( ERROR_dateenrolled ) %]<span class="required">(Error)</span>[% END %] > <div class="hint">[% INCLUDE 'date-format.inc' %]</div> >@@ -1098,7 +1098,7 @@ > <label for="to"> > [% END %] > Expiry date (leave blank for auto calc) </label> >- [% IF ( metric ) %] >+ [% IF ( dateformat == "metric" ) %] > [% UNLESS ( opadd ) %] > <input type="text" id="to" name="dateexpiry" maxlength="10" size="10" onchange="CheckDate(document.form.dateexpiry);check_manip_date('verify');" value="[% dateexpiry %]" class="datepickerto" /> > [% ELSE %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt >index 4e6271f..2cec59f 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt >@@ -23,19 +23,25 @@ $.tablesorter.addParser({ > $(document).ready(function() { > $('#finesholdsissues').tabs(); > $.tablesorter.defaults.widgets = ['zebra']; >- $("#issuest").tablesorter({[% IF ( dateformat_metric ) %] >- dateFormat: 'uk',[% END %] >+ $("#issuest").tablesorter({ >+ [% IF ( dateformat == "metric" ) %] >+ dateFormat: 'uk', >+ [% END %] >+ headers: { 1: { sorter: 'articles'},8:{sorter:false},9:{sorter:false }} >+ }); >+ $("#relissuest").tablesorter({ >+ [% IF ( dateformat == "metric" ) %] >+ dateFormat: 'uk', >+ [% END %] > headers: { 1: { sorter: 'articles'},8:{sorter:false},9:{sorter:false }} >- }); >- $("#relissuest").tablesorter({[% IF ( dateformat_metric ) %] >- dateFormat: 'uk',[% END %] >- headers: { 1: { sorter: 'articles'},8:{sorter:false},9:{sorter:false }} >- }); >- $("#holdst").tablesorter({[% IF ( dateformat_metric ) %] >- dateFormat: 'uk',[% END %] >- sortList: [[0,0]], >- headers: { 1: { sorter: 'articles' },5: { sorter: false }} >- }); >+ }); >+ $("#holdst").tablesorter({ >+ [% IF ( dateformat == "metric" ) %] >+ dateFormat: 'uk', >+ [% END %] >+ sortList: [[0,0]], >+ headers: { 1: { sorter: 'articles' },5: { sorter: false }} >+ }); > [% IF ( picture ) %] > // new YAHOO.widget.Button("delpicture"); // FIXME: formatting mismatch between YUI and normal button > $('#delpicture').click(function(){ >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-collection.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-collection.tt >index 6281258..3da64b8 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-collection.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-collection.tt >@@ -59,7 +59,7 @@ function CheckNone( node ) { > } > $(document).ready(function() { > $('#subscription_years').tabs(); >- [% IF dateformatmetric %] >+ [% IF dateformat == "metric" %] > dt_add_type_uk_date(); > [% END %] > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tt >index 4ab5c11..2dc7ea7 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tt >@@ -23,13 +23,13 @@ function formatDate(myDate) { > var d = new Array( myDate.getFullYear(), myDate.getMonth() + 1 ,myDate.getDate()); > if(d[1].toString().length == 1) { d[1] = '0'+d[1] }; > if(d[2].toString().length == 1) { d[2] = '0'+d[2] }; >- [% IF ( dateformat_us ) %] >+ [% IF ( dateformat == "us" ) %] > return(d[1] + '/' + d[2] + '/' + d[0]) ; >- [% ELSIF ( dateformat_metric ) %] >+ [% ELSIF ( dateformat == "metric" ) %] > return(d[2] + '/' + d[1] + '/' + d[0]) ; > [% ELSE %] > return(''+d[0] + '-' + d[1] + '-' + d[2]) ; >- [% END %] >+ [% END %] > } > > Date.prototype.addDays = function(days) { >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/holidays.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/holidays.tt >index fa7904f..fb78127 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/holidays.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/holidays.tt >@@ -153,7 +153,7 @@ > > $(document).ready(function() { > >-[% IF ( dateformat_metric ) %] $.tablesorter.addParser({ // http://tablesorter.com/docs/example-parsers.html >+[% IF ( dateformat == "metric" ) %] $.tablesorter.addParser({ // http://tablesorter.com/docs/example-parsers.html > id: 'shortDates', > is: function(s){ > return false; >@@ -173,15 +173,15 @@ > $("#branch").change(function(){ > changeBranch(); > }); >- $("#holidayexceptions").tablesorter({[% IF ( dateformat_metric ) %] >+ $("#holidayexceptions").tablesorter({[% IF ( dateformat == "metric" ) %] > dateFormat: 'uk',[% END %] > sortList: [[0,0]], widgets: ['zebra'] > }); >- $("#holidayweeklyrepeatable").tablesorter({[% IF ( dateformat_metric ) %] >+ $("#holidayweeklyrepeatable").tablesorter({[% IF ( dateformat == "metric" ) %] > dateFormat: 'uk',[% END %] > sortList: [[0,0]], widgets: ['zebra'] > }); >- $("#holidaysyearlyrepeatable").tablesorter({[% IF ( dateformat_metric ) %] >+ $("#holidaysyearlyrepeatable").tablesorter({[% IF ( dateformat == "metric" ) %] > headers : { > 0: { > sorter : 'shortDates' >@@ -189,7 +189,7 @@ > },[% END %] > sortList: [[0,0]], widgets: ['zebra'] > }); >- $("#holidaysunique").tablesorter({[% IF ( dateformat_metric ) %] >+ $("#holidaysunique").tablesorter({[% IF ( dateformat == "metric" ) %] > dateFormat: 'uk',[% END %] > sortList: [[0,0]], widgets: ['zebra'] > }); >@@ -281,7 +281,7 @@ td.repeatableyearly a.ui-state-default, .repeatableyearly { background: #FFFF9 > <strong>From Date:</strong> > <span id="showDaynameOutput"></span>, > >- [% IF ( dateformat_us ) %]<span id="showMonthOutput"></span>/<span id="showDayOutput"></span>/<span id="showYearOutput"></span>[% ELSIF ( dateformat_metric ) %]<span id="showDayOutput"></span>/<span id="showMonthOutput"></span>/<span id="showYearOutput"></span>[% ELSE %]<span id="showYearOutput"></span>/<span id="showMonthOutput"></span>/<span id="showDayOutput"></span>[% END %] >+ [% IF ( dateformat == "us" ) %]<span id="showMonthOutput"></span>/<span id="showDayOutput"></span>/<span id="showYearOutput"></span>[% ELSIF ( dateformat == "metric" ) %]<span id="showDayOutput"></span>/<span id="showMonthOutput"></span>/<span id="showYearOutput"></span>[% ELSE %]<span id="showYearOutput"></span>/<span id="showMonthOutput"></span>/<span id="showDayOutput"></span>[% END %] > > <input type="hidden" id="showDayname" name="showDayname" /> > <input type="hidden" id="showWeekday" name="showWeekday" /> >@@ -351,7 +351,7 @@ td.repeatableyearly a.ui-state-default, .repeatableyearly { background: #FFFF9 > <strong>From date:</strong> > <span id="newDaynameOutput"></span>, > >- [% IF ( dateformat_us ) %]<span id="newMonthOutput"></span>/<span id="newDayOutput"></span>/<span id="newYearOutput"></span>[% ELSIF ( dateformat_metric ) %]<span id="newDayOutput"></span>/<span id="newMonthOutput"></span>/<span id="newYearOutput"></span>[% ELSE %]<span id="newYearOutput"></span>/<span id="newMonthOutput"></span>/<span id="newDayOutput"></span>[% END %] >+ [% IF ( dateformat == "us" ) %]<span id="newMonthOutput"></span>/<span id="newDayOutput"></span>/<span id="newYearOutput"></span>[% ELSIF ( dateformat == "metric" ) %]<span id="newDayOutput"></span>/<span id="newMonthOutput"></span>/<span id="newYearOutput"></span>[% ELSE %]<span id="newYearOutput"></span>/<span id="newMonthOutput"></span>/<span id="newDayOutput"></span>[% END %] > > <input type="hidden" id="newDayname" name="showDayname" /> > <input type="hidden" id="newWeekday" name="newWeekday" /> >@@ -505,7 +505,7 @@ td.repeatableyearly a.ui-state-default, .repeatableyearly { background: #FFFF9 > <table id="holidaysyearlyrepeatable"> > <thead> > <tr> >- [% IF ( dateformat_metric ) %] >+ [% IF ( dateformat == "metric" ) %] > <th class="repeatableyearly">Day/Month</th> > [% ELSE %] > <th class="repeatableyearly">Month/Day</th> >diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/sco/sco-main.tt b/koha-tmpl/opac-tmpl/prog/en/modules/sco/sco-main.tt >index 1398673..293a584 100644 >--- a/koha-tmpl/opac-tmpl/prog/en/modules/sco/sco-main.tt >+++ b/koha-tmpl/opac-tmpl/prog/en/modules/sco/sco-main.tt >@@ -85,7 +85,7 @@ $(document).ready(function() { > [% ELSIF ( timedout ) %] sco_init(1); > [% END %] > $("#loanTable").tablesorter({ >- [% IF ( dateformat_metric ) %] >+ [% IF ( dateformat == "metric" ) %] > dateFormat: 'uk', > [% END %] > widgets: ['zebra'], >diff --git a/labels/label-item-search.pl b/labels/label-item-search.pl >index 9b92009..ef7d9bf 100755 >--- a/labels/label-item-search.pl >+++ b/labels/label-item-search.pl >@@ -250,5 +250,4 @@ else { > } > > # Print the page >-$template->param( DHTMLcalendar_dateformat => C4::Dates->DHTMLcalendar(), ); > output_html_with_http_headers $query, $cookie, $template->output; >diff --git a/members/memberentry.pl b/members/memberentry.pl >index 9a3dd18..e8e759e 100755 >--- a/members/memberentry.pl >+++ b/members/memberentry.pl >@@ -704,7 +704,6 @@ $template->param( debug => $debug ) if $debug; > $template->param( > BorrowerMandatoryField => C4::Context->preference("BorrowerMandatoryField"),#field to test with javascript > category_type => $category_type,#to know the category type of the borrower >- DHTMLcalendar_dateformat => C4::Dates->DHTMLcalendar(), > select_city => $select_city, > "$category_type" => 1,# associate with step to know where u are > destination => $destination,#to know wher u come from and wher u must go in redirect >@@ -723,8 +722,6 @@ $template->param( > borrotitlepopup => $borrotitlepopup, > guarantorinfo => $guarantorinfo, > flagloop => \@flagdata, >- dateformat => C4::Dates->new()->visual(), >- C4::Context->preference('dateformat') => 1, > check_categorytype =>$check_categorytype,#to recover the category type with checkcategorytype function > category_type =>$category_type, > modify => $modify, >diff --git a/members/moremember.pl b/members/moremember.pl >index 0524ecb..3ddece0 100755 >--- a/members/moremember.pl >+++ b/members/moremember.pl >@@ -406,7 +406,6 @@ $template->param( $data->{'categorycode'} => 1 ); > $template->param( > detailview => 1, > AllowRenewalLimitOverride => C4::Context->preference("AllowRenewalLimitOverride"), >- DHTMLcalendar_dateformat => C4::Dates->DHTMLcalendar(), > CANDELETEUSER => $candeleteuser, > roaddetails => $roaddetails, > borrowernumber => $borrowernumber, >@@ -424,9 +423,6 @@ $template->param( > error => $error, > StaffMember => ($category_type eq 'S'), > is_child => ($category_type eq 'C'), >-# reserveloop => \@reservedata, >- dateformat => C4::Context->preference("dateformat"), >- "dateformat_" . (C4::Context->preference("dateformat") || '') => 1, > samebranch => $samebranch, > quickslip => $quickslip, > activeBorrowerRelationship => (C4::Context->preference('borrowerRelationship') ne ''), >diff --git a/opac/opac-reserve.pl b/opac/opac-reserve.pl >index fbc9dd7..668e5b1 100755 >--- a/opac/opac-reserve.pl >+++ b/opac/opac-reserve.pl >@@ -568,7 +568,5 @@ if ( > ); > } > >-$template->param( DHTMLcalendar_dateformat => C4::Dates->DHTMLcalendar() ); >- > output_html_with_http_headers $query, $cookie, $template->output; > >diff --git a/opac/opac-search-history.pl b/opac/opac-search-history.pl >index 65141b9..1b76c55 100755 >--- a/opac/opac-search-history.pl >+++ b/opac/opac-search-history.pl >@@ -45,8 +45,6 @@ my ($template, $loggedinuser, $cookie) > debug => 1, > }); > >-$template->param(dateformat => C4::Context->preference("dateformat")); >- > # If the user is not logged in, we deal with the cookie > if (!$loggedinuser) { > >diff --git a/opac/opac-tags.pl b/opac/opac-tags.pl >index a856081..3cf1f53 100755 >--- a/opac/opac-tags.pl >+++ b/opac/opac-tags.pl >@@ -236,8 +236,7 @@ if ($loggedinuser) { > } > } > >-$template->param(tagsview => 1, >-dateformat => C4::Context->preference("dateformat")); >+$template->param(tagsview => 1); > > if ($add_op) { > my $adds = 0; >diff --git a/opac/opac-topissues.pl b/opac/opac-topissues.pl >index dfdb6cd..3d5f3b8 100755 >--- a/opac/opac-topissues.pl >+++ b/opac/opac-topissues.pl >@@ -158,7 +158,6 @@ if (!$advanced_search_types or $advanced_search_types eq 'itemtypes') { > > $template->param( > itemtypeloop =>\@itemtypesloop, >- dateformat => C4::Context->preference("dateformat"), > ); > output_html_with_http_headers $input, $cookie, $template->output; > >diff --git a/opac/opac-user.pl b/opac/opac-user.pl >index 1c942d5..ff5765f 100755 >--- a/opac/opac-user.pl >+++ b/opac/opac-user.pl >@@ -362,10 +362,8 @@ $template->param( > patronupdate => $patronupdate, > OpacRenewalAllowed => C4::Context->preference("OpacRenewalAllowed"), > userview => 1, >- dateformat => C4::Context->preference("dateformat"), > ); > >-$template->param( DHTMLcalendar_dateformat => C4::Dates->DHTMLcalendar() ); > $template->param( > SuspendHoldsOpac => C4::Context->preference('SuspendHoldsOpac'), > AutoResumeSuspendedHolds => C4::Context->preference('AutoResumeSuspendedHolds'), >diff --git a/opac/sco/sco-main.pl b/opac/sco/sco-main.pl >index f8c6238..49fb36c 100755 >--- a/opac/sco/sco-main.pl >+++ b/opac/sco/sco-main.pl >@@ -246,7 +246,6 @@ if ($borrower->{cardnumber}) { > $template->param( > inputfocus => $inputfocus, > nofines => 1, >- "dateformat_" . C4::Context->preference('dateformat') => 1, > ); > if (C4::Context->preference('ShowPatronImageInWebBasedSelfCheck')) { > my ($image, $dberror) = GetPatronImage($borrower->{cardnumber}); >diff --git a/reports/acquisitions_stats.pl b/reports/acquisitions_stats.pl >index de4b0f3..db1311c 100755 >--- a/reports/acquisitions_stats.pl >+++ b/reports/acquisitions_stats.pl >@@ -74,7 +74,6 @@ our $sep = $input->param("sep") // ''; > $sep = "\t" if ($sep eq 'tabulation'); > $template->param( > do_it => $do_it, >- DHTMLcalendar_dateformat => C4::Dates->DHTMLcalendar(), > ); > if ($do_it) { > my $results = >diff --git a/reports/bor_issues_top.pl b/reports/bor_issues_top.pl >index 6ad3495..9618faf 100755 >--- a/reports/bor_issues_top.pl >+++ b/reports/bor_issues_top.pl >@@ -66,7 +66,6 @@ my ($template, $borrowernumber, $cookie) > our $sep = $input->param("sep"); > $sep = "\t" if ($sep eq 'tabulation'); > $template->param(do_it => $do_it, >- DHTMLcalendar_dateformat => C4::Dates->DHTMLcalendar(), > ); > if ($do_it) { > # Displaying results >diff --git a/reports/borrowers_out.pl b/reports/borrowers_out.pl >index 722faba..55243b3 100755 >--- a/reports/borrowers_out.pl >+++ b/reports/borrowers_out.pl >@@ -60,7 +60,6 @@ my ($template, $borrowernumber, $cookie) > debug => 1, > }); > $template->param(do_it => $do_it, >- DHTMLcalendar_dateformat => C4::Dates->DHTMLcalendar(), > ); > if ($do_it) { > # Displaying results >diff --git a/reports/borrowers_stats.pl b/reports/borrowers_stats.pl >index 9e00ea3..6fab3a4 100755 >--- a/reports/borrowers_stats.pl >+++ b/reports/borrowers_stats.pl >@@ -140,7 +140,6 @@ if ($do_it) { > $template->param( > CGIextChoice => $CGIextChoice, > CGIsepChoice => $CGIsepChoice, >- DHTMLcalendar_dateformat => C4::Dates->DHTMLcalendar(), > ); > > } >diff --git a/reports/cat_issues_top.pl b/reports/cat_issues_top.pl >index 2a6409d..22b88ae 100755 >--- a/reports/cat_issues_top.pl >+++ b/reports/cat_issues_top.pl >@@ -65,7 +65,6 @@ my ($template, $borrowernumber, $cookie) > our $sep = $input->param("sep"); > $sep = "\t" if ($sep eq 'tabulation'); > $template->param(do_it => $do_it, >- DHTMLcalendar_dateformat => C4::Dates->DHTMLcalendar(), > ); > if ($do_it) { > # Displaying results >diff --git a/reports/dictionary.pl b/reports/dictionary.pl >index f27ce10..96b71e9 100755 >--- a/reports/dictionary.pl >+++ b/reports/dictionary.pl >@@ -124,7 +124,6 @@ elsif ( $phase eq 'New Term step 4' ) { > 'definition_description' => $definition_description, > 'columns' => \@column_loop, > 'columnstring' => $columnstring, >- 'DHTMLcalendar_dateformat' => C4::Dates->DHTMLcalendar(), > ); > } > >diff --git a/reports/guided_reports.pl b/reports/guided_reports.pl >index de18072..631e056 100755 >--- a/reports/guided_reports.pl >+++ b/reports/guided_reports.pl >@@ -776,7 +776,6 @@ foreach (1..6) { > $template->{VARS}->{'build' . $_} and $template->{VARS}->{'buildx' . $_} and last; > } > $template->param( 'referer' => $input->referer(), >- 'DHTMLcalendar_dateformat' => C4::Dates->DHTMLcalendar(), > ); > > output_html_with_http_headers $input, $cookie, $template->output; >diff --git a/reports/issues_avg_stats.pl b/reports/issues_avg_stats.pl >index 372f3c0..bbd6f52 100755 >--- a/reports/issues_avg_stats.pl >+++ b/reports/issues_avg_stats.pl >@@ -68,7 +68,6 @@ my ($template, $borrowernumber, $cookie) > our $sep = $input->param("sep"); > $sep = "\t" if ($sep eq 'tabulation'); > $template->param(do_it => $do_it, >- DHTMLcalendar_dateformat => C4::Dates->DHTMLcalendar(), > ); > if ($do_it) { > # Displaying results >diff --git a/reports/issues_stats.pl b/reports/issues_stats.pl >index 4b6aa42..ddc3740 100755 >--- a/reports/issues_stats.pl >+++ b/reports/issues_stats.pl >@@ -72,7 +72,6 @@ my ($template, $borrowernumber, $cookie) = get_template_and_user({ > our $sep = $input->param("sep"); > $sep = "\t" if ($sep eq 'tabulation'); > $template->param(do_it => $do_it, >- DHTMLcalendar_dateformat => C4::Dates->DHTMLcalendar(), > ); > > my $itemtypes = GetItemTypes(); >diff --git a/reports/reserves_stats.pl b/reports/reserves_stats.pl >index c20a676..bfeaf8b 100755 >--- a/reports/reserves_stats.pl >+++ b/reports/reserves_stats.pl >@@ -78,7 +78,6 @@ my ($template, $borrowernumber, $cookie) = get_template_and_user({ > our $sep = $input->param("sep") || ''; > $sep = "\t" if ($sep eq 'tabulation'); > $template->param(do_it => $do_it, >- DHTMLcalendar_dateformat => C4::Dates->DHTMLcalendar(), > ); > > my $itemtypes = GetItemTypes(); >diff --git a/reports/stats.screen.pl b/reports/stats.screen.pl >index 47c4b4d..16b8f8a 100755 >--- a/reports/stats.screen.pl >+++ b/reports/stats.screen.pl >@@ -261,7 +261,6 @@ else { > totalwritten => $totalwritten, > totalrefund => $totalrefunds, > totalcash => $totalcash, >- DHTMLcalendar_dateformat => C4::Dates->DHTMLcalendar(), > ); > output_html_with_http_headers $input, $cookie, $template->output; > } >diff --git a/reserve/request.pl b/reserve/request.pl >index c34a614..6e797ae 100755 >--- a/reserve/request.pl >+++ b/reserve/request.pl >@@ -623,7 +623,6 @@ foreach my $biblionumber (@biblionumbers) { > > $template->param( biblioloop => \@biblioloop ); > $template->param( biblionumbers => $biblionumbers ); >-$template->param( DHTMLcalendar_dateformat => C4::Dates->DHTMLcalendar() ); > > if ($multihold) { > $template->param( multi_hold => 1 ); >diff --git a/serials/checkexpiration.pl b/serials/checkexpiration.pl >index e831854..8dff415 100755 >--- a/serials/checkexpiration.pl >+++ b/serials/checkexpiration.pl >@@ -97,7 +97,6 @@ if ($date) { > ); > } > $template->param ( >- DHTMLcalendar_dateformat => C4::Dates->DHTMLcalendar(), > (uc(C4::Context->preference("marcflavour"))) => 1 > ); > output_html_with_http_headers $query, $cookie, $template->output; >diff --git a/serials/claims.pl b/serials/claims.pl >index 1b97a1b..5434b2a 100755 >--- a/serials/claims.pl >+++ b/serials/claims.pl >@@ -98,8 +98,6 @@ $template->param( > claimletter => $claimletter, > supplierloop => \@supplierinfo, > branchloop => $branchloop, >- dateformat => C4::Context->preference("dateformat"), >- DHTMLcalendar_dateformat => C4::Dates->DHTMLcalendar(), > (uc(C4::Context->preference("marcflavour"))) => 1 > ); > output_html_with_http_headers $input, $cookie, $template->output; >diff --git a/serials/serials-collection.pl b/serials/serials-collection.pl >index ad57e07..7428494 100755 >--- a/serials/serials-collection.pl >+++ b/serials/serials-collection.pl >@@ -172,7 +172,6 @@ $template->param( > callnumber => $callnumber, > uc(C4::Context->preference("marcflavour")) => 1, > serialsadditems => $subscriptiondescs->[0]{'serialsadditems'}, >- dateformatmetric => C4::Context->preference("dateformat") eq "metric" ? 1 : 0, > ); > > output_html_with_http_headers $query, $cookie, $template->output; >diff --git a/serials/subscription-add.pl b/serials/subscription-add.pl >index a3306ea..ee1aea4 100755 >--- a/serials/subscription-add.pl >+++ b/serials/subscription-add.pl >@@ -139,11 +139,9 @@ for my $thisbranch (sort { $branches->{$a}->{branchname} cmp $branches->{$b}->{b > my $locations_loop = GetAuthorisedValues("LOC",$subs->{'location'}); > > $template->param(branchloop => $branchloop, >- DHTMLcalendar_dateformat => C4::Dates->DHTMLcalendar(), > locations_loop=>$locations_loop, > ); > # prepare template variables common to all $op conditions: >-$template->param( 'dateformat_' . C4::Context->preference('dateformat') => 1 ); > if ($op!~/^mod/) { > letter_loop(q{}, $template); > } >diff --git a/suggestion/suggestion.pl b/suggestion/suggestion.pl >index 99f38eb..952800b 100755 >--- a/suggestion/suggestion.pl >+++ b/suggestion/suggestion.pl >@@ -252,7 +252,6 @@ foreach my $element ( qw(managedby suggestedby acceptedby) ) { > $template->param( > %$suggestion_ref, > "op_$op" => 1, >- dateformat => C4::Context->preference("dateformat"), > "op" =>$op, > ); > >@@ -369,5 +368,4 @@ foreach my $field ( qw(managedby acceptedby suggestedby budgetid) ) { > $hashlists{ lc($field) . "_loop" } = \@codes_list; > } > $template->param(%hashlists); >-$template->param(DHTMLcalendar_dateformat => C4::Dates->DHTMLcalendar(),); > output_html_with_http_headers $input, $cookie, $template->output; >diff --git a/tags/review.pl b/tags/review.pl >index 7517f41..23e4cd8 100755 >--- a/tags/review.pl >+++ b/tags/review.pl >@@ -207,7 +207,6 @@ $qstring = "limit=$pagesize" . ($qstring ? '&' . $qstring : ''); > $debug and print STDERR "number of approval_rows: " . scalar(@$tagloop) . "rows\n"; > (scalar @errors) and $template->param(message_loop=>\@errors); > $template->param( >- DHTMLcalendar_dateformat => C4::Dates->DHTMLcalendar(), > offset => $offset, # req'd for EXPR > op => $op, > op_count => scalar(@tags), >diff --git a/tools/cleanborrowers.pl b/tools/cleanborrowers.pl >index 0b37c20..4af0fcb 100755 >--- a/tools/cleanborrowers.pl >+++ b/tools/cleanborrowers.pl >@@ -163,7 +163,6 @@ $template->param( > step1 => '1', > filterdate1 => $filterdate1, > filterdate2 => $filterdate2, >- DHTMLcalendar_dateformat => C4::Dates->DHTMLcalendar(), > ); > > #writing the template >diff --git a/tools/export.pl b/tools/export.pl >index c7a8fd8..df4cfac 100755 >--- a/tools/export.pl >+++ b/tools/export.pl >@@ -466,7 +466,6 @@ else { > $template->param( > branchloop => \@branchloop, > itemtypeloop => \@itemtypesloop, >- DHTMLcalendar_dateformat => C4::Dates->DHTMLcalendar(), > authtypeloop => \@authtypesloop, > export_remove_fields => C4::Context->preference("ExportRemoveFields"), > ); >diff --git a/tools/holidays.pl b/tools/holidays.pl >index d5ace27..09449a3 100755 >--- a/tools/holidays.pl >+++ b/tools/holidays.pl >@@ -148,7 +148,6 @@ $template->param( > keydate => $keydate, > branchcodes => $branchcodes, > branch => $branch, >- DHTMLcalendar_dateformat => C4::Dates->DHTMLcalendar(), > branchname => $branchname, > branch => $branch, > ); >diff --git a/tools/inventory.pl b/tools/inventory.pl >index 5e7b198..fdf3161 100755 >--- a/tools/inventory.pl >+++ b/tools/inventory.pl >@@ -125,7 +125,6 @@ $statussth =~ s, and $,,g; > > $template->param(branchloop => \@branch_loop, > authorised_values=>\@authorised_value_list, >- DHTMLcalendar_dateformat => C4::Dates->DHTMLcalendar(), > today => C4::Dates->today(), > minlocation => $minlocation, > maxlocation => $maxlocation, >diff --git a/tools/koha-news.pl b/tools/koha-news.pl >index afc5268..4dd07a9 100755 >--- a/tools/koha-news.pl >+++ b/tools/koha-news.pl >@@ -118,8 +118,4 @@ else { > opac_news_count => $opac_news_count, > ); > } >-$template->param( >- DHTMLcalendar_dateformat => C4::Dates->DHTMLcalendar(), >- dateformat => C4::Context->preference("dateformat"), >- ); > output_html_with_http_headers $cgi, $cookie, $template->output; >diff --git a/tools/modborrowers.pl b/tools/modborrowers.pl >index a2c27c6..1bba4a0 100755 >--- a/tools/modborrowers.pl >+++ b/tools/modborrowers.pl >@@ -228,7 +228,6 @@ if ( $op eq 'show' ) { > $template->param('patron_attributes_values', \@patron_attributes_values); > > $template->param( fields => \@fields ); >- $template->param( DHTMLcalendar_dateformat => C4::Dates->DHTMLcalendar() ); > } > > # Process modifications >diff --git a/tools/scheduler.pl b/tools/scheduler.pl >index 4d732db..99210ac 100755 >--- a/tools/scheduler.pl >+++ b/tools/scheduler.pl >@@ -109,8 +109,6 @@ $template->param( JOBS => \@jobloop ); > my $time = localtime(time); > $template->param( 'time' => $time ); > $template->param( >- DHTMLcalendar_dateformat => C4::Dates->DHTMLcalendar(), >- dateformat => C4::Dates->new()->format(), > debug => $debug, > ); > output_html_with_http_headers $input, $cookie, $template->output; >diff --git a/tools/viewlog.pl b/tools/viewlog.pl >index e7d8e02..05e4625 100755 >--- a/tools/viewlog.pl >+++ b/tools/viewlog.pl >@@ -100,8 +100,6 @@ if ($src eq 'circ') { # if we were called from circulation, use the circulatio > } > > $template->param( >- DHTMLcalendar_dateformat => C4::Dates->DHTMLcalendar(), >- dateformat => C4::Dates->new()->format(), > debug => $debug, > C4::Search::enabled_staff_search_views, > ); >-- >1.7.10.4
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 9108
:
13535
|
13546
|
13723
|
13724
|
14189
|
14572
|
14573
|
23139
|
23141