@@ -, +, @@ first patch - catalogue/advsearch.tt - catalogue/detail.tt - catalogue/results.tt - reserve/request.tt - virtualshelves/shelves.tt - opac-advsearch.tt - opac-detail.tt - opac-readingrecord.tt - opac-reserve.tt - opac-results-grouped.tt - opac-shelves.tt - opac-user.tt --- 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(-) --- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/advsearch.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/advsearch.tt @@ -1,3 +1,4 @@ +[% USE Koha %] [% USE Branches %] [% INCLUDE 'doc-head-open.inc' %]
[% END %] -[% UNLESS ( item_level_itypes ) %] | [% IF ( noItemTypeImages ) %][% XISBN.description %][% ELSE %][% END %] | [% END %] +[% UNLESS ( item_level_itypes ) %][% IF noItemTypeImages && Koha.Preference('ItemTypeText') %][% XISBN.description %][% ELSE %][% END %] | [% 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 %]
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tt
+++ a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tt
@@ -554,7 +554,7 @@ var holdForPatron = function () {
[% IF !noItemTypeImages && SEARCH_RESULT.imageurl %]
[% 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 %] --- a/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt +++ a/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 %] |
[% END %]
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tt
+++ a/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tt
@@ -445,7 +445,7 @@ function placeHold () {
[% END %]
[% UNLESS ( item_level_itypes ) %]- [% UNLESS ( noItemTypeImages || !itemsloo.imageurl ) %][% END %][% itemsloo.description %] + [% UNLESS ( noItemTypeImages || !itemsloo.imageurl ) %][% END %][% IF ( Koha.Preference('ItemTypeText') ) %][% itemsloo.description %][% END %] | [% END %]
[% IF ( itemsloo.XSLTBloc ) %]
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-advsearch.tt
+++ a/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 %]
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-detail.tt
+++ a/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 ) %]
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-readingrecord.tt
+++ a/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 %] |
+ [% issue.translated_description %][% END %]
+
Call number:
[% issue.itemcallnumber %]
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-reserve.tt
+++ a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-reserve.tt
@@ -193,7 +193,7 @@
|
[% END %]
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-results-grouped.tt
+++ a/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 %]
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-shelves.tt +++ a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-shelves.tt @@ -296,7 +296,7 @@ [% UNLESS ( noItemTypeImages ) %] [% END %] - [% itemsloo.description %] + [% IF ( Koha.Preference('ItemTypeText') ) %][% itemsloo.description %][% END %] | [% END %]--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt +++ a/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 ) %] - [% END %] [% ISSUE.description %] + [% END %][% IF ( Koha.Preference('ItemTypeText') ) %][% ISSUE.description %][% END %] | [% END %] [% IF ( show_barcode ) %] @@ -509,7 +509,7 @@ Using this account is not recommended because some parts of Koha will not functi[% IF ( OVERDUE.imageurl ) %] - [% END %] [% OVERDUE.description %] + [% END %] [% IF ( Koha.Preference('ItemTypeText') ) %][% OVERDUE.description %][% END %] | [% END %] [% IF ( show_barcode ) %] --