Attachment 25190 Details for Bug 11735 – Bug 11735 - Use new DataTables include in calendar template

[patch] Bug 11735 - Use new DataTables include in calendar template

Bug-11735---Use-new-DataTables-include-in-calendar.patch (text/plain), 2.84 KB, created by Jonathan Druart on 2014-02-11 08:51:26 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jonathan Druart

Created: 2014-02-11 08:51:26 UTC

Size: 2.84 KB

patch

obsolete

>From 8dd1d1f0df3104c29cd66cdda776540d5c1a67df Mon Sep 17 00:00:00 2001
>From: Owen Leonard <oleonard@myacpl.org>
>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 <manuelimel@gmail.com>
>Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
>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).
>---
> koha-tmpl/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 8d4e923..850c59b 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' %]
> <link rel="stylesheet" type="text/css" href="[% themelang %]/css/datatables.css" />
>-<script type="text/javascript" src="[% themelang %]/lib/jquery/plugins/jquery.dataTables.min.js"></script>
>-[% INCLUDE 'datatables-strings.inc' %]
>-<script type="text/javascript" src="[% themelang %]/js/datatables.js"></script>
>+[% INCLUDE 'datatables.inc' %]
> <script language="JavaScript" type="text/javascript">
> //<![CDATA[
>-    [% IF (dateformat == 'metric') %]dt_add_type_uk_date();[% END %]
>     var weekdays = new Array(_("Sundays"),_("Mondays"),_("Tuesdays"),_("Wednesdays"),_("Thursdays"),_("Fridays"),_("Saturdays"));
> 
>     /* Creates all the structures to deal with all diferents kinds of holidays */
>@@ -160,11 +157,11 @@
>         $("#branch").change(function(){
>             changeBranch();
>         });
>-        $("#holidayexceptions,#holidayweeklyrepeatable,#holidaysunique").dataTable($.extend(true, {}, dataTablesDefaults, {
>+        $("#holidayweeklyrepeatable").dataTable($.extend(true, {}, dataTablesDefaults, {
>             "sDom": 't',
>             "bPaginate": false
>         }));
>-        $("#holidaysyearlyrepeatable").dataTable($.extend(true, {}, dataTablesDefaults, {
>+        $("#holidayexceptions,#holidaysyearlyrepeatable,#holidaysunique").dataTable($.extend(true, {}, dataTablesDefaults, {
>             "sDom": 't',
>             "aoColumns": [
>                 { "sType": "title-string" },null,null
>-- 
>1.7.10.4

Actions: View | Diff | Splinter Review

Attachments on bug 11735: 25180 | 25189 | 25190