From 96b7c3c77e92ed3fc6b03ffd5c1a6be4155da507 Mon Sep 17 00:00:00 2001 From: Aleisha Amohia <aleishaamohia@hotmail.com> Date: Fri, 28 Apr 2017 01:41:09 +0000 Subject: [PATCH] [SIGNED OFF] Bug 7960: [FOLLOW-UP] Adding to places missed in first patch This patch adds the use of the syspref to: = STAFF CLIENT = - catalogue/advsearch.tt - catalogue/detail.tt - catalogue/results.tt - reserve/request.tt - virtualshelves/shelves.tt = OPAC = - opac-advsearch.tt - opac-detail.tt - opac-readingrecord.tt - opac-reserve.tt - opac-results-grouped.tt - opac-shelves.tt - opac-user.tt Sponsored-by: Catalyst IT Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de> --- koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/advsearch.tt | 3 ++- koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt | 2 +- koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tt | 10 +++++----- koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt | 2 +- .../intranet-tmpl/prog/en/modules/virtualshelves/shelves.tt | 2 +- koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-advsearch.tt | 2 +- koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-detail.tt | 2 ++ koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-readingrecord.tt | 4 +++- koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-reserve.tt | 4 ++-- .../opac-tmpl/bootstrap/en/modules/opac-results-grouped.tt | 2 +- koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-shelves.tt | 2 +- koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt | 4 ++-- 12 files changed, 22 insertions(+), 17 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/advsearch.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/advsearch.tt index 6a7e045..83e5ebd 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/advsearch.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/advsearch.tt @@ -1,3 +1,4 @@ +[% USE Koha %] [% USE Branches %] [% INCLUDE 'doc-head-open.inc' %] <title>Koha › Catalog › Advanced search</title> @@ -135,7 +136,7 @@ <tr> [% FOREACH itemtypeloo IN advsearchloo.code_loop %] <td><input type="checkbox" id="[% itemtypeloo.ccl FILTER remove(',') %]-[% itemtypeloo.number %]" name="limit" value="mc-[% itemtypeloo.ccl %]:[% itemtypeloo.code %]"/><label for="[% itemtypeloo.ccl FILTER remove(',') %]-[% itemtypeloo.number %]">[% UNLESS ( noItemTypeImages ) %][% IF ( itemtypeloo.imageurl ) %]<img src="[% itemtypeloo.imageurl %]" alt="[% itemtypeloo.description %]" />[% END %] [% END %] - [% itemtypeloo.description %]</label></td> + [% IF ( Koha.Preference('ItemTypeText') ) %][% itemtypeloo.description %][% END %]</label></td> [% IF ( loop.last ) %]</tr>[% ELSE %][% UNLESS ( loop.count % 5 ) %]</tr><tr>[% END %][% END %] [% END %] </table> diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt index fe1f57c..20434c5 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt @@ -1046,7 +1046,7 @@ function verify_images() { <div id="editions"><h4>Editions</h4> <table> [% FOREACH XISBN IN XISBNS %]<tr>[% IF ( AmazonCoverImages ) %]<td><a href="http://www.amazon.com/gp/reader/[% XISBN.normalized_isbn %]/ref=sib_dp_pt/002-7879865-0184864#reader-link"><img src="https://images-na.ssl-images-amazon.com/images/P/[% XISBN.normalized_isbn %].01._AA75_PU_PU-5_.jpg" /></a></td>[% END %] -[% UNLESS ( item_level_itypes ) %]<td>[% IF ( noItemTypeImages ) %][% XISBN.description %][% ELSE %]<img src="[% XISBN.imageurl %]" alt="[% XISBN.description %]" title="[% XISBN.description %]">[% END %]</td>[% END %] +[% UNLESS ( item_level_itypes ) %]<td>[% IF noItemTypeImages && Koha.Preference('ItemTypeText') %][% XISBN.description %][% ELSE %]<img src="[% XISBN.imageurl %]" alt="[% XISBN.description %]" title="[% XISBN.description %]">[% END %]</td>[% END %] <td><a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% XISBN.biblionumber %]">[% XISBN.title |html %]</a> by [% XISBN.author | html %] ©[% XISBN.copyrightdate %] [% IF ( XISBN.publishercode ) %] [% XISBN.publishercode %] [% IF ( XISBN.place ) %]([% XISBN.place %])[% END %] [% IF ( XISBN.publicationyear ) %], [% XISBN.publicationyear %][% END %] [% IF ( XISBN.editionstatement ) %][% XISBN.editionstatement %][% END %] [% IF ( XISBN.editionresponsability ) %][% XISBN.editionresponsability %][% END %] 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 e035200..0277a57 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tt @@ -554,7 +554,7 @@ var holdForPatron = function () { [% 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 %] + [% IF ( Koha.Preference('ItemTypeText') ) %][% SEARCH_RESULT.description %][% END %] [% END %] [% SEARCH_RESULT.summary %]</p> [% ELSE %] @@ -576,7 +576,7 @@ var holdForPatron = function () { [% IF ( SEARCH_RESULT.edition ) %]<span class="results_edition">Edition: [% SEARCH_RESULT.edition %]</span>[% END %] <span class="results_physicaldesc">[% IF ( SEARCH_RESULT.pages ) %]: [% SEARCH_RESULT.pages %][% END %] [% IF ( SEARCH_RESULT.size ) %] ; [% SEARCH_RESULT.size %][% END %]</span> [% IF ( SEARCH_RESULT.isbn ) %]<span class="results_isbn">ISBN: [% SEARCH_RESULT.isbn | replace('\s\|', ', ')%]</span>[% END %] - <span class="results_itemtype">[% SEARCH_RESULT.description %]</span> + [% IF ( Koha.Preference('ItemTypeText') ) %]<span class="results_itemtype">[% SEARCH_RESULT.description %]</span>[% END %] [% IF ( SEARCH_RESULT.timestamp ) %] <i>(modified on [% SEARCH_RESULT.timestamp %])</i>[% END %] [% IF ( SEARCH_RESULT.cn_class ) %][<a href="/cgi-bin/koha/catalogue/search.pl?idx=callnum&q=%22[% SEARCH_RESULT.cn_class |uri %]%22">[% SEARCH_RESULT.cn_class %]</a>][% END %] </p> @@ -649,7 +649,7 @@ var holdForPatron = function () { [% 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&q=%22[% available_items_loo.itemcallnumber |uri %]%22">[% available_items_loo.itemcallnumber %]</a>][% END %] ([% available_items_loo.count %]) - [% IF item_level_itypes && available_items_loo.description %] + [% IF item_level_itypes && available_items_loo.description && Koha.Preference('ItemTypeText') %] <br/>[% available_items_loo.description %] [% END %] </li> @@ -671,7 +671,7 @@ var holdForPatron = function () { [% 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&q=%22[% onloan_items_loo.itemcallnumber |uri %]%22">[% 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 | $KohaDates %] - [% IF item_level_itypes && onloan_items_loo.description %] + [% IF item_level_itypes && onloan_items_loo.description && Koha.Preference('ItemTypeText') %] <br/>[% onloan_items_loo.description %] [% END %] </li> @@ -699,7 +699,7 @@ var holdForPatron = function () { [% IF ( other_items_loo.onhold ) %](On hold)[% END %] [% IF ( other_items_loo.notforloan ) %][% other_items_loo.notforloan %][% END %] ([% other_items_loo.count %]) - [% IF item_level_itypes && other_items_loo.description %] + [% IF item_level_itypes && other_items_loo.description && Koha.Preference('ItemTypeText') %] <br/>[% other_items_loo.description %] [% END %] </li> diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt index 34a7304..144b30a 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt @@ -527,7 +527,7 @@ function checkMultiHold() { [% UNLESS ( noItemTypeImages ) %] [% IF ( itemloo.imageurl ) %]<img src="[% itemloo.imageurl %]" alt="" /> <br /> [% END %] [% END %] - [% itemloo.itypename %] + [% IF ( Koha.Preference('ItemTypeText') ) %][% itemloo.itypename %][% END %] </td> [% END %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tt index 2044754..1104e83 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tt @@ -445,7 +445,7 @@ function placeHold () { </td> [% END %] [% UNLESS ( item_level_itypes ) %]<td> - [% UNLESS ( noItemTypeImages || !itemsloo.imageurl ) %]<img src="[% itemsloo.imageurl %]" alt="[% itemsloo.description %]" title="[% itemsloo.description %]" />[% END %][% itemsloo.description %] + [% UNLESS ( noItemTypeImages || !itemsloo.imageurl ) %]<img src="[% itemsloo.imageurl %]" alt="[% itemsloo.description %]" title="[% itemsloo.description %]" />[% END %][% IF ( Koha.Preference('ItemTypeText') ) %][% itemsloo.description %][% END %] </td>[% END %] <td> [% IF ( itemsloo.XSLTBloc ) %] diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-advsearch.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-advsearch.tt index d1d9b25..3df2b4e 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-advsearch.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-advsearch.tt @@ -148,7 +148,7 @@ [% END %] [% END %] - [% itemtypeloo.description %] + [% IF ( Koha.Preference('ItemTypeText') ) %][% itemtypeloo.description %][% END %] </label> </div> [% IF ( loop.last ) %]</div>[% ELSE %][% UNLESS ( loop.count % 4 ) %]</div><div class="row-fluid">[% END %][% END %] 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 b6b569e..d43b217 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-detail.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-detail.tt @@ -321,6 +321,7 @@ [% IF ( imgeurl ) %] <img src="[% imageurl %]" alt="" /> [% END %] + [% IF ( Koha.Preference('ItemTypeText') ) %] <span class="results_summary itemtype"><span class="label">Item type: </span> [% IF ( description ) %] [% description %] @@ -328,6 +329,7 @@ [% itemtype %] [% END %] </span> + [% END %] [% END %] [% IF ( MARCURLS ) %] diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-readingrecord.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-readingrecord.tt index 86b0923..c2dfcb0 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-readingrecord.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-readingrecord.tt @@ -136,8 +136,10 @@ <img src="[% issue.imageurl %]" alt="" /> [% END %] [% END %] + [% IF ( Koha.Preference('ItemTypeText') ) %] <span class="tdlabel">Item type:</span> - [% issue.translated_description %]</td> + [% issue.translated_description %][% END %] + </td> <td> <span class="tdlabel">Call number:</span> [% issue.itemcallnumber %] diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-reserve.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-reserve.tt index 0f2f4eb..278befe 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-reserve.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-reserve.tt @@ -193,7 +193,7 @@ <li class="itype"> <span class="label">Item type: </span> [% IF ( bibitemloo.imageurl ) %]<img src="[% bibitemloo.imageurl %]" alt="" />[% END %] - [% bibitemloo.translated_description %] + [% IF ( Koha.Preference('ItemTypeText') ) %][% bibitemloo.translated_description %][% END %] </li> [% END %] @@ -357,7 +357,7 @@ <img src="[% itemLoo.imageurl %]" alt="" /> [% END %] [% END %] - [% itemLoo.translated_description %] + [% IF ( Koha.Preference('ItemTypeText') ) %][% itemLoo.translated_description %][% END %] </td> [% END %] diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-results-grouped.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-results-grouped.tt index 8595f9a..e6fb95b 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-results-grouped.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-results-grouped.tt @@ -165,7 +165,7 @@ href="/cgi-bin/koha/opac-rss.pl?[% query_cgi %][% limit_cgi |html %]" /> <img src="[% GROUP_RESULT.imageurl %]" title="[% GROUP_RESULT.description %]" /> [% END %] [% END %] - [% GROUP_RESULT.description %] + [% IF ( Koha.Preference('ItemTypeText') ) %][% GROUP_RESULT.description %][% END %] [% END %] </td> <td> diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-shelves.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-shelves.tt index 0e20fcf..e467f98 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-shelves.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-shelves.tt @@ -296,7 +296,7 @@ [% UNLESS ( noItemTypeImages ) %] <img src="[% itemsloo.imageurl %]" alt="[% itemsloo.description %]" title="[% itemsloo.description %]" /> [% END %] - [% itemsloo.description %] + [% IF ( Koha.Preference('ItemTypeText') ) %][% itemsloo.description %][% END %] </td> [% END %] <td> diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt index cded80d..0e0655a 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt @@ -256,7 +256,7 @@ Using this account is not recommended because some parts of Koha will not functi <span class="tdlabel">Item type:</span> [% IF ( ISSUE.imageurl ) %] <img src="[% ISSUE.imageurl %]" title="[% ISSUE.description %]" alt="[% ISSUE.description %]" /> - [% END %] [% ISSUE.description %] + [% END %][% IF ( Koha.Preference('ItemTypeText') ) %][% ISSUE.description %][% END %] </td> [% END %] [% IF ( show_barcode ) %] @@ -509,7 +509,7 @@ Using this account is not recommended because some parts of Koha will not functi <td> [% IF ( OVERDUE.imageurl ) %] <img src="[% OVERDUE.imageurl %]" title="[% OVERDUE.description %]" alt="[% OVERDUE.description %]" /> - [% END %] [% OVERDUE.description %] + [% END %] [% IF ( Koha.Preference('ItemTypeText') ) %][% OVERDUE.description %][% END %] </td> [% END %] [% IF ( show_barcode ) %] -- 2.7.4