Merge branch 'bug_9818' into 3.14-master

[koha.git] / koha-tmpl / intranet-tmpl / prog / en / modules / admin / cities.tt
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/cities.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/cities.tt

index c1fccde..acb4f22 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/cities.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/cities.tt
@@ -1,15 +1,10 @@
  [% INCLUDE 'doc-head-open.inc' %]
-<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>
+<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' %]
-<script type="text/javascript" src="[% themelang %]/lib/jquery/plugins/jquery.tablesorter.min.js"></script>
-<script type="text/javascript" src="[% themelang %]/lib/jquery/plugins/jquery.tablesorter.pager.js"></script>
-<script type="text/javascript" id="js">$(document).ready(function() {
-       $.tablesorter.defaults.widgets = ['zebra'];
-       $("#table_cities").tablesorter({
-               sortList: [[1,0]],
-               headers: { 5: { sorter: false},6: { sorter: false}}
-       }).tablesorterPager({container: $("#pagertable_cities"),positionFixed: false,size: 20});
-}); </script>
+<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>
  <script type="text/javascript">
  //<![CDATA[
      function Check(f) {
@@ -20,12 +15,19 @@
          }
      }
      $(document).ready(function() {
-        new YAHOO.widget.Button("newcity");
+        $("#table_cities").dataTable($.extend(true, {}, dataTablesDefaults, {
+            "aoColumnDefs": [
+                { "aTargets": [ -1, -2 ], "bSortable": false, "bSearchable": false },
+            ],
+            "aaSorting": [[ 1, "asc" ]],
+            "iDisplayLength": 10,
+            "aLengthMenu": [[10, 20, 50, 100, -1], [10, 20, 50, 100, "All"]],
+        }));
      });
  //]]>
  </script>
  </head>
-<body>
+<body id="admin_cities" class="admin">
  [% INCLUDE 'header.inc' %]
  [% INCLUDE 'cities-admin-search.inc' %]
  
@@ -36,7 +38,7 @@
      [% IF ( add_form ) %]
      &rsaquo; [% IF ( cityid ) %]Modify[% ELSE %]New[% END %] City
      [% ELSIF ( delete_confirm ) %]
-    &rsaquo; Confirm Deletion of City
+    &rsaquo; Confirm deletion of city
      [% END %]
  </div>
  
@@ -118,10 +120,9 @@
  
  [% IF ( else ) %]
  
-<div id="toolbar">
-       <ul class="toolbar">
-       <li><a id="newcity" href="[% script_name %]?op=add_form">New City</a></li>
-</ul></div>
+<div id="toolbar" class="btn-toolbar">
+    <a class="btn btn-small" id="newcity" href="[% script_name %]?op=add_form"><i class="icon-plus"></i> New city</a>
+</div>
  
         <h2>Cities</h2>
         [% IF ( searchfield ) %]
@@ -129,9 +130,6 @@
         [% END %]
  
  [% IF ( loop ) %]
-<div id="pagertable_cities">
-[% INCLUDE 'table-pager.inc' perpage='20' %]
-</div>
  <table id="table_cities">
                 <thead>
                         <th>City ID</th>