bug_7140: Added item description to complement icon to search result and biblio detai...
[koha_gimpoz] / koha-tmpl / intranet-tmpl / prog / en / modules / catalogue / results.tt
index 1931227..7830902 100644 (file)
@@ -1,7 +1,6 @@
 [% INCLUDE 'doc-head-open.inc' %]
 <title>Koha &rsaquo; Catalog &rsaquo; [% IF ( searchdesc ) %]Results of Search [% IF ( query_desc ) %]for '[% query_desc | html %]'[% END %][% IF ( limit_desc ) %]&nbsp;with limit(s):&nbsp;'[% limit_desc | html %]'[% END %][% ELSE %]You did not specify any search criteria[% END %]</title>
 [% INCLUDE 'doc-head-close.inc' %]
-<script type="text/javascript" src="/intranet-tmpl/prog/en/lib/jquery/plugins/jquery.highlight-3.js"></script>
 <script type="text/javascript">
 //<![CDATA[
 var MSG_NO_ITEM_SELECTED = _("Nothing is selected.");
@@ -86,6 +85,7 @@ $(".addtocart").show();
     $("#selection_ops").show();
     $(".selection").show();
     [% IF ( query_desc ) %]
+    toHighlight = $("p,span.results_summary,a.title");
         var query_desc = "[% query_desc |replace("'", "\'") |replace('"', '\"') |replace('\n', '\\n') |replace('\r', '\\r') %]";
         q_array = query_desc.split(" ");
         highlightOn();
@@ -94,17 +94,18 @@ $(".addtocart").show();
     [% END %]
 });
 
-function highlightOff() {
-    $("p").removeHighlight();
+
+[% IF ( query_desc ) %]function highlightOff() {
+    toHighlight.removeHighlight();
     $(".highlight_toggle").toggle();
 }
 function highlightOn() {
     var x;
     for (x in q_array) {
-        $("p").highlight(q_array[x]);
+        toHighlight.highlight(q_array[x]);
     }
     $(".highlight_toggle").toggle();
-}
+}[% END %]
 
 function selectAll () {
     $(".selection").attr("checked", "checked");
@@ -453,6 +454,10 @@ YAHOO.util.Event.onContentReady("searchheader", function () {
                                 <input type="checkbox" class="selection" id="bib[% SEARCH_RESULT.biblionumber %]" name="biblionumber" value="[% SEARCH_RESULT.biblionumber %]" style="display:none" />
                             </td>
                             <td>
+                           [% IF ( SEARCH_RESULT.XSLTResultsRecord ) %]
+                [% SEARCH_RESULT.result_number %].
+                               [% SEARCH_RESULT.XSLTResultsRecord %]
+                           [% ELSE %]
                                 <p>[% SEARCH_RESULT.result_number %].
                                  [% biblionumber = SEARCH_RESULT.biblionumber %]
 
@@ -470,17 +475,18 @@ YAHOO.util.Event.onContentReady("searchheader", function () {
                                         [% END %]
                                     <p>
                                     [% UNLESS ( item_level_itypes ) %]
-                                    [% UNLESS ( noItemTypeImages ) %][% IF ( SEARCH_RESULT.imageurl ) %]
-                                    <img src="[% SEARCH_RESULT.imageurl %]" title="[% SEARCH_RESULT.description %]" style="float: left; margin: .1em;" alt="" />
-                                    [% END %][% END %]
+                                    [% IF !noItemTypeImages && SEARCH_RESULT.imageurl %]
+                                    <img src="[% SEARCH_RESULT.imageurl %]" title="[% SEARCH_RESULT.description %]" style="float: left; margin: .1em;" alt="[% SEARCH_RESULT.description %]" />
+                                    [% END %]
+                                    [% SEARCH_RESULT.description %]
                                     [% END %]
                                     [% SEARCH_RESULT.summary %]</p>
                                 [% ELSE %]
                                     <p>
                                     [% UNLESS ( item_level_itypes ) %]
-                                    [% UNLESS ( noItemTypeImages ) %][% IF ( SEARCH_RESULT.imageurl ) %]
+                                    [% IF !noItemTypeImages && SEARCH_RESULT.imageurl %]
                                     <img src="[% SEARCH_RESULT.imageurl %]" title="[% SEARCH_RESULT.description %]" style="float: left; margin: .1em;" alt="" />
-                                    [% END %][% END %]
+                                    [% END %]
                                     [% END %]
 
                                         [% IF ( SEARCH_RESULT.author ) %]
@@ -509,6 +515,7 @@ YAHOO.util.Event.onContentReady("searchheader", function () {
                                 [% END %]
 
                                 [% END %]
+                                [% END %]
                                   <p class="hold">[% IF ( SEARCH_RESULT.norequests ) %]
                                   <span class="noholdstext">No holds allowed</span>
                               [% ELSE %]
@@ -531,41 +538,56 @@ YAHOO.util.Event.onContentReady("searchheader", function () {
                                     <ul>
                                     [% FOREACH available_items_loo IN SEARCH_RESULT.available_items_loop %]
 
-                                        [% IF ( noItemTypeImages ) %]<li>[% ELSE %][% IF ( item_level_itypes ) %][% IF ( available_items_loo.imageurl ) %]<li style="list-style: none; list-style-type: none;"><img src="[% available_items_loo.imageurl %]" title="[% available_items_loo.description %]" alt="[% available_items_loo.description %]" />[% ELSE %]<li>[% END %][% ELSE %]<li>[% END %][% END %]
+                                        [% IF item_level_itypes && !noItemTypeImages && available_items_loo.imageurl %]
+                                        <li style="list-style: none; list-style-type: none;">
+                                          <img src="[% available_items_loo.imageurl %]" title="[% available_items_loo.description %]" alt="[% available_items_loo.description %]" />
+                                        [% ELSE %]
+                                        <li>
+                                        [% END %]
                                         [% IF ( available_items_loo.branchname ) %][% available_items_loo.branchname %][% END %]
                                         [% IF ( available_items_loo.location ) %][% available_items_loo.location %][% END %]
                                         [% IF ( available_items_loo.itemcallnumber ) %][<a href="/cgi-bin/koha/catalogue/search.pl?idx=callnum&amp;q=[% available_items_loo.itemcallnumber |url %]">[% available_items_loo.itemcallnumber %]</a>][% END %]
-                                        ([% available_items_loo.count %])</li>
-                                    [% END %]</ul>
+                                        ([% available_items_loo.count %])
+                                        [% IF item_level_itypes && available_items_loo.description %]
+                                        <br/>[% available_items_loo.description %]
+                                        [% END %]
+                                        </li>
+                                    [% END %]
+                                    </ul>
                                     [% END %]
 
                                    [% IF ( SEARCH_RESULT.onloancount ) %]
                                    <span class="status">[% SEARCH_RESULT.onloancount %] on loan:</span>
                                     <ul>
                                     [% FOREACH onloan_items_loo IN SEARCH_RESULT.onloan_items_loop %]
-                                       [% IF ( noItemTypeImages ) %]<li>[% ELSE %][% IF ( item_level_itypes ) %]
-                                        [% IF ( onloan_items_loo.imageurl ) %]
-                                        <li style="list-style: none; list-style-type: none;"><img src="[% onloan_items_loo.imageurl %]" title="[% onloan_items_loo.description %]" alt="[% onloan_items_loo.description %]" />
-                                        [% ELSE %]<li>[% END %]
-                                        [% ELSE %]<li>[% END %][% END %]
-
+                                        [% IF item_level_itypes && !noItemTypeImages && onloan_items_loo.imageurl %]
+                                        <li style="list-style: none; list-style-type: none;">
+                                          <img src="[% onloan_items_loo.imageurl %]" title="[% onloan_items_loo.description %]" alt="[% onloan_items_loo.description %]" />
+                                        [% ELSE %]
+                                        <li>
+                                        [% END %]
                                         [% IF ( onloan_items_loo.branchname ) %][% onloan_items_loo.branchname %][% END %]
                                         [% IF ( onloan_items_loo.location ) %][% onloan_items_loo.location %][% END %]
                                         [% IF ( onloan_items_loo.itemcallnumber ) %][<a href="/cgi-bin/koha/catalogue/search.pl?idx=callnum&amp;q=[% onloan_items_loo.itemcallnumber |url %]">[% onloan_items_loo.itemcallnumber %]</a>][% END %]
-                                        ([% onloan_items_loo.count %][% IF ( onloan_items_loo.longoverdue ) %], [% onloan_items_loo.longoverdue %] long overdue[% END %]) date due: [% onloan_items_loo.due_date %]</li>
-                                    [% END %]</ul>
+                                        ([% onloan_items_loo.count %][% IF ( onloan_items_loo.longoverdue ) %], [% onloan_items_loo.longoverdue %] long overdue[% END %]) date due: [% onloan_items_loo.due_date %]
+                                        [% IF item_level_itypes && onloan_items_loo.description %]
+                                        <br/>[% onloan_items_loo.description %]
+                                        [% END %]
+                                        </li>
+                                    [% END %]
+                                    </ul>
                                     [% END %]
 
                                     [% IF ( SEARCH_RESULT.othercount ) %]
                                     <span class="unavailable">[% SEARCH_RESULT.othercount %] unavailable:</span>
                                     <ul>
                                     [% FOREACH other_items_loo IN SEARCH_RESULT.other_items_loop %]
-                                        [% IF ( noItemTypeImages ) %]<li>[% ELSE %][% IF ( item_level_itypes ) %]
-                                        [% IF ( other_items_loo.imageurl ) %]
-                                        <li style="list-style: none; list-style-type: none;"><img src="[% other_items_loo.imageurl %]" title="[% other_items_loo.description %]" alt="[% other_items_loo.description %]" />
-                                        [% ELSE %]<li>[% END %]
-                                        [% ELSE %]<li>[% END %][% END %]
-
+                                        [% IF item_level_itypes && !noItemTypeImages && other_items_loo.imageurl %]
+                                        <li style="list-style: none; list-style-type: none;">
+                                          <img src="[% other_items_loo.imageurl %]" title="[% other_items_loo.description %]" alt="[% other_items_loo.description %]" />
+                                        [% ELSE %]
+                                        <li>
+                                        [% END %]
                                         [% IF ( other_items_loo.branchname ) %][% other_items_loo.branchname %][% END %]
                                         [% IF ( other_items_loo.location ) %][% other_items_loo.location %][% END %]
                                         [% IF ( other_items_loo.itemcallnumber ) %][<a href="/cgi-bin/koha/catalogue/search.pl?idx=callnum&amp;q=[% other_items_loo.itemcallnumber |url %]">[% other_items_loo.itemcallnumber %]</a>][% END %]
@@ -575,8 +597,13 @@ YAHOO.util.Event.onContentReady("searchheader", function () {
                                         [% IF ( other_items_loo.intransit ) %](In transit)[% END %]
                                         [% IF ( other_items_loo.onhold ) %](On hold)[% END %]
                                         [% IF ( other_items_loo.notforloan ) %][% other_items_loo.notforloan %][% END %]
-                                        ([% other_items_loo.count %])</li>
-                                    [% END %]</ul>
+                                        ([% other_items_loo.count %])
+                                        [% IF item_level_itypes && other_items_loo.description %]
+                                        <br/>[% other_items_loo.description %]
+                                        [% END %]
+                                        </li>
+                                    [% END %]
+                                    </ul>
                                     [% END %]
                                     [% ELSE %]
                                     [% IF ( SEARCH_RESULT.ALTERNATEHOLDINGS.count ) %]