From bcf4ff277e892595ca96a85c699e51ac08dbab6b Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Fri, 20 Jan 2023 16:59:42 +0000 Subject: [PATCH] Bug 32690: Reindent the serial collection template This patch reindents the serial collection template so that it has consistent indentation. These changes should have no visible effect on the page. To test, apply the patch and go to Serials -> Subscription detail -> Serial collection. Everything should look normal. All tabs should work correctly. Viewing the diff while ignoring whitespace changes should show only places where a line break was added. Signed-off-by: David Nind Signed-off-by: Katrin Fischer Signed-off-by: Tomas Cohen Arazi --- .../en/modules/serials/serials-collection.tt | 552 +++++++++--------- 1 file changed, 279 insertions(+), 273 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-collection.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-collection.tt index dd4191bd69..6c805c4789 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-collection.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-collection.tt @@ -15,21 +15,21 @@ [% END %] [% WRAPPER 'sub-header.inc' %] - + [% END %]
@@ -37,275 +37,281 @@
- [% INCLUDE 'modals/serials_multi_receiving.inc' %] + [% INCLUDE 'modals/serials_multi_receiving.inc' %] -[% UNLESS ( popup ) %] - [% INCLUDE 'serials-toolbar.inc' %] + [% UNLESS ( popup ) %] + [% INCLUDE 'serials-toolbar.inc' %] -

Serial collection information for [% bibliotitle | html %] - [% IF location %] ([% AuthorisedValues.GetByCode( 'LOC', location ) | html %]) [% END %] - [% IF ( callnumber ) %]callnumber: [% callnumber | html %][% END %]

-[% END %] - -[% IF ( delete ) %] -
-

You are about to delete [% serialnumber | html %] serial(s). Do you want to continue?

-
- [% IF countitems > 0 %] -
Number of items available: [% countitems | html %]
-

- -

- [% END %] - - - - [% FOREACH serialid IN serialsid %] - - [% END %] - -
-
- - -
-
-[% END %] - -[% IF ( error_delitem ) %] -
-

Error: one or more associated items could not be deleted at this time.

-
-[% END %] - -[% IF ( subscriptions ) %] - -[% IF ( subscriptions.size == 1 ) %] - -[% ELSE %] - -[% END %] - - - - - - - - - -[% FOREACH subscription IN subscriptions %] - - - - - - - - [% IF ( subscription.abouttoexpire ) || ( subscription.subscriptionexpired ) %] - -[% END %] -[% IF ( subscr ) %] -[% IF ( subscriptioncount > 1 ) %] - - -[% END %] -[% END %] -
Subscription summary Subscription summaries
Subscription num.FrequencyNumbering patternLibraryCall numberNotes 
# [% subscription.subscriptionid | html %] [% subscription.frequency.description | html %][% subscription.numberpattern.label | html %][% IF subscription.branchcode %][% Branches.GetName( subscription.branchcode ) | html %][% END %] [% subscription.callnumber | html %] [% subscription.notes | html | html_line_break %] - [% UNLESS subscription.closed %] - [% IF ( subscription.subscriptionexpired ) %] -

Subscription expired

- [% END %] - [% ELSE %] -
Subscription closed - [% END %] - 		[% ELSE %][% END %] - [% UNLESS subscription.closed %] - [% IF ( routing && CAN_user_serials_routing ) %] - [% IF ( subscription.hasRouting ) %] - Edit routing list - [% ELSE %] - Create routing list +

+ Serial collection information for [% bibliotitle | html %] + [% IF location %] ([% AuthorisedValues.GetByCode( 'LOC', location ) | html %]) [% END %] + [% IF ( callnumber ) %]callnumber: [% callnumber | html %][% END %] +

[% END %] - [% END %] - [% IF ( subscription.abouttoexpire || subscription.subscriptionexpired) %] - Renew - [% END %] - [% ELSE %] -   - [% END %] -
See any subscription attached to this biblio
-[% END %] + [% IF ( delete ) %] +
+

You are about to delete [% serialnumber | html %] serial(s). Do you want to continue?

+
+ [% IF countitems > 0 %] +
Number of items available: [% countitems | html %]
+

+ +

+ [% END %] + + + + [% FOREACH serialid IN serialsid %] + + [% END %] + +
+
+ + +
+
+ [% END %] -[% IF ( years ) %]
-
-
    - [% FOREACH year IN years %] - [% IF ( year.year ) %] - [% IF year.year == 'manage' %] -
  • Manage
    • - [% ELSE %] -
  • [% year.year | html %]
    • - [% END %] - [% END %] - [% END %] -
-
- [% FOREACH year IN years %] -
- [% IF ( CAN_user_serials_receive_serials ) %] -

-

- [% UNLESS subscription.closed %] -
- -
- [% IF ( subscriptions.size == 1 and !serialsadditems ) %]  -
+ [% IF ( error_delitem ) %] +
+

Error: one or more associated items could not be deleted at this time.

+
[% END %] - [% END %] - -

- [% END %] - - Select all - | - - Clear all - - - - - [% IF ( CAN_user_serials_receive_serials ) %][% END %] -[% IF ( subscriptions.size > 1 ) %] - -[% END %] - - - - - - - - [% IF ( routing ) %][% END %] - - - - [% FOREACH serial IN year.serials %] - - [% IF ( CAN_user_serials_receive_serials ) %] - - [% END %] - -
Edit# SubsDate published - Date published (text) - Date received - Number - Status - Notes - Library - Routing
- [% UNLESS CAN_user_serials_receive_serials %] - disabled - [% ELSE %] - [% IF ( serial.subscriptionexpired ) %] - - [% ELSE %] - [% IF ( delete ) %] - [% IF serialsid.grep("${serial.serialid}").size %] - + + [% IF ( subscriptions ) %] + + [% IF ( subscriptions.size == 1 ) %] + [% ELSE %] - + [% END %] - [% ELSE %] - [% IF serial.checked %] - - [% ELSE %] - + + + + + + + + + + [% FOREACH subscription IN subscriptions %] + + + + + + + + [% IF ( subscription.abouttoexpire ) || ( subscription.subscriptionexpired ) %] + + [% END %] - [% END %] - [% END %] - [% END %] - - [% END %] -[% IF ( subscriptions.size > 1 ) %] - -[% END %] - - - - - - - - [% IF ( routing ) %] - + [% IF ( subscr ) %] + [% IF ( subscriptioncount > 1 ) %] + + + + [% END %] + [% END %] +
Subscription summary Subscription summaries
Subscription num.FrequencyNumbering patternLibraryCall numberNotes 
# [% subscription.subscriptionid | html %] [% subscription.frequency.description | html %][% subscription.numberpattern.label | html %][% IF subscription.branchcode %][% Branches.GetName( subscription.branchcode ) | html %][% END %] [% subscription.callnumber | html %] [% subscription.notes | html | html_line_break %] + [% UNLESS subscription.closed %] + [% IF ( subscription.subscriptionexpired ) %] +

Subscription expired

+ [% END %] + [% ELSE %] +
Subscription closed + [% END %] + 		+ [% ELSE %] + + [% END %] + [% UNLESS subscription.closed %] + [% IF ( routing && CAN_user_serials_routing ) %] + [% IF ( subscription.hasRouting ) %] + Edit routing list + [% ELSE %] + Create routing list + [% END %] + [% END %] + [% IF ( subscription.abouttoexpire || subscription.subscriptionexpired) %] + Renew + [% END %] + [% ELSE %] +   + [% END %] +
[% serial.subscriptionid | html %] - [% IF serial.publisheddate %] - [% serial.publisheddate | $KohaDates %] - [% ELSE %] - Unknown - [% END %] - - [% IF serial.publisheddatetext %] - [% serial.publisheddatetext | html %] - [% END %] - - [% IF serial.planneddate %] - [% serial.planneddate | $KohaDates %] - [% ELSE %] - Unknown - [% END %] - - [% IF ( matches = serial.serialseq.match('(.*)Spring(.*)') ) %] - [% matches.0 | html %]Spring[% matches.1 | html %] - [% ELSIF ( matches = serial.serialseq.match('(.*)Summer(.*)') ) %] - [% matches.0 | html %]Summer[% matches.1 | html %] - [% ELSIF ( matches = serial.serialseq.match('(.*)Fall(.*)') ) %] - [% matches.0 | html %]Fall[% matches.1 | html %] - [% ELSIF ( matches = serial.serialseq.match('(.*)Winter(.*)') ) %] - [% matches.0 | html %]Winter[% matches.1 | html %] - [% ELSIF ( matches = prediction.number.match('(.*)Spr(.*)') ) %] - [% matches.0 | html %]Spr[% matches.1 | html %] - [% ELSIF ( matches = prediction.number.match('(.*)Sum(.*)') ) %] - [% matches.0 | html %]Sum[% matches.1 | html %] - [% ELSIF ( matches = prediction.number.match('(.*)Fal(.*)') ) %] - [% matches.0 | html %]Fal[% matches.1 | html %] - [% ELSIF ( matches = prediction.number.match('(.*)Win(.*)') ) %] - [% matches.0 | html %]Win[% matches.1 | html %] - [% ELSE %] - [% serial.serialseq | html %] - [% END %] - - [% IF ( serial.status1 ) %]Expected[% END %] - [% IF ( serial.status2 ) %]Arrived[% END %] - [% IF ( serial.status3 ) %]Late[% END %] - [% IF ( serial.status4 ) %]Missing[% END %] - [% IF ( serial.status41 ) %]Missing (never received)[% END %] - [% IF ( serial.status42 ) %]Missing (sold out)[% END %] - [% IF ( serial.status43 ) %]Missing (damaged)[% END %] - [% IF ( serial.status44 ) %]Missing (lost)[% END %] - [% IF ( serial.status5 ) %]Not issued[% END %] - [% IF ( serial.status6 ) %]Delete[% END %] - [% IF ( serial.status7 ) %]Claimed[% END %] - [% IF ( serial.status8 ) %]Stopped[% END %] - - [% serial.notes | html %] - - [% Branches.GetName( serial.branchcode ) | html %] - - Print list -
See any subscription attached to this biblio
[% END %] -
-
- [% END %] -
- -
-
-[% END %] + [% IF ( years ) %] +
+
+
    + [% FOREACH year IN years %] + [% IF ( year.year ) %] + [% IF year.year == 'manage' %] +
  • Manage
    • + [% ELSE %] +
  • [% year.year | html %]
    • + [% END %] + [% END %] + [% END %] +
+ +
+ [% FOREACH year IN years %] +
+ [% IF ( CAN_user_serials_receive_serials ) %] +

+

+ [% UNLESS subscription.closed %] +
+ +
+ [% IF ( subscriptions.size == 1 and !serialsadditems ) %]  +
+ [% END %] + [% END %] + +

+ [% END %] + + + Select all + | + + Clear all + + + + + + [% IF ( CAN_user_serials_receive_serials ) %] + + [% END %] + [% IF ( subscriptions.size > 1 ) %] + + [% END %] + + + + + + + + [% IF ( routing ) %] + + [% END %] + + + + [% FOREACH serial IN year.serials %] + + [% IF ( CAN_user_serials_receive_serials ) %] + + [% END %] + [% IF ( subscriptions.size > 1 ) %] + + [% END %] + + + + + + + + [% IF ( routing ) %] + + [% END %] + + [% END %] + +
Edit# SubsDate publishedDate published (text)Date receivedNumberStatusNotesLibraryRouting
+ [% UNLESS CAN_user_serials_receive_serials %] + disabled + [% ELSE %] + [% IF ( serial.subscriptionexpired ) %] + + [% ELSE %] + [% IF ( delete ) %] + [% IF serialsid.grep("${serial.serialid}").size %] + + [% ELSE %] + + [% END %] + [% ELSE %] + [% IF serial.checked %] + + [% ELSE %] + + [% END %] + [% END %] + [% END %] + [% END %] + [% serial.subscriptionid | html %] + [% IF serial.publisheddate %] + [% serial.publisheddate | $KohaDates %] + [% ELSE %] + Unknown + [% END %] + + [% IF serial.publisheddatetext %] + [% serial.publisheddatetext | html %] + [% END %] + + [% IF serial.planneddate %] + [% serial.planneddate | $KohaDates %] + [% ELSE %] + Unknown + [% END %] + + [% IF ( matches = serial.serialseq.match('(.*)Spring(.*)') ) %] + [% matches.0 | html %]Spring[% matches.1 | html %] + [% ELSIF ( matches = serial.serialseq.match('(.*)Summer(.*)') ) %] + [% matches.0 | html %]Summer[% matches.1 | html %] + [% ELSIF ( matches = serial.serialseq.match('(.*)Fall(.*)') ) %] + [% matches.0 | html %]Fall[% matches.1 | html %] + [% ELSIF ( matches = serial.serialseq.match('(.*)Winter(.*)') ) %] + [% matches.0 | html %]Winter[% matches.1 | html %] + [% ELSIF ( matches = prediction.number.match('(.*)Spr(.*)') ) %] + [% matches.0 | html %]Spr[% matches.1 | html %] + [% ELSIF ( matches = prediction.number.match('(.*)Sum(.*)') ) %] + [% matches.0 | html %]Sum[% matches.1 | html %] + [% ELSIF ( matches = prediction.number.match('(.*)Fal(.*)') ) %] + [% matches.0 | html %]Fal[% matches.1 | html %] + [% ELSIF ( matches = prediction.number.match('(.*)Win(.*)') ) %] + [% matches.0 | html %]Win[% matches.1 | html %] + [% ELSE %] + [% serial.serialseq | html %] + [% END %] + + [% IF ( serial.status1 ) %]Expected[% END %] + [% IF ( serial.status2 ) %]Arrived[% END %] + [% IF ( serial.status3 ) %]Late[% END %] + [% IF ( serial.status4 ) %]Missing[% END %] + [% IF ( serial.status41 ) %]Missing (never received)[% END %] + [% IF ( serial.status42 ) %]Missing (sold out)[% END %] + [% IF ( serial.status43 ) %]Missing (damaged)[% END %] + [% IF ( serial.status44 ) %]Missing (lost)[% END %] + [% IF ( serial.status5 ) %]Not issued[% END %] + [% IF ( serial.status6 ) %]Delete[% END %] + [% IF ( serial.status7 ) %]Claimed[% END %] + [% IF ( serial.status8 ) %]Stopped[% END %] + + [% serial.notes | html %] + + [% Branches.GetName( serial.branchcode ) | html %] + + Print list +
+
+ [% END %] +
+ +
+
+ [% END %]
-- 2.39.5