Merge branch 'bug_8061' into 3.12-master

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

index 3005ae8..18f92fc 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/z3950servers.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/z3950servers.tt
@@ -10,27 +10,7 @@
  <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[
-// prepare DOM for YUI Toolbar
- $(document).ready(function() {
-    yuiToolbar();
-    [% IF ( loop ) %]$("#serverst").dataTable($.extend(true, {}, dataTablesDefaults, {
-        "aoColumnDefs": [
-            { "aTargets": [ 2,3,4,7,8,9,10,11 ], "bSortable": false, "bSearchable": false },
-        ],
-        "iDisplayLength": 20,
-        "aLengthMenu": [[10, 20, 50, 100, -1], [10, 20, 50, 100, "All"]],
-        "sPaginationType": "four_button"
-    }));[% END %]
- });
-// YUI Toolbar Functions
-function yuiToolbar() {
-    new YAHOO.widget.Button("newserver");
-}   //]]>
-</script>
  [% END %]
-
  [% IF ( add_form ) %]
  <script type="text/javascript">
  //<![CDATA[
@@ -88,7 +68,24 @@ function yuiToolbar() {
          }
          //]]>
  </script>
-        [% END %]
+[% END %]
+[% IF ( else ) %]
+    <script type="text/javascript">
+    //<![CDATA[
+     $(document).ready(function() {
+        [% IF ( loop ) %]$("#serverst").dataTable($.extend(true, {}, dataTablesDefaults, {
+            "aoColumnDefs": [
+                { "aTargets": [ 2,3,4,7,8,9,10,11 ], "bSortable": false, "bSearchable": false },
+            ],
+            "iDisplayLength": 20,
+            "aLengthMenu": [[10, 20, 50, 100, -1], [10, 20, 50, 100, "All"]],
+            "sPaginationType": "four_button"
+        }));[% END %]
+     });
+    //]]>
+    </script>
+[% END %]
+
  </head>
  <body id="admin_z3950servers" class="admin">
  [% INCLUDE 'header.inc' %]
@@ -284,10 +281,9 @@ function yuiToolbar() {
  
  [% IF ( else ) %]
  
-<div id="toolbar">
-       <ul class="toolbar">
-    <li><a id="newserver" href="/cgi-bin/koha/admin/z3950servers.pl?op=add_form">New Z39.50 server</a></li>
-</ul></div>
+<div id="toolbar" class="btn-toolbar">
+    <a id="newserver" class="btn btn-small" href="/cgi-bin/koha/admin/z3950servers.pl?op=add_form"><i class="icon-plus"></i> New Z39.50 server</a>
+</div>
  
  <h3>Z39.50 servers administration</h3>
  
@@ -295,7 +291,7 @@ function yuiToolbar() {
                  You searched for [% searchfield %]
          [% END %]              
  <table id="serverst">
-                <thead><tr><th>Target</th><th>Hostname/Port</th><th>Database</th><th>Userid</th><th>Password</th><th>Checked</th><th>Rank</th>                         <th>Syntax</th><th>Encoding</th><th>Timeout</th><th>&nbsp;</th><th>&nbsp;</th>
+                <thead><tr><th>Target</th><th>Hostname/Port</th><th>Database</th><th>Userid</th><th>Password</th><th>Checked</th><th>Rank</th><th>Syntax</th><th>Encoding</th><th>Timeout</th><th>&nbsp;</th><th>&nbsp;</th>
                  </tr></thead>
                  <tbody>[% FOREACH loo IN loop %]
                  [% UNLESS ( loop.odd ) %]