From ce210ad526efbced5237a0a656f2224fdb4b6887 Mon Sep 17 00:00:00 2001
From: Colin Campbell <colin.campbell@ptfs-europe.com>
Date: Tue, 12 Apr 2011 14:43:42 +0100
Subject: [PATCH 2/3] [SIGNED-OFF] Bug 6170 restore more options to advanced search
Content-Type: text/plain; charset="utf-8"

Template conversion was treating some globals as attributes of searchbox

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
---
 .../opac-tmpl/prog/en/modules/opac-advsearch.tt    |   26 ++++++++++----------
 1 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-advsearch.tt b/koha-tmpl/opac-tmpl/prog/en/modules/opac-advsearch.tt
index 0c13637..e7f71a5 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-advsearch.tt
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-advsearch.tt
@@ -46,10 +46,10 @@
     <!-- BOOLEAN SEARCH OPTIONS -->
     <div id="booleansearch" class="container"><fieldset>
         <legend>Search for:</legend>
-    [% FOREACH search_boxes_loo IN search_boxes_loop %]
+    [% FOREACH search_box IN search_boxes_loop %]
         <p>
-        [% IF ( search_boxes_loo.expanded_options ) %]
-            [% IF ( search_boxes_loo.boolean ) %]
+        [% IF ( expanded_options ) %]
+            [% IF ( search_box.boolean ) %]
             <select name="op">
                 <option value="and" selected="selected">and</option>
                 <option value="or">or</option>
@@ -57,15 +57,15 @@
             </select>
             [% END %]
         [% END %]
-        [% IF ( search_boxes_loo.expanded_options ) %][% search_boxes_loo.left_content %][% END %] 
+        [% IF ( expanded_options ) %][% left_content %][% END %] 
         <select name="idx">
             <option value="kw">Keyword</option>
             <option value="sucommawrdl">Subject</option>
-[% IF ( search_boxes_loo.expanded_options ) %]
+[% IF ( expanded_options ) %]
             <option value="sucommaphr">&nbsp;&nbsp;&nbsp;&nbsp; Subject Phrase</option>
 [% END %]
             <option value="ti">Title</option>
-[% IF ( search_boxes_loo.expanded_options ) %]
+[% IF ( expanded_options ) %]
             <option value="ticommaphr">&nbsp;&nbsp;&nbsp;&nbsp; Title Phrase</option>
             <option value="secommawrdl">Series Title</option>
             <option value="callnum">Call Number</option>
@@ -73,7 +73,7 @@
 [% END %]
             <option value="aucommawrdl">Author</option>
             
-[% IF ( search_boxes_loo.expanded_options ) %]
+[% IF ( expanded_options ) %]
             <option value="aucommaphr">&nbsp;&nbsp;&nbsp;&nbsp; Author Phrase</option>
             <option value="cpncommawrdl">&nbsp;&nbsp;&nbsp;&nbsp; Corporate Name</option>
             <option value="cfncommawrdl">&nbsp;&nbsp;&nbsp;&nbsp; Conference Name</option>
@@ -81,13 +81,13 @@
             <option value="pncommawrdl">&nbsp;&nbsp;&nbsp;&nbsp; Personal Name</option>
             <option value="pncommaphr">&nbsp;&nbsp;&nbsp;&nbsp; Personal Name Phrase</option>
 [% END %]
-[% IF ( search_boxes_loo.expanded_options ) %]
+[% IF ( expanded_options ) %]
             <option value="nt">Notes/Comments</option>
             <option value="curriculum">Curriculum</option>
 [% END %]
             <option value="pbcommawrdl">Publisher</option>
             <option value="plcommawrdl">Publisher Location</option>
-[% IF ( search_boxes_loo.expanded_options ) %]
+[% IF ( expanded_options ) %]
             <option value="sn">Standard Number</option>
             <option value="nb">&nbsp;&nbsp;&nbsp;&nbsp; ISBN</option>
             <option value="ns">&nbsp;&nbsp;&nbsp;&nbsp; ISSN</option>
@@ -98,9 +98,9 @@
             <option value="bc">Barcode</option>
         </select>
         <input type="text" size="30" name="q" title="Enter search terms" value="" />
-[% IF ( search_boxes_loo.expanded_options ) %]
-        <!--   [% IF ( search_boxes_loo.scan_index ) %]<input type="checkbox" name="scan" id="scan" value="1" /> Scan Indexes[% END %] -->
-        [% IF ( search_boxes_loo.add_field ) %]<a href="JavaScript:add_field();" id="ButtonPlus" title="Add another field">[+]</a>[% END %]
+[% IF ( expanded_options ) %]
+        <!--   [% IF ( search_box.scan_index ) %]<input type="checkbox" name="scan" id="scan" value="1" /> Scan Indexes[% END %] -->
+        [% IF ( search_box.add_field ) %]<a href="JavaScript:add_field();" id="ButtonPlus" title="Add another field">[+]</a>[% END %]
 [% END %]
         </p>
     [% END %]
@@ -123,7 +123,7 @@
 <fieldset>
 <!-- PUB RANGE OPTION -->
 <legend>Publication Date Range:</legend>
-<span>For example:  1999-2001.  You could also use "-1987" for everything published before 1987 or "2008minus" for everything published after 2008.</span>
+<span>For example:  1999-2001.  You could also use "-1987" for everything published before 1987 or "2008-" for everything published after 2008.</span>
 <input type="text" size="30" name="limit-yr" title="Enter search terms" value="" />
 </fieldset>
 <!-- /PUB RANGE OPTION -->
-- 
1.7.1