From 282a2d60b830b22661cc0324a84b7c17b7b905d1 Mon Sep 17 00:00:00 2001
From: Katrin Fischer <Katrin.Fischer.83@web.de>
Date: Thu, 25 Aug 2011 00:40:56 +0200
Subject: [PATCH] Bug 6458: Incorrect translation processing / results

Removed template toolkit directives from within HTML tags.

Advanced Search > Scan Index > Search results

Additional changes:
- removes entry 'Series Title' from the index pull down as it was the same
  index as 'Series'

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
---
 .../prog/en/modules/catalogue/results.tt      | 34 ++++++++++++-------
 1 file changed, 22 insertions(+), 12 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tt
index e1f84b8e94..7a1039d247 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tt
@@ -318,18 +318,28 @@ YAHOO.util.Event.onContentReady("searchheader", function () {
                         <label for="scan-index">Indexed in:</label>
                         <select name="idx" id="scan-index">
                             <option value="">Any Word</option>
-                            <option [% IF (ms_anycommaphr) %] selected="selected" [% END %] value="any,phr">Any Phrase</option>
-                            <option [% IF ( ms_ti ) %] selected="selected" [% END %] value="ti">Title</option>
-                            <option [% IF (ms_ticommaphr) %] selected="selected" [% END %] value="ti,phr">Title Phrase</option>
-                            <option [% IF (ms_aucommaphr) %] selected="selected" [% END %] value="au,phr">Author</option>
-                            <option [% IF ( ms_su ) %] selected="selected" [% END %] value="su">Subject</option>
-                            <option [% IF (ms_sucommaphr) %] selected="selected" [% END %] value="su,phr">Subject Phrase</option>
-                            <option [% IF ( ms_se ) %] selected="selected" [% END %] value="se">Series</option>
-                            <option [% IF ( ms_pb ) %] selected="selected" [% END %] value="pb">Publisher</option>
-                            <option [% IF ( ms_nt ) %] selected="selected" [% END %] value="nt">Notes</option>
-                            <option [% IF ( ms_se ) %] selected="selected" [% END %] value="se">Series Title</option>
-                            <option [% IF ( ms_sn ) %] selected="selected" [% END %] value="sn">ISBN</option>
-                            <option [% IF ( ms_ss ) %] selected="selected" [% END %] value="ss">ISSN</option>
+                            [% IF ( ms_anycommaphr) %]<option selected="selected" value="any,phr">Any Phrase</option>
+                            [% ELSE %]<option value="any,phr">Any Phrase</option>[% END %]
+                            [% IF ( ms_ti ) %]<option selected="selected" value="ti">Title</option>
+                            [% ELSE %]<option value="ti">Title</option>[% END %]
+                            [% IF ( ms_ticommaphr ) %]<option selected="selected" value="ti,phr">Title Phrase</option>
+                            [% ELSE %]<option value="ti,phr">Title Phrase</option>[% END %]
+                            [% IF ( ms_aucommaphr ) %]<option selected="selected" value="au,phr">Author</option>
+                            [% ELSE %]<option value"au,phr">Author</option>[% END %]
+                            [% IF ( ms_su ) %]<option selected="selected" value="su">Subject</option>
+                            [% ELSE %]<option value="su">Subject</option>[% END %]
+                            [% IF ( ms_sucommaphr ) %]<option selected="selected" value="su,phr">Subject Phrase</option>
+                            [% ELSE %]<option value="su,phr">Subject Phrase</option>[% END %]
+                            [% IF ( ms_se ) %]<option selected="selected" value="se">Series</option>
+                            [% ELSE %]<option value="su">Series</option>[% END %]
+                            [% IF ( ms_pb ) %]<option selected="selected" value="pb">Publisher</option>
+                            [% ELSE %]<option value="pb">Publisher</option>[% END %]
+                            [% IF ( ms_nt ) %]<option selected="selected" value="nt">Notes</option>
+                            [% ELSE %]<option value="nt">Notes</option>[% END %]
+                            [% IF ( ms_sn ) %]<option selected="selected" value="sn">ISBN</option>
+                            [% ELSE %]<option value="sn">ISBN</option>[% END %]
+                            [% IF ( ms_ss ) %]<option selected="selected" value="ss">ISSN</option>
+                            [% ELSE %]<option value="ss">ISSN</option>[% END %]
                         </select>
                         <input type="hidden" name="scan" value="1" />
                     </td>
-- 
2.20.1