Fix for Bug 2240, "opac-search.pl masthead does not include 'cart' and 'list' buttons...
[srvgit] / koha-tmpl / opac-tmpl / prog / en / modules / opac-advsearch.tmpl
index d70291a..03679fb 100644 (file)
@@ -3,15 +3,15 @@
     Catalog › Advanced Search
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
 </head>
-<body>
-<!-- TMPL_INCLUDE name="masthead-basic.inc" -->
-<div id="doc3" class="yui-t7">
+<body id="advsearch"><div id="doc3" class="yui-t7">
    <div id="bd">
+<!-- TMPL_INCLUDE name="masthead.inc" -->
+
 <form action="/cgi-bin/koha/opac-search.pl" method="get">
        <div class="yui-gc">
 <div class="yui-u first">
     <!-- TMPL_IF NAME="if_expanded_options_actually_worked" -->
-        <!-- TMPL_IF NAME="outer_servers_loop" -->
+       <div id="databases" class="container"> <!-- TMPL_IF NAME="outer_servers_loop" -->
             <!-- DATABASES -->
             
             <fieldset>
                             <!-- /TMPL_LOOP -->
                 </fieldset>
             <!-- /REMOTE DATABASES -->
-        <!-- /TMPL_IF -->
+        <!-- /TMPL_IF --></div>
     <!-- /TMPL_IF -->
 
     <!-- BOOLEAN SEARCH OPTIONS -->
-    <fieldset>
+    <div id="booleansearch" class="container"><fieldset>
     <legend>Search for:</legend>
     <!-- TMPL_LOOP NAME="search_boxes_loop" -->
-    
+        <p>
         <!-- TMPL_IF NAME="expanded_options" -->
             <!-- TMPL_IF NAME="search_boxes_label" -->
                 <!-- p tag was here -->
                     <option value="pn,wrdl">&nbsp;&nbsp;&nbsp;&nbsp; Personal Name</option><!-- /TMPL_IF -->
                                
  <!-- TMPL_IF NAME="selected" -->                              
-                    <option value="pn,phr"selected="selected">&nbsp;&nbsp;&nbsp;&nbsp; Personal Name Phrase</option>           
+                    <option value="pn,phr" selected="selected">&nbsp;&nbsp;&nbsp;&nbsp; Personal Name Phrase</option>          
 <!-- TMPL_ELSE -->             
                     <option value="pn,phr">&nbsp;&nbsp;&nbsp;&nbsp; Personal Name Phrase</option>
 <!-- /TMPL_IF -->
             <!-- TMPL_IF NAME="scan_index" --><input type="checkbox" name="scan" id="scan" value="1" /> Scan Indexes<!-- /TMPL_IF -->
             <!-- TMPL_IF NAME="add_field" --><a href="JavaScript:add_field();" id="ButtonPlus" title="Add another field">[+]</a><!-- /TMPL_IF -->
         <!-- /TMPL_IF -->
+        </p>
     <!-- /TMPL_LOOP -->
 
-    </fieldset>
+    </fieldset></div>
 <!-- /BOOLEAN SEARCH OPTIONS -->
-    <div id="advsearch-itemtype">
+    <div id="advsearch-itemtype" class="container">
     <h3>Itemtype limit to any of the following:</h3>
     <table>
         <tr>
       <!--TMPL_LOOP Name="itemtypeloop"-->
-        <td><input type="checkbox" id="mt-<!--TMPL_VAR Name="number" -->" name="limit" value="mt:<!--TMPL_VAR Name="code" -->"/><!-- TMPL_IF name="imageurl"--><img border="0" src="<!--TMPL_VAR Name="imageurl" -->" alt="<!--TMPL_VAR Name="description" -->" /><!-- /TMPL_IF -->&nbsp;
+        <td><input type="checkbox" id="mc-<!--TMPL_VAR Name="number" -->" name="limit" value="mc:<!--TMPL_VAR Name="code" -->"/><!-- TMPL_IF name="imageurl"--><img border="0" src="<!--TMPL_VAR Name="imageurl" -->" alt="<!--TMPL_VAR Name="description" -->" /><!-- /TMPL_IF -->&nbsp;
         <!--TMPL_VAR Name="description" --></td>
-        <!-- TMPL_UNLESS name="count5" --></tr><tr><!-- TMPL_ELSE --><!-- /TMPL_UNLESS -->
+        <!-- TMPL_UNLESS name="count5" --></tr><tr><!-- /TMPL_UNLESS -->
       <!--/TMPL_LOOP-->
-      
+         <!-- FIXME: for validation, avoid generating emtpy row -->
+               </tr>
     </table>
     </div>
 <!-- TMPL_IF NAME="expanded_options" -->
         <!-- /BASIC LIMITS -->
 
         <!-- SUBTYPE LIMITS -->
-            <fieldset>
+            <div id="subtypes" class="container"><fieldset>
             <legend>Subtype limits</legend><select name="limit" class="subtype">
                 <option value="" selected="selected" class="menuheader">Any Audience</option>
                     <option value="aud:a">Easy</option>
                     <option value="ctype:z">Treaties </option>
                 </select>
     
-    </fieldset>
+    </fieldset></div>
     <!--/TMPL_IF -->
     <!--TMPL_IF Name="UNIMARC" -->
-        <!-- SUBTYPE LIMITS -->
-            <fieldset>
-            <legend>Champs Cod&eacute;s</legend>
-            <label>Public</label>
-            <select name="limit" class="subtype">
-                <option value="" selected="selected" class="menuheader">Tout public</option>
-                    <option value="aud:a">Jeunesse en g&eacute;n&eacute;ral</option>
-                    <option value="aud:b">Pr&eacute;-scolaire</option>
-                    <option value="aud:c">scolaire</option>
-                    <option value="aud:d">enfant</option>
-                    <option value="aud:e">jeune adulte</option>
-                    <option value="aud:k">adulte, haut niveau</option>
-                    <option value="aud:m">fiction ou vulg adulte</option>
-                    <option value="aud:u">inconnu</option>
-                </select>
-            <label>Format</label>
-            <select name="limit" class="subtype">
-                <option value="" selected="selected" class="menuheader">Tout format</option>
-                        <option value="Material-type:r">Impression normale</option>
-                        <option value="Material-type:d">Impression en gros caractere</option>
-                        <option value="Material-type:e">Journal</option>
-                        <option value="Material-type:f">Caractere braille et moon</option>
-                        <option value="Material-type:g">Micro-impression</option>
-                        <option value="Material-type:h">Manuscrit</option>
-                        <option value="Material-type:i">Multimedia</option>
-                        <option value="Material-type:j">Impression en reduction</option>
-                        <option value="Material-type:z">Autres formes de presentation</option>
-                </select>
-            <label>Forme</label>
-            <select name="limit" class="subtype">
-                <option value="" selected="selected" class="menuheader">Toute forme</option>
-                    <option value="Literature-Code:a">fiction, roman</option>
-                    <option value="Literature-Code:b">Theatre, piece televisee</option>
-                    <option value="Literature-Code:c">Essais</option>
-                    <option value="Literature-Code:d">Humour, satire</option>
-                    <option value="Literature-Code:e">Lettres</option>
-                    <option value="Literature-Code:f">Nouvelles</option>
-                    <option value="Literature-Code:g">Poesie</option>
-                    <option value="Literature-Code:h">Discours, art oratoire</option>
-                    <option value="Literature-Code:y">Il ne s'agit pas d'un texte litteraire</option>
-                    <option value="Literature-Code:z">formes vari&eacute;es ou autres formes litteraires</option>
-                </select>
-            <label>Biographie</label>
-            <select name="limit" class="subtype" size="1">
-                <option value="">Tout type de biographie</option>
-                    <option value="Biography-code:y">C'est pas une biographie</option>
-                    <option value="Biography-code:a">autobiographie (y compris correspondance...)</option>
-                    <option value="Biography-code:b">Biographie individuelle</option>
-                    <option value="Biography-code:c">Biographie collective</option>
-                    <option value="Biography-code:d">Contient des informations biographiques</option>
-                </select>
-            <label>Illustration</label>
-            <select name="limit" class="subtype" size="1">
-                <option value="">Tout type d'illustration</option>
-                    <option value="Illustration-Code:a">Illustrations</option>
-                    <option value="Illustration-Code:b">Cartes</option>
-                    <option value="Illustration-Code:c">Portraits</option>
-                    <option value="Illustration-Code:d">cartes marines</option>
-                    <option value="Illustration-Code:e">plans</option>
-                    <option value="Illustration-Code:f">Planches</option>
-                    <option value="Illustration-Code:g">Musique imprimee</option>
-                    <option value="Illustration-Code:h">fac-similes</option>
-                    <option value="Illustration-Code:i">armoiries</option>
-                    <option value="Illustration-Code:j">Tables Genealogique</option>
-                    <option value="Illustration-Code:k">Formulaires</option>
-                    <option value="Illustration-Code:l">Specimens</option>
-                    <option value="Illustration-Code:m">Enregistrement sonore</option>
-                    <option value="Illustration-Code:n">Transparents</option>
-                    <option value="Illustration-Code:o">Enluminures</option>
-                    <option value="Illustration-Code:y">Sans illustrations</option>
-                </select>
-            
-            <label>Contenu</label>
-            <select name="limit" class="subtype">
-                <option value="">Tout type de contenu</option>
-                    <option value="ctype:a">Bibliographie</option>
-                    <option value="ctype:b">Catalogue</option>
-                    <option value="ctype:c">index</option>
-                    <option value="ctype:d">resume</option>
-                    <option value="ctype:e">Dictionnaire</option>
-                    <option value="ctype:f">encyclopedie</option>
-                    <option value="ctype:g">Repertoire</option>
-                    <option value="ctype:h">Description projet</option>
-                    <option value="ctype:i">statistiques</option>
-                    <option value="ctype:j">Manuels d'enseignement programme</option>
-                    <option value="ctype:k">Brevet</option>
-                    <option value="ctype:l">norme</option>
-                    <option value="ctype:m">Memoire ou these</option>
-                    <option value="ctype:n">Lois et decrets</option>
-                    <option value="ctype:o">Table numerique</option>
-                    <option value="ctype:p">Rapport technique</option>
-                    <option value="ctype:q">Sujet d'examen</option>
-                    <option value="ctype:r">Synthese bibliographique</option>
-                    <option value="ctype:s">Traite</option>
-                    <option value="ctype:t">Bande dessinee</option>
-                    <option value="ctype:z">Autres</option>
-                </select>
-            
-            
-            <label>Type vid&eacute;o</label>
-            <select name="limit" class="subtype">
-                <option value="">Tout type video</option>
-                    <option value="Video-mt:a">Film</option>
-                    <option value="Video-mt:b">Document &agrave; projeter</option>
-                    <option value="Video-mt:c">Enregistrement video</option>
-                </select>
-            
-            </fieldset>
-            <fieldset>
-            <legend>P&eacute;riodique</legend>
-            
-            <label>Type periodique</label>
-            <select name="limit" class="subtype">
-            <option value="">Tout type de periodique</option>
-                <option value="Type-Of-Serial:a">Periodique</option>
-                    <option value="Type-Of-Serial:b">Collection des monographies</option>
-                    <option value="Type-Of-Serial:c">Journal</option>
-                    <option value="Type-Of-Serial:z">autres</option>
-                </select>
-            
-            
-            <label>P&eacute;riodicit&eacute;</label>
-            <select name="limit" class="subtype">
-                <option value="">Toute P&eacute;riodicit&eacute;</option>
-                        <option value="Frequency-code:a">Quotidien</option>
-                        <option value="Frequency-code:b">Bihebdomadaire</option>
-                        <option value="Frequency-code:c">Hebdomadaire</option>
-                        <option value="Frequency-code:d">Toutes les deux semaines</option>
-                        <option value="Frequency-code:e">Deux fois par mois</option>
-                        <option value="Frequency-code:f">Mensuel</option>
-                        <option value="Frequency-code:g">Bimestriel</option>
-                        <option value="Frequency-code:h">Trimestriel</option>
-                        <option value="Frequency-code:i">Trois fois par an</option>
-                        <option value="Frequency-code:j">Semestriel</option>
-                        <option value="Frequency-code:k">Annuel</option>
-                        <option value="Frequency-code:l">Bisanuel</option>
-                        <option value="Frequency-code:m">Triennal</option>
-                        <option value="Frequency-code:n">Trois fois par semaine</option>
-                        <option value="Frequency-code:o">Trois fois par mois</option>
-                        <option value="Frequency-code:u">Inconnue</option>
-                        <option value="Frequency-code:y">Sans periodicite</option>
-                        <option value="Frequency-code:i">Autre</option>
-                </select>
-            
-            
-            <label>Toute R&eacute;gularit&eacute;</label>
-            <select name="limit" class="subtype">
-                <option value="">R&eacute;gularit&eacute;</option>
-                        <option value="Regularity-code:u">Inconnu</option>
-                        <option value="Regularity-code:a">Regulier</option>
-                        <option value="Regularity-code:b">Normalement irregulier</option>
-                        <option value="Regularity-code:y">Irregulier</option>
-                </select>
-            
-    
-            </fieldset>
-            <fieldset>
-            <legend>Document pictural</legend>
-            <select name="limit" class="subtype">
-                    <option value="">Tout type</option>
-                        <option value="Graphics-type:a">Collage</option>
-                        <option value="Graphics-type:b">Dessin</option>
-                        <option value="Graphics-type:c">Peinture</option>
-                        <option value="Graphics-type:d">Reproduction photomecanique</option>
-                        <option value="Graphics-type:e">Negatif photo</option>
-                        <option value="Graphics-type:f">Tirage photographique</option>
-                        <option value="Graphics-type:h">Image</option>
-                        <option value="Graphics-type:i">Gravure</option>
-                        <option value="Graphics-type:k">Dessin technique</option>
-                        <option value="Graphics-type:z">Autres types de documents graphique non projetable</option>
-                </select>
-            <select name="limit" class="subtype">
-                <option value="">tout support</option>
-                    <option value="Graphics-support:a">Toile</option>
-                    <option value="Graphics-support:b">Carte bristol</option>
-                    <option value="Graphics-support:c">Carton / carte a dessin</option>
-                    <option value="Graphics-support:d">Verre</option>
-                    <option value="Graphics-support:j">Platre</option>
-                    <option value="Graphics-support:k">Isorel</option>
-                    <option value="Graphics-support:l">Porcelaine</option>
-                    <option value="Graphics-support:m">Pierre</option>
-                    <option value="Graphics-support:n">Bois</option>
-                    <option value="Graphics-support:u">Inconnu</option>
-                    <option value="Graphics-support:v">Support composite</option>
-                    <option value="Graphics-support:e">Synthetique (plastique, vinyle...)</option>
-                    <option value="Graphics-support:f">Peau</option>
-                    <option value="Graphics-support:g">Textile</option>
-                    <option value="Graphics-support:h">Metal</option>
-                    <option value="Graphics-support:i">Papier</option>
-                    <option value="Graphics-support:z">Autres</option>
-                </select>
-            
-    </fieldset>
+        <div id="subtypes_unimarc" class="container"><!-- SUBTYPE LIMITS -->
+    <!-- TMPL_INCLUDE NAME="subtypes_unimarc.inc" --></div>
     <!--/TMPL_IF-->
 <!--/TMPL_IF-->
 </div>
         <div class="yui-u">
 <!-- AVAILABILITY LIMITS -->
-    <fieldset><legend>Location and availability: </legend>
+    <div id="location" class="container"><fieldset><legend>Location and availability: </legend>
         
-        <select name="limit" id="branchloop">
-        <option value="">All branches</option>
+        <select name="limit" id="branchloop" style="width: 20em;">
+        <option value="">All libraries</option>
         <!-- TMPL_LOOP NAME="branchloop" -->
         <!--TMPL_IF Name="selected"-->
-        <option value="<!-- TMPL_VAR NAME="value" -->" selected="selected"><!-- TMPL_VAR NAME="branchname" --></option>
+        <option value="branch:<!-- TMPL_VAR NAME="value" -->" selected="selected"><!-- TMPL_VAR NAME="branchname" --></option>
         <!--TMPL_ELSE-->    
-        <option value="<!-- TMPL_VAR NAME="value" -->"><!-- TMPL_VAR NAME="branchname" --></option>
+        <option value="branch:<!-- TMPL_VAR NAME="value" -->"><!-- TMPL_VAR NAME="branchname" --></option>
         <!--/TMPL_IF-->    
         <!-- /TMPL_LOOP -->
         </select>
         
         
-        <label for="available-items">Only items currently available</label><input type="checkbox" id="available-items" name="limit" value="datedue:0000-00-00" />
-    </fieldset>
+        <div style="margin-top:.4em"><label for="available-items"><input type="checkbox" id="available-items" name="limit" value="available" /> Only items currently available</label></div>
+    </fieldset></div>
 <!-- /AVAILABILITY LIMITS -->
 
 <!-- RANK LIMITS -->
-    <fieldset><legend>Sort by: </legend>
-        <select id="sort_by" name="sort_by">
+    <div id="sortby" class="container"><fieldset><legend>Sort by: </legend>
+        <select id="sort_by" name="sort_by" style="width:20em;">
 <!--TMPL_INCLUDE NAME="resort_form.inc" -->
-</select></fieldset>
+</select></fieldset></div>
 <!-- RANK LIMITS -->
 </div>
 </div>
 
-<div class="yui-g" style="text-align: center;"><!-- SEARCH BUTTONS -->
+<div class="yui-g" style="text-align: center;"><div class="container"><!-- SEARCH BUTTONS -->
 
     <input class="submit" type="submit" accesskey="s" name="do" title="Search" value="OK" />
     <!-- TMPL_IF NAME="expanded_options" -->
-        <a href="/cgi-bin/koha/opac-search.pl">[Fewer Options]</a>
+        <a href="/cgi-bin/koha/opac-search.pl?expanded_options=0">[Fewer Options]</a>
     <!-- TMPL_ELSE -->
         <a href="/cgi-bin/koha/opac-search.pl?expanded_options=1">[More options]</a>
     <!-- /TMPL_IF -->
     <a href="/cgi-bin/koha/opac-search.pl?do=Clear">[New Search]</a>
 
-<!-- /SEARCH BUTTONS --></div>
+<!-- /SEARCH BUTTONS --></div></div>
 </form>
 
 <script type="text/JavaScript" language="JavaScript">
 
 
 </div>
-</div>
 <!-- TMPL_INCLUDE NAME="opac-bottom.inc" -->