Attachment 25613 Details for Bug 11717 – Bug 11717 - Use new DataTables include in member templates

[patch] Bug 11717 - Use new DataTables include in member templates

Bug-11717---Use-new-DataTables-include-in-member-t.patch (text/plain), 7.60 KB, created by Jonathan Druart on 2014-02-25 10:37:37 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jonathan Druart

Created: 2014-02-25 10:37:37 UTC

Size: 7.60 KB

patch

obsolete

>From 422b1cc8b43fb8aee882a510e01ec25dc8243e4a Mon Sep 17 00:00:00 2001
>From: Owen Leonard <oleonard@myacpl.org>
>Date: Fri, 7 Feb 2014 15:24:06 -0500
>Subject: [PATCH] Bug 11717 - Use new DataTables include in member templates
>
>Bug 10649 introduced a new include file for adding DataTables-related
>JavaScript assets. This patch adds use of this include file to all
>member pages which use DataTables.
>
>Apply the patch and test the following pages to confirm that table
>sorting works correctly:
>
>- Patron details (members/moremember.pl)
>  - The checkouts, relatives' checkouts, and holds tables have been
>    modified to exclude articles when sorting of titles.
>
>- Notices (members/notices.pl)
>- Circulation history (members/readingrec.pl)
>- Statistics (members/statistics.pl)
>- Update child to adult patron (members/update-child.pl) - This is the
>  page which appears in a pop-up when you update a child patron to an
>  adult (from the "More" menu in the toolbar when viewing patron
>  details).
>
>Signed-off-by: Aleisha <aleishaamohia@hotmail.com>
>Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
>---
> .../intranet-tmpl/prog/en/modules/members/moremember.tt    |   12 +++++-------
> koha-tmpl/intranet-tmpl/prog/en/modules/members/notices.tt |    4 +---
> .../intranet-tmpl/prog/en/modules/members/readingrec.tt    |    6 ++----
> .../intranet-tmpl/prog/en/modules/members/statistics.tt    |    6 ++----
> .../intranet-tmpl/prog/en/modules/members/update-child.tt  |    6 ++----
> 5 files changed, 12 insertions(+), 22 deletions(-)
>
>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 9e64caa..c4705d1 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt
>@@ -9,10 +9,8 @@
> </title>
> [% INCLUDE 'doc-head-close.inc' %]
> [% INCLUDE 'calendar.inc' %]
>-<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/en/css/datatables.css" />
>-<script type="text/javascript" src="[% interface %]/[% theme %]/en/lib/jquery/plugins/jquery.dataTables.min.js"></script>
>-[% INCLUDE 'datatables-strings.inc' %]
>-<script type="text/javascript" src="[% interface %]/[% theme %]/en/js/datatables.js"></script>
>+<link rel="stylesheet" type="text/css" href="[% themelang %]/css/datatables.css" />
>+[% INCLUDE 'datatables.inc' %]
> <script type="text/javascript" src="[% themelang %]/lib/jquery/plugins/jquery.checkboxes.min.js"></script>
> <script type="text/javascript" src="[% interface %]/lib/jquery/plugins/jquery-ui-timepicker-addon.min.js"></script>
> [% INCLUDE 'timepicker.inc' %]
>@@ -35,14 +33,14 @@ $(document).ready(function() {
>             { "aTargets": [ -1,-2 ], "bSortable": false, "bSearchable": false }
>         ],
>         "aoColumns": [
>-            { "sType": "title-string" },null,null,{ "sType": "title-string" },null,null,null,null,null,null
>+            { "sType": "title-string" },{ "sType": "anti-the" },null,{ "sType": "title-string" },null,null,null,null,null,null
>         ],
>         "bPaginate": false
>     }));
>     $("#relissuest").dataTable($.extend(true, {}, dataTablesDefaults, {
>         "sDom": 't',
>         "aoColumns": [
>-            { "sType": "title-string" },null,null,{ "sType": "title-string" },null,null,null,null,null
>+            { "sType": "title-string" },{ "sType": "anti-the" },null,{ "sType": "title-string" },null,null,null,null,null
>         ],
>         "bPaginate": false
>     }));
>@@ -52,7 +50,7 @@ $(document).ready(function() {
>             { "aTargets": [ -1,-2 ], "bSortable": false, "bSearchable": false }
>         ],
>         "aoColumns": [
>-            { "sType": "title-string" },null,null,null,null,null,null,null
>+            { "sType": "title-string" },{ "sType": "anti-the" },null,null,null,null,null,null
>         ],
>         "bPaginate": false
>     }));
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/notices.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/notices.tt
>index f3727f7..beab40d 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/notices.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/notices.tt
>@@ -3,9 +3,7 @@
> <title>Sent notices for [% INCLUDE 'patron-title.inc' %]</title>
> [% INCLUDE 'doc-head-close.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 type="text/javascript">
> //<![CDATA[
>     $(document).ready(function() {
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/readingrec.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/readingrec.tt
>index 740fd3f..29fe1af 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/readingrec.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/readingrec.tt
>@@ -2,10 +2,8 @@
> [% INCLUDE 'doc-head-open.inc' %]
> <title>Circulation History for [% INCLUDE 'patron-title.inc' %]</title>
> [% INCLUDE 'doc-head-close.inc' %]
>-<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/en/css/datatables.css" />
>-<script type="text/javascript" src="[% interface %]/[% theme %]/en/lib/jquery/plugins/jquery.dataTables.min.js"></script>
>-[% INCLUDE 'datatables-strings.inc' %]
>-<script type="text/javascript" src="[% interface %]/[% theme %]/en/js/datatables.js"></script>
>+<link rel="stylesheet" type="text/css" href="[% themelang %]/css/datatables.css" />
>+[% INCLUDE 'datatables.inc' %]
> <script type="text/javascript" id="js">
> //<![CDATA[
> 
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/statistics.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/statistics.tt
>index 388f7f1..b034613 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/statistics.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/statistics.tt
>@@ -6,11 +6,9 @@
>     Statistics for [% INCLUDE 'patron-title.inc' %]
> [% END %]
> </title>
>-<link rel="stylesheet" type="text/css" href="[% themelang %]/css/datatables.css" />
> [% INCLUDE 'doc-head-close.inc' %]
>-<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>
>+<link rel="stylesheet" type="text/css" href="[% themelang %]/css/datatables.css" />
>+[% INCLUDE 'datatables.inc' %]
> [% INCLUDE 'calendar.inc' %]
> <script type="text/javascript">
>     $(document).ready(function() {
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/update-child.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/update-child.tt
>index 5a98108..947a29a 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/update-child.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/update-child.tt
>@@ -1,10 +1,8 @@
> [% INCLUDE 'doc-head-open.inc' %]
> <title>Koha &rsaquo; Choose Adult category</title>
> [% INCLUDE 'doc-head-close.inc' %]
>-<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/en/css/datatables.css" />
>-<script type="text/javascript" src="[% interface %]/[% theme %]/en/lib/jquery/plugins/jquery.dataTables.min.js"></script>
>-[% INCLUDE 'datatables-strings.inc' %]
>-<script type="text/javascript" src="[% interface %]/[% theme %]/en/js/datatables.js"></script>
>+<link rel="stylesheet" type="text/css" href="[% themelang %]/css/datatables.css" />
>+[% INCLUDE 'datatables.inc' %]
> <script type="text/javascript">
> 	$(document).ready(function() {
>         $("#catst").dataTable($.extend(true, {}, dataTablesDefaults, {
>-- 
>1.7.10.4

Actions: View | Diff | Splinter Review

Attachments on bug 11717: 25151 | 25598 | 25613