Koha-community
/
Koha
13
5
Fork 0
Code Issues Releases Wiki Activity
Browse Source

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 <bgkriegel@gmail.com>
Comment: Sorting works. No koha-qa errors

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
new/bootstrap-opac
Owen Leonard 11 years ago
committed by Galen Charlton
parent
4885435c6a
commit
bef919d60d
12 changed files with 12 additions and 36 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgetperiods.tt
  2. 4
      koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_tag_structure.tt
  3. 4
      koha-tmpl/intranet-tmpl/prog/en/modules/admin/authorised_values.tt
  4. 4
      koha-tmpl/intranet-tmpl/prog/en/modules/admin/branch_transfer_limits.tt
  5. 4
      koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tt
  6. 4
      koha-tmpl/intranet-tmpl/prog/en/modules/admin/categorie.tt
  7. 4
      koha-tmpl/intranet-tmpl/prog/en/modules/admin/cities.tt
  8. 4
      koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tt
  9. 4
      koha-tmpl/intranet-tmpl/prog/en/modules/admin/marctagstructure.tt
  10. 4
      koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences.tt
  11. 4
      koha-tmpl/intranet-tmpl/prog/en/modules/admin/systempreferences.tt
  12. 4
      koha-tmpl/intranet-tmpl/prog/en/modules/admin/z3950servers.tt

4
koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgetperiods.tt
View File

@ -3,9 +3,7 @@
<link rel="stylesheet" type="text/css" href="[% themelang %]/css/datatables.css" />
[% INCLUDE 'doc-head-close.inc' %]
[% INCLUDE 'calendar.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>
[% INCLUDE 'datatables.inc' %]
<script type="text/javascript" src="[% themelang %]/js/acq.js"></script>
<script type="text/javascript">
// #################################################################################

4
koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_tag_structure.tt
View File

@ -6,9 +6,7 @@
[% 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() {

4
koha-tmpl/intranet-tmpl/prog/en/modules/admin/authorised_values.tt
View File

@ -7,9 +7,7 @@
[% 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() {

4
koha-tmpl/intranet-tmpl/prog/en/modules/admin/branch_transfer_limits.tt
View File

@ -2,9 +2,7 @@
<title>Koha &rsaquo; Administration &rsaquo; Library checkin and transfer policy</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" src="[% themelang %]/lib/jquery/plugins/jquery.checkboxes.min.js"></script>
<script type="text/javascript">
//<![CDATA[

4
koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tt
View File

@ -12,9 +12,7 @@
</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" src="[% interface %]/lib/tiny_mce/tiny_mce.js"></script>
<script type="text/javascript">
//<![CDATA[

4
koha-tmpl/intranet-tmpl/prog/en/modules/admin/categorie.tt
View File

@ -6,9 +6,7 @@
[% 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 type="text/javascript" id="js">
//<![CDATA[
$(document).ready(function() {

4
koha-tmpl/intranet-tmpl/prog/en/modules/admin/cities.tt
View File

@ -2,9 +2,7 @@
<title>Koha &rsaquo; Administration &rsaquo; [% IF ( add_form ) %]Cities &rsaquo; [% IF ( cityid ) %] Modify city[% ELSE %] New city[% END %][% ELSE %][% IF ( delete_confirm ) %]Cities &rsaquo; Confirm deletion of city[% ELSE %] Cities[% END %][% END %]</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[
function Check(f) {

4
koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tt
View File

@ -19,9 +19,7 @@ Data deleted
</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[

4
koha-tmpl/intranet-tmpl/prog/en/modules/admin/marctagstructure.tt
View File

@ -6,9 +6,7 @@
[% IF ( else ) %]MARC frameworks[% END %]</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[

4
koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences.tt
View File

@ -2,9 +2,7 @@
<title>Koha &rsaquo; Administration &rsaquo; System preferences</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' %]
<link rel="stylesheet" type="text/css" href="[% themelang %]/css/preferences.css" />
[% IF ( bidi ) %]
<link rel="stylesheet" type="text/css" href="[% themelang %]/css/right-to-left.css" />

4
koha-tmpl/intranet-tmpl/prog/en/modules/admin/systempreferences.tt
View File

@ -4,9 +4,7 @@
[% INCLUDE 'doc-head-close.inc' %]
[% IF ( else ) %]
<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() {

4
koha-tmpl/intranet-tmpl/prog/en/modules/admin/z3950servers.tt
View File

@ -8,9 +8,7 @@
[% INCLUDE 'doc-head-close.inc' %]
[% IF ( else ) %]
<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' %]
[% END %]
[% IF ( add_form ) %]
<script type="text/javascript">

Write Preview
Loading…
Cancel
Save