From 9915a94d3834935d95ba92f22acd125decf99a5e Mon Sep 17 00:00:00 2001
From: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Date: Tue, 26 Aug 2014 10:31:29 +0200
Subject: [PATCH] [PASSED QA] Bug 12823: Add some hints for Host and Database

When adding or editing a SRU server, this patch adds a hint, positioned
under the Hostname field.
It also moves similar information for SRU options and XSLT into hints.

Test plan:
Add/Edit SRU server. Look at Hostname, SRU options and XSLT.
Add/Edit Z39.50 server. No hints for Hostname and SRU options.

Signed-off-by: Nick Clemens <nick@quecheelibrary.org>

Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
---
 koha-tmpl/intranet-tmpl/prog/en/modules/admin/z3950servers.tt | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

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 7464b8b..3d7851f 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/z3950servers.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/z3950servers.tt
@@ -118,6 +118,9 @@
         <li><label for="name">Server name: </label><input type="text" name="servername" id="servername" size="65" maxlength="100" onblur="toUC(this)" value="[% server.servername | html %]"/></li>
 
         <li><label for="host" class="required">Hostname: </label> <input type="text" name="host" id="host" size="30" value="[% server.host %]" required="required" /> <span class="required">Required</span>
+            [% IF (server.servertype||type) == 'sru' %]
+                <div class="hint">Includes the domain part, but the path part of the URL should go into Database.</div>
+            [% END %]
         </li>
         <li><label for="port" class="required">Port: </label> <input type="text" name="port" id="port" size="5" value="[% server.port %]" required="required" /> <span class="required">Required</span>
         </li>
@@ -179,7 +182,7 @@
         <li>
         <label for="sru_options">Additional SRU options: </label>
         <input type="text" name="sru_options" id="sru_options" size="50" value="[% server.sru_options %]"/>
-        <span>( Separate options by commas. Example: sru=get,sru_version=1.1. See also http://www.indexdata.com/yaz/doc/zoom.html.)</span>
+        <div class="hint">Separate options by commas. Example: sru=get,sru_version=1.1. See also http://www.indexdata.com/yaz/doc/zoom.html.</div>
         </li>
         <li>
         <label for="sru_fields">SRU Search fields mapping: </label>
@@ -190,7 +193,7 @@
         <li>
         <label for="add_xslt">XSLT File(s) for transforming results: </label>
         <input type="text" name="add_xslt" id="add_xslt" size="100" value="[% server.add_xslt %]"/>
-        <span>(comma-separated filenames)</span>
+        <div class="hint">Separate multiple filenames by commas.</span>
         </li>
 
         </ol>
-- 
1.9.1