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 684a082ffa..3b56260668 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt @@ -268,7 +268,7 @@ Holdings ([% itemloop.size() || 0 | html %]) [% END %] -[% IF ( MARCNOTES || notes ) %]
  • Descriptions ([% ( MARCNOTES.size || 1 ) | html %])
  • [% END %] +[% IF ( MARCNOTES ) %]
  • Descriptions ([% ( MARCNOTES.size || 1 ) | html %])
  • [% END %] [% IF ComponentParts && ComponentParts.size %]
  • Components ([% ComponentParts.size | html %])
  • [% END %] [% IF ( subscriptionsnumber ) %]
  • Subscriptions
  • [% END %] [% IF Koha.Preference('AcquisitionDetails') %]
  • Acquisition details
  • [% END %] @@ -650,12 +650,11 @@ Note that permanent location is a code, and location may be an authval. [% END %] -[% IF ( MARCNOTES || notes ) %] +[% IF ( MARCNOTES ) %]
    -[% IF ( MARCNOTES ) %] [% FOREACH MARCNOTE IN MARCNOTES %]

    [% IF MARCNOTE.marcnote.match('^https?://\S+$') %] @@ -664,11 +663,6 @@ Note that permanent location is a code, and location may be an authval. [% MARCNOTE.marcnote | html | html_line_break %] [% END %]

    - [% END %] -[% ELSE %] - [% IF ( notes ) %] -

    [% notes | html %]

    - [% 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 52a7cec016..c226da6dd0 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-detail.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-detail.tt @@ -392,12 +392,10 @@ [% IF (SeparateHoldings) %]
  • Other holdings [% ' ( ' _ (otheritemloop.size || 0) _ ' )' | html %]
  • [% END %] - [% IF ( MARCNOTES || notes || ( SyndeticsEnabled && SyndeticsSummary && SYNDETICS_SUMMARY )) %] + [% IF ( MARCNOTES || ( SyndeticsEnabled && SyndeticsSummary && SYNDETICS_SUMMARY )) %] [% SET title_notes_count = 0 %] [% IF MARCNOTES %] [% SET title_notes_count = MARCNOTES.size %] - [% ELSIF notes %] - [% SET title_notes_count = 1 %] [% END %] [% IF SYNDETICS_SUMMARY %][% SET title_notes_count = title_notes_count + 1 %][% END %]
  • Title notes ( [% title_notes_count | html %] )
  • @@ -562,7 +560,7 @@ [% END # / SeparateHoldings %] - [% IF ( MARCNOTES || notes || ( SyndeticsEnabled && SyndeticsSummary && SYNDETICS_SUMMARY )) %] + [% IF ( MARCNOTES || ( SyndeticsEnabled && SyndeticsSummary && SYNDETICS_SUMMARY )) %]
    @@ -583,15 +581,11 @@

    [% END %]
    - [% ELSE %] - [% IF ( notes ) %] -

    [% notes | html %]

    - [% END %] [% END %]
    - [% END # / IF MARCNOTES || notes %] + [% END # / IF MARCNOTES %] [% IF ComponentParts && ComponentParts.size %]