bug 2596: remove URL escaping added by previous patch

[koha.git] / koha-tmpl / intranet-tmpl / prog / en / modules / catalogue / results.tmpl

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tmpl
old mode 100755 (executable)
new mode 100644 (file)
index 3f447c0..3609e26
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tmpl
@@ -119,18 +119,18 @@ $(window).load(function() {
                         <label for="scan-index">Indexed in:</label>
                         <select name="idx" id="scan-index">
                             <option value="">Any Word</option>
-                            <option value="any,phr:">Any Phrase</option>
-                            <option value="ti:">Title</option>
-                            <option value="ti,phr:">Title Phrase</option>
-                            <option value="au,phr:">Author</option>
-                            <option value="su:">Subject</option>
-                            <option value="su,phr:">Subject Phrase</option>
-                            <option value="se:">Series</option>
-                            <option value="pb:">Publisher</option>
-                            <option value="nt:">Notes</option>
-                            <option value="se:">Series Title</option>
-                            <option value="sn:">ISBN</option>
-                            <option value="ss:">ISSN</option>
+                            <option <!-- TMPL_IF NAME="ms_any,phr" --> selected="selected" <!-- /TMPL_IF --> value="any,phr">Any Phrase</option>
+                            <option <!-- TMPL_IF NAME="ms_ti" --> selected="selected" <!-- /TMPL_IF --> value="ti">Title</option>
+                            <option <!-- TMPL_IF NAME="ms_ti,phr" --> selected="selected" <!-- /TMPL_IF --> value="ti,phr">Title Phrase</option>
+                            <option <!-- TMPL_IF NAME="ms_au,phr" --> selected="selected" <!-- /TMPL_IF --> value="au,phr">Author</option>
+                            <option <!-- TMPL_IF NAME="ms_su" --> selected="selected" <!-- /TMPL_IF --> value="su">Subject</option>
+                            <option <!-- TMPL_IF NAME="ms_su,phr" --> selected="selected" <!-- /TMPL_IF --> value="su,phr">Subject Phrase</option>
+                            <option <!-- TMPL_IF NAME="ms_se" --> selected="selected" <!-- /TMPL_IF --> value="se">Series</option>
+                            <option <!-- TMPL_IF NAME="ms_pb" --> selected="selected" <!-- /TMPL_IF --> value="pb">Publisher</option>
+                            <option <!-- TMPL_IF NAME="ms_nt" --> selected="selected" <!-- /TMPL_IF --> value="nt">Notes</option>
+                            <option <!-- TMPL_IF NAME="ms_se" --> selected="selected" <!-- /TMPL_IF --> value="se">Series Title</option>
+                            <option <!-- TMPL_IF NAME="ms_sn" --> selected="selected" <!-- /TMPL_IF --> value="sn">ISBN</option>
+                            <option <!-- TMPL_IF NAME="ms_ss" --> selected="selected" <!-- /TMPL_IF --> value="ss">ISSN</option>
                         </select>
                         <input type="hidden" name="scan" value="1" />
                     </td>
@@ -147,7 +147,7 @@ $(window).load(function() {
                 <!-- TMPL_LOOP NAME="SEARCH_RESULTS" -->
                     <!-- TMPL_IF NAME="__odd__" --><tr><!-- TMPL_ELSE --><tr class="highlight"><!-- /TMPL_IF -->
                         <td>
-                            <a href="/cgi-bin/koha/catalogue/search.pl?idx=<!-- TMPL_VAR name="scan_index" -->&amp;q=<!-- TMPL_VAR NAME="scan_use" escape="url" -->&quot;<!-- TMPL_VAR NAME="title_nospan" -->&quot;"><!-- TMPL_VAR NAME="title" --></a>
+                            <a href="/cgi-bin/koha/catalogue/search.pl?idx=<!-- TMPL_VAR name="scan_index_to_use" -->&amp;q=<!-- TMPL_VAR NAME="scan_use" escape="url" -->&quot;<!-- TMPL_VAR NAME="title_nospan" -->&quot;"><!-- TMPL_VAR NAME="title" --></a>
                         </td>
                         <td>
                             <!-- TMPL_VAR NAME="author" -->
@@ -266,7 +266,18 @@ $(window).load(function() {
                                                                        <!-- /TMPL_IF -->
                                 </p>
                                 <!-- TMPL_IF name="summary" -->
-                                    <p><!-- TMPL_VAR name="summary" --></p>
+                                        <!-- TMPL_IF NAME="author" -->
+                                            <a href="/cgi-bin/koha/catalogue/search.pl?q=au:<!-- TMPL_VAR NAME="author_nospan" ESCAPE="URL" -->" title="Search for this Author"><!-- TMPL_VAR NAME="author" --></a>
+                                        <!-- TMPL_ELSE -->
+                                            &nbsp;
+                                        <!-- /TMPL_IF -->
+                                    <p>
+                                    <!-- TMPL_UNLESS NAME="item-level_itypes" -->
+                                    <!-- TMPL_UNLESS NAME="noItemTypeImages" --><!-- TMPL_IF name="imageurl" -->
+                                    <img src="<!-- TMPL_VAR name="imageurl" -->" title="<!-- TMPL_VAR name="description" -->" style="float: left; margin: .1em;" alt="img" />
+                                    <!-- /TMPL_IF --><!-- /TMPL_UNLESS -->
+                                    <!-- /TMPL_UNLESS -->
+                                    <!-- TMPL_VAR name="summary" --></p>
                                 <!-- TMPL_ELSE -->
                                     <p>
                                     <!-- TMPL_UNLESS NAME="item-level_itypes" -->
@@ -280,12 +291,14 @@ $(window).load(function() {
                                         <!-- TMPL_ELSE -->
                                             &nbsp;
                                         <!-- /TMPL_IF -->
-                                        <!-- TMPL_IF name="publicationyear" --> - <!-- TMPL_VAR name="publicationyear" --><!-- /TMPL_IF -->
-                                        <!-- TMPL_IF name="publishercode" -->- <!-- TMPL_VAR name="publishercode" --><!-- /TMPL_IF -->
+                                        
+                                        <!-- TMPL_IF name="publishercode" --><!-- TMPL_VAR name="publishercode" --><!-- /TMPL_IF -->
                                         Description: 
                                         <!-- TMPL_IF name="place" --> ; <!-- TMPL_VAR name="place" --><!-- /TMPL_IF -->
-                                        <!-- TMPL_IF name="pages" --> - <!-- TMPL_VAR name="pages" --><!-- /TMPL_IF -->
-                                        <!-- TMPL_IF name="size" --> ; <!-- TMPL_VAR name="size" --><!-- /TMPL_IF -->
+                                                                               <!-- TMPL_IF name="publicationyear" -->, <!-- TMPL_VAR name="publicationyear" -->
+                                                                               <!-- TMPL_ELSIF name="copyrightdate"-->, <!-- TMPL_VAR name="copyrightdate" --><!-- /TMPL_IF -->
+                                        <!-- TMPL_IF name="pages" -->: <!-- TMPL_VAR name="pages" --><!-- /TMPL_IF -->
+                                        <!-- TMPL_IF name="size" --> ; <!-- TMPL_VAR name="size" --><!-- /TMPL_IF --> <!-- TMPL_IF NAME="isbn" -->ISBN: <!-- TMPL_VAR NAME="isbn" --><!-- /TMPL_IF -->
                                         <!-- TMPL_VAR name="description" -->
                                         <!-- TMPL_IF name="timestamp" --> <i>(modified on <!-- TMPL_VAR name="timestamp" -->)</i><!-- /TMPL_IF -->
                                         <!-- TMPL_IF name="cn_class" -->[<a href="/cgi-bin/koha/catalogue/search.pl?q=callnum:<!-- TMPL_VAR NAME="cn_class" ESCAPE="URL" -->"><!-- TMPL_VAR NAME="cn_class" --></a>]<!-- /TMPL_IF -->