From bcfc56438f900bbcc3b85e3eed36ec2f5e417bfb Mon Sep 17 00:00:00 2001 From: Aleisha Amohia Date: Sun, 1 Jul 2018 23:33:07 +0000 Subject: [PATCH] Bug 7960: Add class to item type descriptions so they can be hidden with CSS This patch adds the class "itypetext" around item type descriptions so they can easily be hidden with CSS. To test: 1. Navigate to the pages listed below to confirm that the text descriptions do show. 2. Add .itypetext { display:none; } to IntranetUserCSS and OPACUserCSS system preferences and save. 3. Go back to the pages listed below and confirm that the text descriptions DO NOT show. = 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: Charles Farmer --- .../intranet-tmpl/prog/en/modules/catalogue/advsearch.tt | 2 +- koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt | 3 ++- koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tt | 12 ++++++++++-- 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 | 4 ++-- .../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 | 2 +- 12 files changed, 25 insertions(+), 16 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 e6a143f..3eac9a6 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/advsearch.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/advsearch.tt @@ -121,7 +121,7 @@ [% FOREACH itemtypeloo IN advsearchloo.code_loop %] + [% itemtypeloo.description | html %] [% 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 bfab772..d51c1a0 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt @@ -414,6 +414,7 @@ ([% item.publisheddate | $KohaDates %]) [% END %] [% END %] + [% item.translated_description | html %] [% END %] @@ -793,7 +794,7 @@

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 84bfc52..c3df76b 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tt @@ -212,7 +212,7 @@ [% END %] [% UNLESS ( item_level_itypes ) %][% END %] [% END %] [% IF ( OpacLocationBranchToDisplay == 'holding' || OpacLocationBranchToDisplay == 'both' ) %] 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 d03d5185..65ccbf4 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-readingrecord.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-readingrecord.tt @@ -151,8 +151,8 @@ [% END %] [% END %] - Item type: - [% issue.translated_description | html %] + Item type: + [% issue.translated_description | html %] [% 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 a5ee7ff..b6c80cc 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 @@ -171,7 +171,7 @@ [% END %] [% END %] - [% GROUP_RESULT.description | html %] + [% GROUP_RESULT.description | html %] [% END %] [% END %] [% END %] [% IF ( show_barcode ) %] -- 2.7.4
[% IF ( noItemTypeImages ) %][% XISBN.description | html %][% ELSE %][% XISBN.description | html %][% END %][% IF ( noItemTypeImages ) %][% XISBN.description | html %][% ELSE %][% XISBN.description | html %][% END %][% XISBN.title | html %] by [% XISBN.author | html %] ©[% XISBN.copyrightdate | html %] [% IF ( XISBN.publishercode ) %] [% XISBN.publishercode | html %] [% IF ( XISBN.place ) %]([% XISBN.place | html %])[% END %] [% IF ( XISBN.publicationyear ) %], [% XISBN.publicationyear | html %][% END %] [% IF ( XISBN.editionstatement ) %][% XISBN.editionstatement | html %][% END %] [% IF ( XISBN.editionresponsibility ) %][% XISBN.editionresponsibility | html %][% 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 e264573..8cf0f1f 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tt @@ -396,7 +396,7 @@ [% IF !noItemTypeImages && SEARCH_RESULT.imageurl %] [% SEARCH_RESULT.description | html %] [% END %] - [% SEARCH_RESULT.description | html %] + [% SEARCH_RESULT.description | html %] [% END %] @@ -512,7 +512,7 @@ [% IF ( available_items_loo.itemcallnumber ) %][[% available_items_loo.itemcallnumber | html %]][% END %] ([% available_items_loo.count | html %]) [% IF item_level_itypes && available_items_loo.description %] -
[% available_items_loo.description | html %] +
[% available_items_loo.description | html %] [% END %] [% END %] @@ -534,7 +534,11 @@ [% IF ( onloan_items_loo.itemcallnumber ) %][[% onloan_items_loo.itemcallnumber | html %]][% END %] ([% onloan_items_loo.count | html %][% IF ( onloan_items_loo.longoverdue ) %], [% onloan_items_loo.longoverdue | html %] long overdue[% END %]) date due: [% onloan_items_loo.due_date | $KohaDates %] [% IF item_level_itypes && onloan_items_loo.description %] +<<<<<<< HEAD
[% onloan_items_loo.description | html %] +======= +
[% onloan_items_loo.description %] +>>>>>>> Bug 7960: Add class to item type descriptions so they can be hidden with CSS [% END %] [% END %] @@ -562,7 +566,11 @@ [% IF ( other_items_loo.notforloan ) %][% other_items_loo.notforloan | html %][% END %] ([% other_items_loo.count | html %]) [% IF item_level_itypes && other_items_loo.description %] +<<<<<<< HEAD
[% other_items_loo.description | html %] +======= +
[% other_items_loo.description %] +>>>>>>> Bug 7960: Add class to item type descriptions so they can be hidden with CSS [% END %] [% 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 9ed0bd8..a452c62 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt @@ -352,7 +352,7 @@ [% UNLESS ( noItemTypeImages ) %] [% IF ( itemloo.imageurl ) %]
[% END %] [% END %] - [% itemloo.itypename | html %] + [% itemloo.itypename | html %] 		- [% UNLESS ( noItemTypeImages || !itemsloo.imageurl ) %][% itemsloo.description | html %][% END %][% itemsloo.description | html %] + [% UNLESS ( noItemTypeImages || !itemsloo.imageurl ) %][% itemsloo.description | html %][% END %][% itemsloo.description | html %] [% 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 1d7aada..5ed5562 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-advsearch.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-advsearch.tt @@ -151,7 +151,7 @@ [% END %]   [% END %] - [% itemtypeloo.description | html %] + [% itemtypeloo.description | html %] [% 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 955a2f4..9da7c2f 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-detail.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-detail.tt @@ -327,7 +327,7 @@ [% IF ( imgeurl ) %] [% END %] - Item type: + Item type: [% IF ( description ) %] [% description | html %] [% ELSE %] @@ -1230,7 +1230,7 @@ [% ITEM_RESULT.description | html %] [% END %] [% END %] - [% ITEM_RESULT.description | html %] + [% ITEM_RESULT.description | html %]
Call number: [% issue.itemcallnumber | html %] 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 d4c4d68..81da70e 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-reserve.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-reserve.tt @@ -201,7 +201,7 @@
  • Item type: [% IF ( bibitemloo.imageurl ) %][% END %] - [% bibitemloo.translated_description | html %] + [% bibitemloo.translated_description | html %]
    • [% END %] @@ -368,7 +368,7 @@ [% END %] [% END %] - [% itemLoo.translated_description | html %] + [% itemLoo.translated_description | html %]     		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 581adfd..81d2b2d 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-shelves.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-shelves.tt @@ -299,7 +299,7 @@ [% UNLESS ( noItemTypeImages ) %] [% itemsloo.description | html %] [% END %] - [% itemsloo.description | html %] + [% itemsloo.description | html %] 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 7af3a0f..8468c94 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt @@ -274,7 +274,7 @@ Item type: [% IF ( ISSUE.imageurl ) %] [% ISSUE.description | html %] - [% END %] [% ISSUE.description | html %] + [% END %] [% ISSUE.description | html %]