From d813cfeb359cb71e7c721be0613a9af5affc95a9 Mon Sep 17 00:00:00 2001 From: Timothy Alexis Vass Date: Mon, 4 May 2020 16:58:02 +0200 Subject: [PATCH] Bug 25302: The indentations should be in accordance with the Coding guidelines and whitespaces/linebreaks should be consistent. To test: 1) Open an item in OPAC and see if it works. --- .../bootstrap/en/modules/opac-detail.tt | 1350 +++++++++-------- 1 file changed, 730 insertions(+), 620 deletions(-) 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 f4bcefcbe8..a177fdea16 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-detail.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-detail.tt @@ -19,19 +19,21 @@ [% ShowCourseReservesHeader = 0 %] [% IF Koha.Preference( 'UseCourseReserves' ) == 1 %] [% FOREACH ITEM_RESULT IN itemloop %] - [% IF ITEM_RESULT.course_reserves %] - [% FOREACH r IN ITEM_RESULT.course_reserves %] - [% IF r.course.enabled == 'yes' %] - [% ShowCourseReservesHeader = 1 %] - [% END %] - [% END %] + [% IF ITEM_RESULT.course_reserves %] + [% FOREACH r IN ITEM_RESULT.course_reserves %] + [% IF r.course.enabled == 'yes' %] + [% ShowCourseReservesHeader = 1 %] + [% END %] + [% END %] [% END %] [% END %] [% END %] [% INCLUDE 'doc-head-open.inc' %] -[% IF ( LibraryNameTitle ) %][% LibraryNameTitle | html %][% ELSE %]Koha online[% END %] catalog › Details for: [% INCLUDE 'biblio-title-head.inc' %] -[% INCLUDE 'doc-head-close.inc' %] + + [% IF ( LibraryNameTitle ) %][% LibraryNameTitle | html %][% ELSE %]Koha online[% END %] catalog › Details for: [% INCLUDE 'biblio-title-head.inc' %] + + [% INCLUDE 'doc-head-close.inc' %] [% Asset.css("lib/emoji-picker/css/emoji.css") | $raw %] [% IF ( Koha.Preference('OPACShowMusicalInscripts') ) %] [% Asset.css("lib/verovio/midiplayer.css") | $raw %] @@ -43,7 +45,7 @@
@@ -51,7 +53,6 @@
-
[% IF ( biblio.title ) %] [% img_title = biblio.title %] @@ -87,14 +88,18 @@ [% IF ( GoogleJackets ) %]
[% END %] + [% IF ( Koha.Preference('OpacCoce') && Koha.Preference('CoceProviders') ) %] - [% coce_id = normalized_ean || normalized_isbn | html %] -
+ [% coce_id = normalized_ean || normalized_isbn | html %] +
[% END %] + [% IF OpenLibraryCovers %]
[% END %] + [% bt_id = ( normalized_upc || normalized_isbn ) %] + [% IF ( BakerTaylorEnabled && bt_id ) %] [% IF BakerTaylorBookstoreURL %] [% IF ( OPACURLOpenInNewWindow ) %] @@ -106,6 +111,7 @@ See Baker & Taylor [% END %] [% END %] + [% IF Koha.Preference('OPACCustomCoverImages') AND Koha.Preference('CustomCoverImagesURL') %] [% IF ( OPACURLOpenInNewWindow ) %] Cover image @@ -133,14 +139,17 @@

[% INCLUDE 'biblio-title.inc' %]

[% IF ( author ) %]
by [% author | html %]
[% END %] - [% UNLESS ( item_level_itypes ) %] - [ - [% IF ( description ) %] - [% description | html %] - [% ELSE %] - [% itemtype | html %] + + [% UNLESS ( item_level_itypes ) %] + [ + [% IF ( description ) %] + [% description | html %] + [% ELSE %] + [% itemtype | html %] + [% END %] + ] [% END %] - ] [% END %] + [% IF ( unititle ) %], [% unititle | html %][% END %] @@ -151,20 +160,22 @@ [% FOREACH MARCAUTHOR_SUBFIELDS_LOO IN MARCAUTHOR.MARCAUTHOR_SUBFIELDS_LOOP %] [% MARCAUTHOR_SUBFIELDS_LOO.separator | html %] [% IF ( MARCAUTHOR.authoritylink ) %] - + [% ELSE %] - + [% END %] [% MARCAUTHOR_SUBFIELDS_LOO.value | html %] [% END %] [% IF (MARCAUTHOR.authoritylink) %] [% END %] + [% IF IDREF and MARCAUTHOR.unimarc3 %] - IdRef + IdRef [% END %] + [% UNLESS ( loop.last ) %]|[% END %] - [% END # /FOREACH MARCAUTHORS %] + [% END # / FOREACH MARCAUTHORS %]
[% END # IF MARCAUTHORS %] @@ -175,6 +186,7 @@ [% IF ( MARCSERIES_SUBFIELDS_LOO.value ) %] [% MARCSERIES_SUBFIELDS_LOO.value | html %] [% END %] + [% IF ( MARCSERIES_SUBFIELDS_LOO.volumenum ) %] . [% MARCSERIES_SUBFIELDS_LOO.volumenum | html %] [% END %] @@ -182,21 +194,24 @@ [% UNLESS ( loop.last ) %]|[% END %] [% END # / FOREACH MARCSERIES %] - [% END # /MARCSERIES %] + [% END # / MARCSERIES %] [% IF ( editionstatement ) %] Edition statement:[% editionstatement | html %][% IF ( editionresponsibility ) %]/[% editionresponsibility | html %][% END %] [% END %] + [% IF ( publishercode ) %] Published by : [% publishercode | html %] - [% IF ( place ) %]([% place | html %])[% END %] [% IF ( publicationyear ) %], [% publicationyear | html %][% END %] + + [% IF ( place ) %]([% place | html %])[% END %] + [% IF ( publicationyear ) %], [% publicationyear | html %][% END %] [% END %] [% IF ( pages ) %] - Physical details: [% pages | html %] [% illus | html %] [% size | html %] + Physical details:[% pages | html %][% illus | html %][% size | html %] [% END %] [% IF ( MARCISBNS ) %] @@ -214,8 +229,9 @@ [% IF ( collectiontitle ) %] Collection: [% collectiontitle | html %] - [% IF ( collectionissn ) %] [% ', ISSN ' _ collectionissn | html %][% END %] - [% IF ( collectionvolume ) %] [% ' ; ' _ collectionvolume | html %] [% END %] + [% IF ( collectionissn ) %][% ', ISSN ' _ collectionissn | html %][% END %] + + [% IF ( collectionvolume ) %][% ' ; ' _ collectionvolume | html %][% END %] [% END %] @@ -231,21 +247,22 @@ [% IF ( MARCSUBJCTS ) %]
Subject(s): - [% FOREACH MARCSUBJCT IN MARCSUBJCTS %] [% subjectsloop = loop %] [% FOREACH SUBFIELD IN MARCSUBJCT.MARCSUBJECT_SUBFIELDS_LOOP %] [% SUBFIELD.separator | html %] [% SUBFIELD.value | html %] [% END %] + [% IF (MARCSUBJCT.authoritylink) %] [% END %] + [% UNLESS ( loop.last ) %] | [% END %] [% END # / FOREACH MARCSUBJCTS %]
- [% ELSE # /IF MARCSUBJCTS %] - [% IF ( subjects ) %]Subject(s): [% FOREACH subject IN subjects %][% subject.subject | html %] | [% END %][% END %] + [% ELSE # / IF MARCSUBJCTS %] + [% IF ( subjects ) %]Subject(s):[% FOREACH subject IN subjects %][% subject.subject | html %] | [% END %][% END %] [% END %] [% IF ( copyrightdate ) %] @@ -269,31 +286,32 @@
Online resources:
[% END # / IF MARCURLS %] @@ -328,14 +346,15 @@ Tags from this library: [% ELSE %] - Tags from this library: No tags from this library for this title. + Tags from this library:No tags from this library for this title. [% END %] + [% IF ( TagsInputEnabled ) %] [% IF ( loggedinusername ) %]
- [% END # /IF TagsShowEnabled %] + [% END # / IF TagsShowEnabled %] [% IF ( SyndeticsEnabled ) %] [% IF ( SyndeticsSeries && SyndeticsSERIES1Exists ) %] @@ -377,7 +396,7 @@ Series information: Click to open in new window - [% END # / IF SyndeticsSeries && SyndeticsSERIES1Exists%] + [% END # / IF SyndeticsSeries && SyndeticsSERIES1Exists %] [% IF ( SyndeticsAVPROFILEExists ) %] Audiovisual profile: @@ -398,7 +417,7 @@ Click to open in new window [% END # / IF SyndeticsAwards && SyndeticsAWARDS1Exists %] - [% END # / IF SyndeticsEnabled%] + [% END # / IF SyndeticsEnabled %] [% IF ( OpacStarRatings != 'disable' ) %] @@ -412,6 +431,7 @@ [% ELSE %]