From 96b7c3c77e92ed3fc6b03ffd5c1a6be4155da507 Mon Sep 17 00:00:00 2001 From: Aleisha Amohia 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 --- 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' %] Koha › Catalog › Advanced search @@ -135,7 +136,7 @@ [% FOREACH itemtypeloo IN advsearchloo.code_loop %] + [% IF ( Koha.Preference('ItemTypeText') ) %][% itemtypeloo.description %][% END %] [% IF ( loop.last ) %][% ELSE %][% UNLESS ( loop.count % 5 ) %][% END %][% END %] [% END %] 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() {

Editions

[% FOREACH XISBN IN XISBNS %][% IF ( AmazonCoverImages ) %][% END %] -[% UNLESS ( item_level_itypes ) %][% END %] +[% UNLESS ( item_level_itypes ) %][% END %] [% 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 () { [% END %] [% UNLESS ( item_level_itypes ) %][% END %] + [% issue.translated_description %][% END %] + [% 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 %]" /> [% END %] [% END %] - [% GROUP_RESULT.description %] + [% IF ( Koha.Preference('ItemTypeText') ) %][% GROUP_RESULT.description %][% END %] [% END %] [% END %] [% END %] [% IF ( show_barcode ) %] @@ -509,7 +509,7 @@ Using this account is not recommended because some parts of Koha will not functi [% END %] [% IF ( show_barcode ) %] -- 2.7.4
[% IF ( noItemTypeImages ) %][% XISBN.description %][% ELSE %][% XISBN.description %][% END %][% IF noItemTypeImages && Koha.Preference('ItemTypeText') %][% XISBN.description %][% ELSE %][% XISBN.description %][% END %][% XISBN.title |html %] 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 %] [% SEARCH_RESULT.description %] [% END %] - [% SEARCH_RESULT.description %] + [% IF ( Koha.Preference('ItemTypeText') ) %][% SEARCH_RESULT.description %][% END %] [% END %] [% SEARCH_RESULT.summary %]

[% ELSE %] @@ -576,7 +576,7 @@ var holdForPatron = function () { [% IF ( SEARCH_RESULT.edition ) %]Edition: [% SEARCH_RESULT.edition %][% END %] [% IF ( SEARCH_RESULT.pages ) %]: [% SEARCH_RESULT.pages %][% END %] [% IF ( SEARCH_RESULT.size ) %] ; [% SEARCH_RESULT.size %][% END %] [% IF ( SEARCH_RESULT.isbn ) %]ISBN: [% SEARCH_RESULT.isbn | replace('\s\|', ', ')%][% END %] - [% SEARCH_RESULT.description %] + [% IF ( Koha.Preference('ItemTypeText') ) %][% SEARCH_RESULT.description %][% END %] [% IF ( SEARCH_RESULT.timestamp ) %] (modified on [% SEARCH_RESULT.timestamp %])[% END %] [% IF ( SEARCH_RESULT.cn_class ) %][[% SEARCH_RESULT.cn_class %]][% END %]

@@ -649,7 +649,7 @@ var holdForPatron = function () { [% IF ( available_items_loo.location ) %][% available_items_loo.location %][% END %] [% IF ( available_items_loo.itemcallnumber ) %][[% available_items_loo.itemcallnumber %]][% END %] ([% available_items_loo.count %]) - [% IF item_level_itypes && available_items_loo.description %] + [% IF item_level_itypes && available_items_loo.description && Koha.Preference('ItemTypeText') %]
[% available_items_loo.description %] [% END %] @@ -671,7 +671,7 @@ var holdForPatron = function () { [% IF ( onloan_items_loo.location ) %][% onloan_items_loo.location %][% END %] [% IF ( onloan_items_loo.itemcallnumber ) %][[% onloan_items_loo.itemcallnumber %]][% 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') %]
[% onloan_items_loo.description %] [% END %] @@ -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') %]
[% other_items_loo.description %] [% END %] 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 ) %]
[% END %] [% END %] - [% itemloo.itypename %] + [% IF ( Koha.Preference('ItemTypeText') ) %][% itemloo.itypename %][% END %] 		- [% UNLESS ( noItemTypeImages || !itemsloo.imageurl ) %][% itemsloo.description %][% END %][% itemsloo.description %] + [% UNLESS ( noItemTypeImages || !itemsloo.imageurl ) %][% itemsloo.description %][% END %][% IF ( Koha.Preference('ItemTypeText') ) %][% itemsloo.description %][% END %] [% 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 %] [% IF ( loop.last ) %][% ELSE %][% UNLESS ( loop.count % 4 ) %]
[% 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 ) %] [% END %] + [% IF ( Koha.Preference('ItemTypeText') ) %] Item type: [% IF ( description ) %] [% description %] @@ -328,6 +329,7 @@ [% itemtype %] [% END %] + [% 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 @@ [% END %] [% END %] + [% IF ( Koha.Preference('ItemTypeText') ) %] Item type: - [% issue.translated_description %]
 Call number: [% 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 @@
  • Item type: [% IF ( bibitemloo.imageurl ) %][% END %] - [% bibitemloo.translated_description %] + [% IF ( Koha.Preference('ItemTypeText') ) %][% bibitemloo.translated_description %][% END %]
    • [% END %] @@ -357,7 +357,7 @@ [% END %] [% END %] - [% itemLoo.translated_description %] + [% IF ( Koha.Preference('ItemTypeText') ) %][% itemLoo.translated_description %][% END %]     		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 ) %] [% itemsloo.description %] [% END %] - [% itemsloo.description %] + [% IF ( Koha.Preference('ItemTypeText') ) %][% itemsloo.description %][% END %] 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 Item type: [% IF ( ISSUE.imageurl ) %] [% ISSUE.description %] - [% END %] [% ISSUE.description %] + [% END %][% IF ( Koha.Preference('ItemTypeText') ) %][% ISSUE.description %][% END %] [% IF ( OVERDUE.imageurl ) %] [% OVERDUE.description %] - [% END %] [% OVERDUE.description %] + [% END %] [% IF ( Koha.Preference('ItemTypeText') ) %][% OVERDUE.description %][% END %]