Bug 8732: (follow-up) Make icon show on opac details and correct pref

Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/searching.pref b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/searching.pref
index bf7c2e5..f000aa2 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/searching.pref
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/searching.pref
@@ -260,6 +260,12 @@ Searching:
                   yes: "search"
                   no: "don't search"
             - on all variations of the ISBN.
+        -
+            - pref: BiblioItemtypeInfo
+              choices:
+                  yes: "Display"
+                  no: "Don't display"
+            - " Koha record level itemtype info on detail and result pages in the OPAC and staff client. This info also displays if the item-level_itypes system preference is set to bibliographic record."
     Did you mean/spell checking:
         -
             - "Swedish service for spellchecking.<br/>"
@@ -270,9 +276,3 @@ Searching:
             - LIBRIS base URL
             - pref: LibrisURL
             - "Please only change this if you are sure it needs changing."
-        -
-            - pref: BiblioItemtypeInfo
-              choices:
-                  yes: "Display"
-                  no: "Don't display"
-            - " Koha record level itemtype info on detail and result pages in the OPAC. This info also displays if the item-level_itypes system preference is set to bibliographic record."

diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-detail.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-detail.tt
index 4cd737c..2560794 100644 (file)
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-detail.tt
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-detail.tt
@@ -246,19 +246,6 @@
                             <span class="results_summary year"><span class="label">Year: </span>[% copyrightdate | html %]</span>
                         [% END %]
 
-                        [% IF ( !item_level_itypes || Koha.Preference('BiblioItemtypeInfo') ) %]
-                            <span class="results_summary itemtype"><span class="label">Item type: </span>
-                                [% IF ( imageurl && !Koha.Preference('OpacNoItemTypeImages') ) %]
-                                    <img src="[% imageurl | html %]" alt="" />
-                                [% END %]
-                                [% IF ( description ) %]
-                                    [% description | html %]
-                                [% ELSE %]
-                                    [% itemtype | html %]
-                                [% END %]
-                            </span>
-                        [% END %]
-
                         [% IF ( MARCURLS ) %]
                             <div class="results_summary online_resources"><span class="label">Online resources:</span>
                                 <ul>
@@ -293,6 +280,19 @@
                         [% END # / IF MARCURLS %]
                     [% END # / IF OPACXSLTDetailsDisplay %]
 
+                    [% IF ( !item_level_itypes || Koha.Preference('BiblioItemtypeInfo') ) %]
+                        <span class="results_summary itemtype"><span class="label">Item type: </span>
+                            [% IF ( imageurl && !Koha.Preference('OpacNoItemTypeImages') ) %]
+                                <img src="[% imageurl | html %]" alt="" />
+                            [% END %]
+                            [% IF ( description ) %]
+                                [% description | html %]
+                            [% ELSE %]
+                                [% itemtype | html %]
+                            [% END %]
+                        </span>
+                    [% END %]
+
                     <!-- This puts the LTFL reviews in, and if TabbedView is not set, puts the remaining content above the Tabs instead of in them -->
                     [% IF ( LibraryThingForLibrariesID ) %]
                         [% UNLESS ( LibraryThingForLibrariesTabbedView ) %]