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 ce9bff3939..fe2b35da26 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-detail.tt
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-detail.tt
@@ -628,84 +628,86 @@
There are [% subscriptionsnumber | html %] subscription(s) associated with this title.
[% FOREACH subscription IN subscriptions %]
- [% IF ( subscription.branchcode ) %]
-
[% IF ( subscription.branchcode ) %]
-
At library: [% subscription.branchcode | html %]
- [% END %]
- [% END %]
- [% IF ( subscription.closed ) %]
-
This subscription is closed.
- [% END %]
- [% IF ( subscription.location ) %]
-
Location: [% AuthorisedValues.GetByCode( 'LOC', subscription.location, 1 ) | html %]
- [% END %]
- [% IF ( subscription.callnumber ) %]
-
Call number: [% subscription.callnumber | html %]
- [% END %]
- [% IF ( subscription.subscriptionnotes ) %]
-
[% subscription.subscriptionnotes | html | html_line_break %]
- [% END %]
-
Subscription from: [% subscription.histstartdate | $KohaDates %] to:[% IF ( subscription.histenddate ) %] [% subscription.histenddate | $KohaDates %] [% ELSE %] now (current)[% END %]
- [% IF ( subscription.letter ) %]
-
- [% IF ( loggedinusername ) %]
- [% IF ( subscription.hasalert ) %]
- You have subscribed to email notification on new issues. Cancel email notification
- [% ELSE %]
- Subscribe to email notification on new issues
- [% END %]
- [% ELSE %]
- You must log in if you want to subscribe to email notification on new issues
+ At library: [% Branches.GetName( subscription.branchcode ) | html %]
+ [% ELSE %]
+ [% IF ( subscription.branchcode ) %]
+ At library: [% subscription.branchcode | html %]
[% END %]
-
- [% END %]
- [% IF ( subscription.missinglist ) %]
-
Missing issues: [% subscription.missinglist | html | html_line_break %]
- [% END %]
- [% IF ( subscription.opacnote ) %]
-
[% subscription.opacnote | html | html_line_break %]
- [% END %]
- [% IF ( subscription.latestserials ) %]
-
The [% subscription.opacdisplaycount | html %] latest issues for this subscription:
-
- Latest serials
-
-
- | Issue # |
- Publication date |
- Received date |
- Status |
- Note |
-
-
-
- [% FOREACH latestserial IN subscription.latestserials %]
+ [% END %]
+ [% IF ( subscription.closed ) %]
+ This subscription is closed.
+ [% END %]
+ [% IF ( subscription.location ) %]
+ Location: [% AuthorisedValues.GetByCode( 'LOC', subscription.location, 1 ) | html %]
+ [% END %]
+ [% IF ( subscription.callnumber ) %]
+
Call number: [% subscription.callnumber | html %]
+ [% END %]
+ [% IF ( subscription.subscriptionnotes ) %]
+ [% subscription.subscriptionnotes | html | html_line_break %]
+ [% END %]
+ Subscription from: [% subscription.histstartdate | $KohaDates %] to:[% IF ( subscription.histenddate ) %] [% subscription.histenddate | $KohaDates %] [% ELSE %] now (current)[% END %]
+ [% IF ( subscription.letter ) %]
+
+ [% IF ( loggedinusername ) %]
+ [% IF ( subscription.hasalert ) %]
+ You have subscribed to email notification on new issues. Cancel email notification
+ [% ELSE %]
+ Subscribe to email notification on new issues
+ [% END %]
+ [% ELSE %]
+ You must log in if you want to subscribe to email notification on new issues
+ [% END %]
+
+ [% END %]
+ [% IF ( subscription.missinglist ) %]
+ Missing issues: [% subscription.missinglist | html | html_line_break %]
+ [% END %]
+ [% IF ( subscription.opacnote ) %]
+ [% subscription.opacnote | html | html_line_break %]
+ [% END %]
+ [% IF ( subscription.latestserials ) %]
+ The [% subscription.opacdisplaycount | html %] latest issues for this subscription:
+
+ Latest serials
+
- | [% latestserial.serialseq | html %] |
- [% latestserial.publisheddate | $KohaDates %] |
- [% latestserial.planneddate | $KohaDates %] |
-
- [% IF (latestserial.status1 ) %]Expected[% END %]
- [% IF (latestserial.status2 ) %]Arrived[% END %]
- [% IF (latestserial.status3 ) %]Late[% END %]
- [% IF (latestserial.status4 ) %]Missing[% END %]
- [% IF (latestserial.status41 ) %]Missing (never received)[% END %]
- [% IF (latestserial.status42 ) %]Missing (sold out)[% END %]
- [% IF (latestserial.status43 ) %]Missing (damaged)[% END %]
- [% IF (latestserial.status44 ) %]Missing (lost)[% END %]
- [% IF (latestserial.status5 ) %]Not issued[% END %]
- [% IF (latestserial.status6 ) %]Delete[% END %]
- [% IF (latestserial.status7 ) %]Claimed[% END %]
- [% IF (latestserial.status8 ) %]Stopped[% END %]
- |
- [% latestserial.notes | html %] |
+ Issue # |
+ Publication date |
+ Received date |
+ Status |
+ Note |
- [% END # / FOREACH latestserials %]
-
-
- [% END # / IF subscription.latestserials %]
+
+
+ [% FOREACH latestserial IN subscription.latestserials %]
+
+ | [% latestserial.serialseq | html %] |
+ [% latestserial.publisheddate | $KohaDates %] |
+ [% latestserial.planneddate | $KohaDates %] |
+
+ [% IF (latestserial.status1 ) %]Expected[% END %]
+ [% IF (latestserial.status2 ) %]Arrived[% END %]
+ [% IF (latestserial.status3 ) %]Late[% END %]
+ [% IF (latestserial.status4 ) %]Missing[% END %]
+ [% IF (latestserial.status41 ) %]Missing (never received)[% END %]
+ [% IF (latestserial.status42 ) %]Missing (sold out)[% END %]
+ [% IF (latestserial.status43 ) %]Missing (damaged)[% END %]
+ [% IF (latestserial.status44 ) %]Missing (lost)[% END %]
+ [% IF (latestserial.status5 ) %]Not issued[% END %]
+ [% IF (latestserial.status6 ) %]Delete[% END %]
+ [% IF (latestserial.status7 ) %]Claimed[% END %]
+ [% IF (latestserial.status8 ) %]Stopped[% END %]
+ |
+ [% latestserial.notes | html %] |
+
+ [% END # / FOREACH latestserials %]
+
+
+ [% END # / IF subscription.latestserials %]
+
[% END # / FOREACH subscriptions %]