projects / koha.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
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
index 57963ab..3609e26 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tmpl
@@ -67,8 +67,6 @@ $(window).load(function() {
                     <!-- TMPL_LOOP NAME="LIMIT_INPUTS"-->
                     <input type="hidden" name="<!-- TMPL_VAR NAME="input_name" -->" value="<!-- TMPL_VAR NAME="input_value" -->"/>
                     <!-- /TMPL_LOOP -->
-
-
                 <!-- /TMPL_IF -->
                 <!-- RE-SORT START -->
                     <label for="sort_by">Sort By: </label>
@@ -76,11 +74,12 @@ $(window).load(function() {
                     <!-- TMPL_INCLUDE NAME="resort_form.inc" -->
                     </select>
                     <input type="submit" value="Go" />
-                    <!-- RESORT END -->
-                </form>
-    <h3>
-        <!-- TMPL_VAR NAME="total" --> result(s) found <!-- TMPL_IF NAME="query_desc" -->for <span style="font-weight: bold;">'<!-- TMPL_VAR NAME="query_desc" -->'</span><!-- /TMPL_IF --><!-- TMPL_IF NAME="limit_desc" -->&nbsp;with limit(s): <span style="font-weight: bold;">'<!-- TMPL_VAR NAME="limit_desc" -->'</span><!-- /TMPL_IF --><!-- TMPL_IF NAME="LibraryName" --> in <!-- TMPL_VAR NAME="LibraryName" --> Catalog<!-- /TMPL_IF -->.
-    </h3></div>
+                <!-- RESORT END -->
+            </form>
+            <h3>
+                <!-- TMPL_VAR NAME="total" --> result(s) found <!-- TMPL_IF NAME="query_desc" -->for <span style="font-weight: bold;">'<!-- TMPL_VAR NAME="query_desc" -->'</span><!-- /TMPL_IF --><!-- TMPL_IF NAME="limit_desc" -->&nbsp;with limit(s): <span style="font-weight: bold;">'<!-- TMPL_VAR NAME="limit_desc" -->'</span><!-- /TMPL_IF --><!-- TMPL_IF NAME="LibraryName" --> in <!-- TMPL_VAR NAME="LibraryName" --> Catalog<!-- /TMPL_IF -->.<br />&nbsp;
+            </h3>
+        </div>
     <!-- TMPL_IF NAME="stopwords_removed" --><div><p class="tip">Ignored the following common words: "<!-- TMPL_VAR NAME="stopwords_removed" -->"<p></div><!-- /TMPL_IF -->
     <!-- TMPL_ELSE -->
         <!-- TMPL_IF NAME="searchdesc" -->
@@ -120,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>
@@ -146,13 +145,9 @@ $(window).load(function() {
                     <th>Count</th>
                 </tr>
                 <!-- TMPL_LOOP NAME="SEARCH_RESULTS" -->
-                <!-- TMPL_IF name="even" -->
-                    <tr class="highlight">
-                <!-- TMPL_ELSE -->
-                    <tr>
-                <!-- /TMPL_IF -->
+                    <!-- TMPL_IF NAME="__odd__" --><tr><!-- TMPL_ELSE --><tr class="highlight"><!-- /TMPL_IF -->
                         <td>
-                            <a href="/cgi-bin/koha/catalogue/search.pl?q=<!-- TMPL_VAR NAME="scan_use" escape="url" -->&quot;<!-- TMPL_VAR NAME="title" -->&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" -->
@@ -246,11 +241,7 @@ $(window).load(function() {
                     </tr>
                         <!-- Actual Search Results -->
                         <!-- TMPL_LOOP NAME="SEARCH_RESULTS" -->
-                            <!-- TMPL_IF name="even" -->
-                                <tr class="highlight">
-                            <!-- TMPL_ELSE -->
-                                <tr>
-                            <!-- /TMPL_IF -->
+                         <!-- TMPL_IF NAME="__odd__" --><tr><!-- TMPL_ELSE --><tr class="highlight"><!-- /TMPL_IF -->
                             <!-- TMPL_IF NAME="AmazonContent" -->
                                 <td>
                                     <a class="p1" href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" ESCAPE="URL" -->">
@@ -264,20 +255,29 @@ $(window).load(function() {
                                             <b><!-- TMPL_VAR NAME="title" --></b>
                                         </a> <!-- TMPL_VAR NAME="subtitle" -->
 <!-- TMPL_IF name="volume" -->,<!-- TMPL_VAR name="volume" --><!-- /TMPL_IF --> <!-- TMPL_IF name="volumeddesc" -->, <!-- TMPL_VAR name="volumeddesc" --><!-- /TMPL_IF -->
-                                    <!-- TMPL_ELSE -->
-                                        <!-- TMPL_IF name="BiblioDefaultViewisbd" -->
+                                    <!-- TMPL_ELSIF NAME="BiblioDefaultViewisbd" -->
                                             <a class="title" href="/cgi-bin/koha/catalogue/ISBDdetail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" ESCAPE="URL" -->">
                                                 <!-- TMPL_VAR NAME="title" --> 
                                             </a> <!-- TMPL_VAR NAME="subtitle" --><!-- TMPL_IF name="volume" -->,<!-- TMPL_VAR name="volume" --><!-- /TMPL_IF --> <!-- TMPL_IF name="volumeddesc" -->, <!-- TMPL_VAR name="volumeddesc" --><!-- /TMPL_IF -->
-                                        <!-- TMPL_ELSE -->
+                                    <!-- TMPL_ELSE -->
                                             <a class="title" href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" ESCAPE="URL" -->">
                                                 <!-- TMPL_VAR NAME="title" --> 
                                             </a> <!-- TMPL_VAR NAME="subtitle" --><!-- TMPL_IF name="volume" -->,<!-- TMPL_VAR name="volume" --><!-- /TMPL_IF --> <!-- TMPL_IF name="volumeddesc" -->, <!-- TMPL_VAR name="volumeddesc" --><!-- /TMPL_IF -->
-                                        <!-- /TMPL_IF -->
-                                    <!-- /TMPL_IF -->
+                                                                       <!-- /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" -->
@@ -291,17 +291,28 @@ $(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/opac-search.pl?q=callnum:<!-- TMPL_VAR NAME="cn_class" ESCAPE="URL" -->"><!-- TMPL_VAR NAME="cn_class" --></a>]<!-- /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 -->
                                     </p>
                                     <p class="searchhighlightblob"><!-- TMPL_VAR NAME="searchhighlightblob" --></p>
+
+                                    <!-- TMPL_IF NAME="authorised_value_images" -->
+                                <p>
+                                  <!-- TMPL_LOOP NAME="authorised_value_images" -->
+                                  <img src="<!-- TMPL_VAR name="imageurl" -->" />
+                                  <!-- /TMPL_LOOP -->
+                                </p>
+                                <!-- /TMPL_IF -->
+                                
                                 <!-- /TMPL_IF -->
                                   <!-- TMPL_IF NAME="norequests" -->
                                         No holds allowed
@@ -310,7 +321,7 @@ $(window).load(function() {
                                     <!-- /TMPL_IF -->
                                 </td>
 
-                                <td style="white-space : nowrap"><div class="availability">
+                                <td><div class="availability">
                                     <!-- TMPL_IF NAME="items_count" --><div><!-- TMPL_VAR NAME="items_count" -->
                                     <!-- TMPL_IF NAME="itemsplural" -->items<!-- TMPL_ELSE -->item<!-- /TMPL_IF --></div>
 
@@ -352,9 +363,9 @@ $(window).load(function() {
                                     <!-- TMPL_LOOP NAME="other_items_loop" -->
                                         <!-- TMPL_IF NAME="noItemTypeImages" --><li><!-- TMPL_ELSE --><!-- TMPL_IF NAME="item-level_itypes" -->
                                         <!-- TMPL_IF name="imageurl" -->
-                                        <li style="list-style: none; list-style-type: none; background-image: url(<!-- TMPL_VAR name=imageurl -->); background-repeat: no-repeat; background-position: 0 50%; padding: 3px 0 3px 30px; margin: .4em 0;" title="<!-- TMPL_VAR name="description" -->">
+                                        <li style="list-style: none; list-style-type: none; background-image: url(<!-- TMPL_VAR name="imageurl" -->); background-repeat: no-repeat; background-position: 0 50%; padding: 3px 0 3px 30px; margin: .4em 0;" title="<!-- TMPL_VAR name="description" -->">
                                         <!-- TMPL_ELSE --><li><!-- /TMPL_IF -->
-                                        <!-- TMPL_ELSE --><li><!-- /TMPL_IF --><!-- /TMPL_IF -->                                       >
+                                        <!-- TMPL_ELSE --><li><!-- /TMPL_IF --><!-- /TMPL_IF -->
 
                                         <!-- TMPL_IF NAME="branchname" --><!-- TMPL_VAR NAME="branchname" --><!-- /TMPL_IF -->
                                         <!-- TMPL_IF NAME="location" --><!-- TMPL_VAR NAME="location" --><!-- /TMPL_IF -->
@@ -362,6 +373,7 @@ $(window).load(function() {
                                         <!-- TMPL_IF NAME="wthdrawn" -->(Withdrawn)<!-- /TMPL_IF -->
                                         <!-- TMPL_IF NAME="itemlost" -->(Lost)<!-- /TMPL_IF -->
                                         <!-- TMPL_IF NAME="damaged" -->(Damaged)<!-- /TMPL_IF -->
+                                        <!-- TMPL_IF NAME="intransit" -->(In transit)<!-- /TMPL_IF -->
                                         <!-- TMPL_IF NAME="notforloan" --><!-- TMPL_VAR name="notforloan" --><!-- /TMPL_IF -->
                                         (<!-- TMPL_VAR NAME="count" -->)</li>
                                     <!-- /TMPL_LOOP --></ul>
Koha ILS @ FFZG - based on git://git.koha.org/pub/scm/koha.git