From 7d6daf4ceb6680fd9a86dba38d219511df250d7c Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Mon, 10 Feb 2014 12:59:07 -0500 Subject: [PATCH] Bug 11735 - Use new DataTables include in calendar template Bug 10649 introduced a new include file for adding DataTables-related JavaScript assets. This patch adds use of this include file to the calendar template and corrects some table sorting configuration errors. To test you should have multiple calendar entries in various categories of holiday: Unique holidays, repeating yearly holidays, repeating weekly holidays, and exceptions. Sorting of date columns should work regardless of your dateformat system preference. Signed-off-by: merlissia Signed-off-by: Jonathan Druart Note: Day of week is not correctly sorted: Sundays, Mondays, Thursdays. But it is not a regression. It is caused by the ugly way to display weekdays (document.write). Signed-off-by: Galen Charlton (cherry picked from commit ef65eee25e2946adf20650d61781363f735058b6) Signed-off-by: Fridolin Somers --- .../intranet-tmpl/prog/en/modules/tools/holidays.tt | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) 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 8d4e923923..850c59bd8c 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/holidays.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/holidays.tt @@ -3,12 +3,9 @@ [% INCLUDE 'doc-head-close.inc' %] [% INCLUDE 'calendar.inc' %] - -[% INCLUDE 'datatables-strings.inc' %] - +[% INCLUDE 'datatables.inc' %]