From bef919d60da823117306ded112367fc2b6039df6 Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Tue, 10 Sep 2013 08:25:44 -0400 Subject: [PATCH] Bug 10651 - Use new DataTables include in administration templates Bug 10649 introduced a new include file for adding DataTables-related JavaScript assets. This patch adds use of this include file to all administration-related pages which use DataTables. To test, view the following pages and confirm that table sorting is still working correctly: - Administration -> Budgets - Administration -> Authority types -> MARC structure - Administration -> Authorized values - Administration -> Library transfer limits - Administration -> Libraries and groups - Administration -> Patron types and categories - Administration -> Cities and towns - Administration -> Item types - Administration -> MARC bibliographic framework -> MARC structure - Administration -> System preferences - Administration -> System preferences -> Local use - Administration -> Z39.50 client targets Signed-off-by: Bernardo Gonzalez Kriegel Comment: Sorting works. No koha-qa errors Signed-off-by: Jonathan Druart Signed-off-by: Galen Charlton --- .../intranet-tmpl/prog/en/modules/admin/aqbudgetperiods.tt | 4 +--- .../intranet-tmpl/prog/en/modules/admin/auth_tag_structure.tt | 4 +--- .../intranet-tmpl/prog/en/modules/admin/authorised_values.tt | 4 +--- .../prog/en/modules/admin/branch_transfer_limits.tt | 4 +--- koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tt | 4 +--- koha-tmpl/intranet-tmpl/prog/en/modules/admin/categorie.tt | 4 +--- koha-tmpl/intranet-tmpl/prog/en/modules/admin/cities.tt | 4 +--- koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tt | 4 +--- .../intranet-tmpl/prog/en/modules/admin/marctagstructure.tt | 4 +--- koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences.tt | 4 +--- .../intranet-tmpl/prog/en/modules/admin/systempreferences.tt | 4 +--- koha-tmpl/intranet-tmpl/prog/en/modules/admin/z3950servers.tt | 4 +--- 12 files changed, 12 insertions(+), 36 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgetperiods.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgetperiods.tt index 8a4a4ea886..453da0e021 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgetperiods.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgetperiods.tt @@ -3,9 +3,7 @@ [% INCLUDE 'doc-head-close.inc' %] [% INCLUDE 'calendar.inc' %] - -[% INCLUDE 'datatables-strings.inc' %] - +[% INCLUDE 'datatables.inc' %] -[% INCLUDE 'datatables-strings.inc' %] - +[% INCLUDE 'datatables.inc' %] -[% INCLUDE 'datatables-strings.inc' %] - +[% INCLUDE 'datatables.inc' %] -[% INCLUDE 'datatables-strings.inc' %] - +[% INCLUDE 'datatables.inc' %] -[% INCLUDE 'datatables-strings.inc' %] - +[% INCLUDE 'datatables.inc' %] -[% INCLUDE 'datatables-strings.inc' %] - +[% INCLUDE 'datatables.inc' %] -[% INCLUDE 'datatables-strings.inc' %] - +[% INCLUDE 'datatables.inc' %] -[% INCLUDE 'datatables-strings.inc' %] - +[% INCLUDE 'datatables.inc' %] -[% INCLUDE 'datatables-strings.inc' %] - +[% INCLUDE 'datatables.inc' %] -[% INCLUDE 'datatables-strings.inc' %] - +[% INCLUDE 'datatables.inc' %] [% IF ( bidi ) %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/systempreferences.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/systempreferences.tt index 771255109a..e9030380b9 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/systempreferences.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/systempreferences.tt @@ -4,9 +4,7 @@ [% INCLUDE 'doc-head-close.inc' %] [% IF ( else ) %] - -[% INCLUDE 'datatables-strings.inc' %] - +[% INCLUDE 'datatables.inc' %] -[% INCLUDE 'datatables-strings.inc' %] - +[% INCLUDE 'datatables.inc' %] [% END %] [% IF ( add_form ) %]