From 1d570631ffacec8f5996e325a04c0baa0fcd9ac4 Mon Sep 17 00:00:00 2001
From: Henri-Damien LAURENT <henridamien@koha-fr.org>
Date: Fri, 4 Jan 2008 13:06:51 -0600
Subject: [PATCH] Bug Fix : Fewer Options would not show less options

opac-advsearch.tmpl uses include for subtypes_unimarc now.

Signed-off-by: Chris Cormack <crc@liblime.com>
Signed-off-by: Joshua Ferraro <jmf@liblime.com>
---
 .../prog/en/includes/subtypes_unimarc.inc     | 201 ++++++++++++++++++
 .../prog/en/modules/opac-advsearch.tmpl       | 195 +----------------
 2 files changed, 203 insertions(+), 193 deletions(-)
 create mode 100644 koha-tmpl/opac-tmpl/prog/en/includes/subtypes_unimarc.inc

diff --git a/koha-tmpl/opac-tmpl/prog/en/includes/subtypes_unimarc.inc b/koha-tmpl/opac-tmpl/prog/en/includes/subtypes_unimarc.inc
new file mode 100644
index 0000000000..413f4232e3
--- /dev/null
+++ b/koha-tmpl/opac-tmpl/prog/en/includes/subtypes_unimarc.inc
@@ -0,0 +1,201 @@
+    <fieldset>
+    <legend>Coded Fields</legend>
+    <p>
+    <label>Audience</label>
+    <select name="limit" class="subtype">
+            <option value="" SELECTED="selected" >Any</option>
+      <option value="aud:a">juvenile, general</option>
+      <option value="aud:b">pre-primary (0-5)</option>
+      <option value="aud:c">Primary (5-8)</option>
+      <option value="aud:d">children (9-14)</option>
+      <option value="aud:e">Young Adult</option>
+      <option value="aud:k">Adult, serious</option>
+      <option value="aud:m">Adult, General</option>
+      <option value="aud:u">Unknown</option>
+    </select>
+    </p>
+    <p>
+    <label>Print</label>
+        <select name="limit" class="subtype">
+      <option value="" selected="selected" >any</option>
+        <option value="Material-type:r">regular print</option>
+        <option value="Material-type:d">large print</option>
+        <option value="Material-type:e">newspaper format</option>
+        <option value="Material-type:f">Braille or Moon script</option>
+        <option value="Material-type:g">microprint</option>
+        <option value="Material-type:h">hand-written</option>
+        <option value="Material-type:i">multimedia</option>
+        <option value="Material-type:j">mini-print</option>
+        <option value="Material-type:z">other form of textual material</option>
+    </select>
+    </p>
+    <p>
+    <label>Feschrift Ind.</label>
+    <select name="limit" class="subtype">
+      <option value="" selected="selected" >Any</option>
+            <option value="Literature-Code:a">fiction</option>
+            <option value="Literature-Code:b">drama</option>
+            <option value="Literature-Code:c">essays</option>
+            <option value="Literature-Code:d">humour, satire</option>
+            <option value="Literature-Code:e">letters</option>
+            <option value="Literature-Code:f">short stories</option>
+            <option value="Literature-Code:g">poetry</option>
+            <option value="Literature-Code:h">speeches, oratory</option>
+            <option value="Literature-Code:y">not a literary text</option>
+            <option value="Literature-Code:z">multiple/other lit. forms</option>
+    </select>
+    </p>
+        <p>
+    <label>Biography</label>
+        <select name="limit" class="subtype" size="1">
+            <option value="">Any</option>
+            <option value="Biography-code:y">Not a biography</option>
+            <option value="Biography-code:a">autobiography</option>
+            <option value="Biography-code:b">individual biography</option>
+            <option value="Biography-code:c">collective biography</option>
+            <option value="Biography-code:d">contains biogr. data</option>
+    </select>
+        </p>
+        <p>
+    <label>Illustration</label>
+        <select name="limit" class="subtype" size="1">
+            <option value="">Any</option>
+            <option value="Illustration-Code:a">illustrations</option>
+            <option value="Illustration-Code:b">maps</option>
+            <option value="Illustration-Code:c">portraits</option>
+            <option value="Illustration-Code:d">charts</option>
+            <option value="Illustration-Code:e">plans</option>
+            <option value="Illustration-Code:f">plates</option>
+            <option value="Illustration-Code:g">music</option>
+            <option value="Illustration-Code:h">facsimiles</option>
+            <option value="Illustration-Code:i">coats of arms</option>
+            <option value="Illustration-Code:j">genealogical tables</option>
+            <option value="Illustration-Code:k">forms</option>
+            <option value="Illustration-Code:l">samples</option>
+            <option value="Illustration-Code:m">sound recordings</option>
+            <option value="Illustration-Code:n">transparencies</option>
+            <option value="Illustration-Code:o">illuminations</option>
+            <option value="Illustration-Code:y">no illustrations</option>
+        </select>
+        </p>
+    <p>
+    <label>Content</label>
+    <select name="limit" class="subtype">
+      <option value="" >Any</option>
+            <option value="ctype:a" >bibliography</option>
+            <option value="ctype:b" >catalogue</option>
+            <option value="ctype:c" >index</option>
+            <option value="ctype:d" >abstract</option>
+            <option value="ctype:e" >dictionary</option>
+            <option value="ctype:f" >encyclopaedia</option>
+            <option value="ctype:g" >directory</option>
+            <option value="ctype:h" >project description</option>
+            <option value="ctype:i" >statistics</option>
+            <option value="ctype:j" >programmed text books</option>
+            <option value="ctype:k" >patent</option>
+            <option value="ctype:l" >standard</option>
+            <option value="ctype:m" >dissertation or thesis</option>
+            <option value="ctype:n" >laws and legislation</option>
+            <option value="ctype:o" >numeric table</option>
+            <option value="ctype:p" >technical report</option>
+            <option value="ctype:q" >examination paper</option>
+            <option value="ctype:r" >literature surveys/reviews</option>
+            <option value="ctype:s" >treaties</option>
+            <option value="ctype:t" >cartoons or comic strips</option>
+            <option value="ctype:z" >other</option>
+    </select>
+        </p>
+        <p>
+    <label>Video Types</label>
+    <select name="limit" class="subtype">
+            <option value="">Any</option>
+      <option value="Video-mt:a">motion picture</option>
+      <option value="Video-mt:b">visual projection</option>
+      <option value="Video-mt:c">video recording</option>
+    </select>
+        </p>
+    </fieldset>
+    <fieldset>
+    <legend>Serials</legend><p>
+    <p>
+    <label>Serial Type</label>
+    <select name="limit" class="subtype">
+           <option value="">Any type</option>
+           <option value="Type-Of-Serial:a">Periodical</option>
+      <option value="Type-Of-Serial:b">Monographical series</option>
+      <option value="Type-Of-Serial:c">Newspaper</option>
+      <option value="Type-Of-Serial:z">Other</option>
+    </select>
+    </p>
+    <p>
+    <label>Periodicity</label>
+    <select name="limit" class="subtype">
+      <option value="">Any</option>
+        <option value="Frequency-code:a">Daily</option>
+        <option value="Frequency-code:b">Semiweekly</option>
+        <option value="Frequency-code:c">Weekly</option>
+        <option value="Frequency-code:d">Biweekly</option>
+        <option value="Frequency-code:e">Semimonthly</option>
+        <option value="Frequency-code:f">Monthly</option>
+        <option value="Frequency-code:g">Bimonthly</option>
+        <option value="Frequency-code:h">Quarterly</option>
+        <option value="Frequency-code:i">Three times a year</option>
+        <option value="Frequency-code:j">Semiannual</option>
+        <option value="Frequency-code:k">Annual</option>
+        <option value="Frequency-code:l">Biannual</option>
+        <option value="Frequency-code:m">Triennial</option>
+        <option value="Frequency-code:n">Three times a week</option>
+        <option value="Frequency-code:o">Three times a month</option>
+        <option value="Frequency-code:u">Unknown</option>
+        <option value="Frequency-code:y">Without periodicity</option>
+        <option value="Frequency-code:i">Other</option>
+    </select>
+    </p>
+    <p>
+    <label>Regularity</label>
+    <select name="limit" class="subtype">
+            <option value="">Any regularity</option>
+        <option value="Regularity-code:u">Unknown</option>
+        <option value="Regularity-code:a">Regular</option>
+        <option value="Regularity-code:b">Normalised irregular</option>
+        <option value="Regularity-code:y">irregular</option>
+    </select>
+        </p>
+
+        </fieldset>
+    <fieldset>
+    <legend>Picture</legend><p>
+    <select name="limit" class="subtype">
+        <option value="">Any</option>
+        <option value="Graphics-type:a">collage</option>
+        <option value="Graphics-type:b">drawing</option>
+        <option value="Graphics-type:c">painting</option>
+        <option value="Graphics-type:d">photomechanical reproduction</option>
+        <option value="Graphics-type:e">photonegative</option>
+        <option value="Graphics-type:f">photoprint</option>
+        <option value="Graphics-type:h">picture</option>
+        <option value="Graphics-type:i">print</option>
+        <option value="Graphics-type:k">technical drawing</option>
+        <option value="Graphics-type:z">other non-projected graphic type</option>
+    </select>
+    <select name="limit" class="subtype">
+            <option value="">any</option>
+            <option value="Graphics-support:a">canvas</option>
+            <option value="Graphics-support:b">bristol board</option>
+            <option value="Graphics-support:c">cardboard/illustration board</option>
+            <option value="Graphics-support:d">glass</option>
+            <option value="Graphics-support:j">plaster</option>
+            <option value="Graphics-support:k">hardboard</option>
+            <option value="Graphics-support:l">porcelaine</option>
+            <option value="Graphics-support:m">stone</option>
+            <option value="Graphics-support:n">wood</option>
+            <option value="Graphics-support:u">unknown</option>
+            <option value="Graphics-support:v">mixed collection</option>
+            <option value="Graphics-support:e">synthetics</option>
+            <option value="Graphics-support:f">skin</option>
+            <option value="Graphics-support:g">textile</option>
+            <option value="Graphics-support:h">metal</option>
+            <option value="Graphics-support:i">paper</option>
+            <option value="Graphics-support:z">others</option>
+    </select>
+        </p>
diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-advsearch.tmpl b/koha-tmpl/opac-tmpl/prog/en/modules/opac-advsearch.tmpl
index d70291a197..42b70665cc 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-advsearch.tmpl
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-advsearch.tmpl
@@ -290,198 +290,7 @@
     <!--/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>
+    <!-- TMPL_INCLUDE NAME="subtypes_unimarc.inc" -->
     <!--/TMPL_IF-->
 <!--/TMPL_IF-->
 </div>
@@ -518,7 +327,7 @@
 
     <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 -->
-- 
2.39.5