Bug 11740 - Use new DataTables include in quotes upload template
authorOwen Leonard <oleonard@myacpl.org>
Mon, 10 Feb 2014 20:29:06 +0000 (15:29 -0500)
committerGalen Charlton <gmc@esilibrary.com>
Wed, 19 Feb 2014 15:54:51 +0000 (15:54 +0000)
Bug 10649 introduced a new include file for adding DataTables-related
JavaScript assets. This patch adds use of this include file to the
quotes upload page.

To test you need a CSV file of quotes to upload ( "source","text" ).
Go to Tools -> Quote editor and click the "Import quotes" button. Upload
the CSV file and confirm that the table which previews the import
results loads correctly. Sorting is not enabled, but pagination and
searching should work.

Signed-off-by: Mark Tompsett <mtompset@hotmail.com>
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
No regression found.

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
koha-tmpl/intranet-tmpl/prog/en/modules/tools/quotes-upload.tt

index 2dc4af9..49cae8e 100644 (file)
@@ -2,12 +2,9 @@
     <title>Koha &rsaquo; Tools &rsaquo; Quote uploader</title>
     [% INCLUDE 'doc-head-close.inc' %]
     <link rel="stylesheet" type="text/css" href="[% themelang %]/css/uploader.css" />
-    <link rel="stylesheet" type="text/css" href="[% themelang %]/css/datatables.css" />
     <link rel="stylesheet" type="text/css" href="[% themelang %]/css/quotes.css" />
-    <script type="text/javascript" src="[% themelang %]/lib/jquery/plugins/jquery.dataTables.min.js"></script>
-    [% INCLUDE 'datatables-strings.inc' %]
-    </script>
-    <script type="text/javascript" src="[% themelang %]/js/datatables.js"></script>
+    <link rel="stylesheet" type="text/css" href="[% themelang %]/css/datatables.css" />
+    [% INCLUDE 'datatables.inc' %]
     <script type="text/javascript" src="[% themelang %]/js/jquery.jeditable.mini.js"></script>
     <script type="text/javascript">
     //<![CDATA[