Merge remote-tracking branch 'origin/new/bug_7548'

[koha_gimpoz] / 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 e565acf..9a4950b 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/z3950servers.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/z3950servers.tt
@@ -57,8 +57,6 @@
                  }
                  if (isNaN(f.rank.value)) {_alertString += "- rank must be a number\n";
                  }
-                if (isNaN(f.checked.value) || f.checked.value<0 || f.checked.value>1) {_alertString += "- checked must be 0 or 1\n";
-                }
                  if (_alertString.length==0) {document.Aform.submit();
                  } else {alertString2 = "Form not submitted because of the following problem(s)\n";alertString2 += "------------------------------------------------------------------------------------\n\n";alertString2 += _alertString;alert(alertString2);
                  }
@@ -67,7 +65,7 @@
  </script>
          [% END %]
  </head>
-<body>
+<body id="admin_z3950servers" class="admin">
  [% INCLUDE 'header.inc' %]
  [% INCLUDE 'z3950-admin-search.inc' %]
  
@@ -109,7 +107,13 @@
                 </li>
                 <li><label for="password">Password: </label>    <input type="text" name="password" id="password" value="[% password %]" />
                 </li>
-               <li><label for="checked">Checked (searched by default): </label>        <input type="text" size="1" name="checked" id="checked" value="[% checked %]" onblur="isNum(this)" />  </li>
+               <li><label for="checked">Checked (searched by default): </label>
+                        [% IF ( checked ) %]
+                                <input type="checkbox" name="checked" id="checked" value="1" checked="checked" />
+                        [% ELSE %]
+                                <input type="checkbox" name="checked" id="checked" value="1" />
+                        [% END %]
+                </li>
                 <li><label for="rank">Rank (display order): </label>    <input type="text" name="rank" id="rank" size="4" value="[% rank %]" onblur="isNum(this)" />
                 </li>   
                 <li><label for="syntax">Syntax (z3950 can send<br /> records in various format. Choose one): </label>   
@@ -226,6 +230,9 @@
  [% END %]
  </select>
  </li>
+    <li><label for="timeout">Timeout (0 its like not set): </label>
+               <input type="text" name="timeout" id="timeout" size="4" value="[% timeout %]" onblur="isNum(this)" /> seconds
+       </li>
  </ol>
          </fieldset>
                 
@@ -254,6 +261,7 @@
                  <li><strong>Rank: </strong>[% rank %]</li>
                  <li><strong>Syntax: </strong>[% syntax %]</li>
                  <li><strong>Encoding: </strong>[% encoding %]</li>
+                <li><strong>Timeout: </strong>[% timeout %]</li>
         </ul>                <form action="[% script_name %]" method="post"><input type="hidden" name="op" value="delete_confirmed" /><input type="hidden" name="searchfield" value="[% searchfield %]" /><input type="submit" value="Delete this Server" /></form>  <form action="[% script_name %]" method="post"><input type="submit" value="Do Not Delete" /></form>
  
  
@@ -297,7 +305,7 @@
                  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 colspan="2">&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 colspan="2">&nbsp;</th>
                  </tr></thead>
                  <tbody>[% FOREACH loo IN loop %]
                  [% UNLESS ( loop.odd ) %]
@@ -305,7 +313,7 @@
                  [% ELSE %]
                      <tr>
                  [% END %]
-<td><a href="[% loo.script_name %]?op=add_form&amp;searchfield=[% loo.name |url %]">[% loo.name %]</a></td><td>[% loo.host %]:[% loo.port %]</td><td>[% loo.db %]</td><td>[% loo.userid %]</td><td>[% loo.password %]</td><td>[% loo.checked %]</td><td>[% loo.rank %]</td>                    <td>[% loo.syntax %]</td><td>[% loo.encoding %]</td><td><a href="[% loo.script_name %]?op=add_form&amp;searchfield=[% loo.name |url %]">Edit</a></td><td><a href="[% loo.script_name %]?op=delete_confirm&amp;searchfield=[% loo.name |url %]">Delete</a></td>                </tr>
+<td><a href="[% loo.script_name %]?op=add_form&amp;searchfield=[% loo.name |url %]">[% loo.name %]</a></td><td>[% loo.host %]:[% loo.port %]</td><td>[% loo.db %]</td><td>[% loo.userid %]</td><td>[% loo.password %]</td><td>[% IF ( loo.checked ) %]Yes[% ELSE %]No[% END %]</td><td>[% loo.rank %]</td>                     <td>[% loo.syntax %]</td><td>[% loo.encoding %]</td><td>[% loo.timeout %]</td><td><a href="[% loo.script_name %]?op=add_form&amp;searchfield=[% loo.name |url %]">Edit</a></td><td><a href="[% loo.script_name %]?op=delete_confirm&amp;searchfield=[% loo.name |url %]">Delete</a></td>                </tr>
                  [% END %]</tbody>
         </table>