From 3c5843b1564cc2f1cab2c6bb8be7556b51730631 Mon Sep 17 00:00:00 2001
From: Owen Leonard <oleonard@myacpl.org>
Date: Thu, 15 Jun 2017 12:32:43 +0000
Subject: [PATCH] Bug 18799: XSLTresultsdisplay hides the icons

If item-level_itypes is turned off and XSLTResultsDisplay is turned on,
biblio-level itemtype images are not shown in staff client search
results. This patch corrects the problem.

This patch also adds some markup and CSS to the itemtype image to make
it look a litte cleaner and work better in result sets in which some
titles have images and some don't.

To test, apply the patch and view the staff client search results page
with various settings:

- XSLT turned on and off
- item-level_itypes turned on and off
- noItemTypeImages turned on and off

Confirm that item type images are shown or not shown correctly according
to each setting.

The difference between this patch and the other patch currently on this
bug is that this patch continues the practice of hiding biblio-level
itemtype information when item-level_itypes is ON.

Signed-off-by: Victor Grousset <victor.grousset@biblibre.com>

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
---
 .../intranet-tmpl/prog/css/staff-global.css   | 14 +++++++++++
 .../prog/en/modules/catalogue/results.tt      | 25 ++++++++-----------
 2 files changed, 25 insertions(+), 14 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/css/staff-global.css b/koha-tmpl/intranet-tmpl/prog/css/staff-global.css
index f68945a773..00cddb34d3 100644
--- a/koha-tmpl/intranet-tmpl/prog/css/staff-global.css
+++ b/koha-tmpl/intranet-tmpl/prog/css/staff-global.css
@@ -3289,3 +3289,17 @@ span.name {
     font-weight: bold;
     font-style: italic;
 }
+
+.result-biblio-itemtype {
+    float: right;
+    padding: .5em;
+    margin: .5em;
+    font-size: 85%;
+    text-align: center;
+}
+
+.result-biblio-itemtype img {
+    display: block;
+    margin: auto;
+    margin-bottom: 2px;
+}
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 127bd8c9a8..d5aabeab18 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tt
@@ -383,6 +383,16 @@
                                 <input type="checkbox" class="selection" id="bib[% SEARCH_RESULT.biblionumber %]" name="biblionumber" value="[% SEARCH_RESULT.biblionumber %]" style="display:none" />
                             </td>
                             <td>
+
+                                [% UNLESS ( item_level_itypes ) %]
+                                    <div class="result-biblio-itemtype">
+                                        [% IF !noItemTypeImages && SEARCH_RESULT.imageurl %]
+                                            <img src="[% SEARCH_RESULT.imageurl %]" alt="[% SEARCH_RESULT.description %]" />
+                                        [% END %]
+                                        [% SEARCH_RESULT.description %]
+                                    </div>
+                                [% END %]
+
 			    [% IF ( SEARCH_RESULT.XSLTResultsRecord ) %]
                 [% SEARCH_RESULT.result_number %].
 				[% SEARCH_RESULT.XSLTResultsRecord %]
@@ -403,22 +413,9 @@
                                         [% ELSE %]
                                             &nbsp;
                                         [% END %]
-                                    <p>
-                                    [% UNLESS ( item_level_itypes ) %]
-                                    [% 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>
+                                    <p>[% SEARCH_RESULT.summary %]</p>
                                 [% ELSE %]
                                     <p>
-                                    [% UNLESS ( item_level_itypes ) %]
-                                    [% IF !noItemTypeImages && SEARCH_RESULT.imageurl %]
-                                    <img src="[% SEARCH_RESULT.imageurl %]" title="[% SEARCH_RESULT.description %]" style="float: left; margin: .1em;" alt="" />
-                                    [% END %]
-                                    [% END %]
-
                                         [% IF ( SEARCH_RESULT.author ) %]
                                             <a href="/cgi-bin/koha/catalogue/search.pl?idx=au&amp;q=[% SEARCH_RESULT.author |url %]" title="Search for this Author">[% SEARCH_RESULT.author %]</a>
                                         [% ELSE %]
-- 
2.39.5