Merge remote branch 'kc/new/bug_5373' into kcmaster

[koha-ffzg.git] / koha-tmpl / intranet-tmpl / prog / en / includes / auth-finder-search.inc

diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/auth-finder-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/auth-finder-search.inc
index c175172..437b313 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/auth-finder-search.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/auth-finder-search.inc
@@ -1,59 +1,55 @@
-<form name="f" method="post" action="auth_finder.pl">
+<form name="f" method="get" action="auth_finder.pl">
             <input type="hidden" name="op" value="do_search" />
             <input type="hidden" name="type" value="intranet" />
-            <input type="hidden" name="nbstatements" value="<!-- TMPL_VAR NAME="nbstatements" -->" />
             <input type="hidden" name="index" value="<!-- TMPL_VAR NAME="index" -->" />
-            <h2>Search on</h2>
-                <p>
-                    <label>Authority type</label>
+                <fieldset class="rows"><ol><li>
+                    <span class="label">Authority type</span>
                     <!-- TMPL_VAR NAME="authtypecode" -->
                     <input type="hidden" name="authtypecode" value="<!-- TMPL_VAR NAME="authtypecode" -->" />
-                </p>
-                <p>
-                    <label>Main entry ($a only)</label>
+                </li>
+                <li>
+                    <label for="mainmainentry">Main entry ($a only)</label>
                     <input type="hidden" name="marclist" value="mainmainentry" />
                     <input type="hidden" name="and_or" value="and" />
                     <input type="hidden" name="excluding" value="" />
-                    <select name="operator">
+                    <select name="operator" id="mainmainentry">
                         <option value="contains">contains</option>
                         <option value="start">starts with</option>
                         <option value="is">is exactly</option>
                     </select>
-                    <input type="text" name="value" value="<!-- TMPL_VAR name="mainmainstring" -->" />
-                </p>
-                <p>
-                    <label>Main entry</label>
+                    <input type="text" name="value_mainstr" value="<!-- TMPL_VAR ESCAPE="HTML" name="value_mainstr" -->" />
+                </li>
+                <li>
+                    <label for="mainentry">Main entry</label>
                     <input type="hidden" name="marclist" value="mainentry" />
                     <input type="hidden" name="and_or" value="and" />
                     <input type="hidden" name="excluding" value="" />
-                    <select name="operator">
+                    <select name="operator" id="mainentry">
                         <option value="contains">contains</option>
                         <option value="start">starts with</option>
                         <option value="is">is exactly</option>
                     </select>
-                    <input type="text" name="value" value="<!-- TMPL_VAR name="mainstring" -->" />
-                </p>
-                <p>
-                    <label>Anywhere</label>
+                    <input type="text" name="value_main" value="<!-- TMPL_VAR ESCAPE="HTML" name="value_main" -->" />
+                </li>
+                <li>
+                    <label for="marclist">Anywhere</label>
                     <input type="hidden" name="marclist" value="" />
                     <input type="hidden" name="and_or" value="and" />
                     <input type="hidden" name="excluding" value="" />
-                    <select name="operator" >
+                    <select name="operator" id="marclist">
                         <option value="contains">contains</option>
                         <option value="start">starts with</option>
                         <option value="is">is exactly</option>
                     </select>
-                    </select>
-                    <input type="text" name="value" value="<!-- TMPL_VAR name="anystring" -->" />
-                </p>
-               <p>
-                Sort by 
-               <select name="orderby">
-               <option value="">No order</option>
-               <option value="HeadingAsc" selected="SELECTED">Heading Ascendant</option>
-               <option value="HeadingDsc">Heading Descendant</option>
-               </select>
-                <p>
-                <input type="submit" value="Start search" class="button" />
-                </p>
-        </form>
+                    <input type="text" name="value_any" value="<!-- TMPL_VAR ESCAPE="HTML" name="value_any" -->" />
+                </li>
+               <li>
+               <label for="orderby">Sort by </label>
+               <select name="orderby" id="orderby">
+                   <option value="">No order</option>
+            <option value="HeadingAsc" selected="selected">Heading Ascendant</option>
+            <option value="HeadingDsc">Heading Descendant</option>
+        </select>
+               </li></ol></fieldset>
+            <fieldset class="action"> <input type="submit" value="Start search" class="submit" /> <a class="cancel close" href="#">Cancel</a></fieldset>
+</form>