From ce41f8d4b75457b113e3482822f2636d49ec8308 Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Wed, 27 Mar 2019 12:18:41 +0000 Subject: [PATCH] Bug 21772: (follow-up) Minor markup correction and reindentation This patch makes one minor markup correction: In HTML5 must be after . Previously the opposite was true. I've also done a little bit of opinionated reindentation. There should be no changes visible to the user from this patch. --- .../bootstrap/en/includes/account-table.inc | 24 +- .../bootstrap/en/includes/holds-table.inc | 286 ++++++++++----------- 2 files changed, 155 insertions(+), 155 deletions(-) diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/includes/account-table.inc b/koha-tmpl/opac-tmpl/bootstrap/en/includes/account-table.inc index 7c37684..a73da77 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/account-table.inc +++ b/koha-tmpl/opac-tmpl/bootstrap/en/includes/account-table.inc @@ -13,18 +13,6 @@ - - - [%- IF ENABLE_OPAC_PAYMENTS -%] - [%- SET COLSPAN = 4 -%] - [%- ELSE -%] - [%- SET COLSPAN = 3 -%] - [%- END -%] - Total due - [% total | $Price %] - - - [% FOREACH ACCOUNT_LINE IN ACCOUNT_LINES %] [% IF ( ACCOUNT_LINE.odd ) %][% ELSE %][% END %] @@ -72,6 +60,18 @@ [% END %] + + + [%- IF ENABLE_OPAC_PAYMENTS -%] + [%- SET COLSPAN = 4 -%] + [%- ELSE -%] + [%- SET COLSPAN = 3 -%] + [%- END -%] + Total due + [% total | $Price %] + + + [% IF ENABLE_OPAC_PAYMENTS && DISPLAY_PAYMENT_BLOCK %] diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/includes/holds-table.inc b/koha-tmpl/opac-tmpl/bootstrap/en/includes/holds-table.inc index 5eb6efe..9673d5b 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/holds-table.inc +++ b/koha-tmpl/opac-tmpl/bootstrap/en/includes/holds-table.inc @@ -32,168 +32,168 @@ - [% FOREACH HOLD IN HOLDS %] - [% IF ( HOLD.is_waiting ) %] - [% IF ( HOLD.is_at_destination ) %] - [% IF ( HOLD.is_found ) %] - + [% FOREACH HOLD IN HOLDS %] + [% IF ( HOLD.is_waiting ) %] + [% IF ( HOLD.is_at_destination ) %] + [% IF ( HOLD.is_found ) %] + + [% ELSE %] + + [% END %] [% ELSE %] - + [% END %] [% ELSE %] - + [% END %] - [% ELSE %] - - [% END %] - - [% IF ! onlyinfo %] - - [% HOLD.biblio.title | html %] - [% FOREACH s IN HOLD.biblio.subtitles %] - [% s | html %] - [% END %] - [% HOLD.item.enumchron | html %] - - [% ELSE %] - - [% HOLD.biblio.title | html %] - [% FOREACH s IN HOLD.biblio.subtitles %] - [% s | html %] - [% END %] - [% HOLD.item.enumchron | html %] - - [% END %] - [% HOLD.biblio.author | html %] - - - - Hold date: - [% HOLD.reservedate | $KohaDates %] - - - - [% IF ! HOLD.found %] - [% IF ( HOLD.expirationdate ) %] - - Expiration: - [% HOLD.expirationdate | $KohaDates %] - + + [% IF ! onlyinfo %] + + [% HOLD.biblio.title | html %] + [% FOREACH s IN HOLD.biblio.subtitles %] + [% s | html %] + [% END %] + [% HOLD.item.enumchron | html %] + [% ELSE %] - - Expiration: - Never expires - + + [% HOLD.biblio.title | html %] + [% FOREACH s IN HOLD.biblio.subtitles %] + [% s | html %] + [% END %] + [% HOLD.item.enumchron | html %] + [% END %] - [% ELSE %] - - - [% END %] - - [% UNLESS( singleBranchMode) %] - - Pick up location: - [% HOLD.branch.branchname | html %] + [% HOLD.biblio.author | html %] - [% END %] - [% IF ( showpriority ) %] - - Priority: - [% HOLD.priority | html %] + + + Hold date: + [% HOLD.reservedate | $KohaDates %] + - [% END %] - - Status: - [% IF ( HOLD.is_waiting ) %] - [% IF ( HOLD.is_at_destination ) %] - [% IF ( HOLD.found ) %] - Item waiting at [% HOLD.branch.branchname | html %] - [% IF ( HOLD.waitingdate ) %] - since [% HOLD.waitingdate | $KohaDates %] - [% IF HOLD.expirationdate %] - until [% HOLD.expirationdate | $KohaDates %] - [% END %] - [% END %] - + + [% IF ! HOLD.found %] + [% IF ( HOLD.expirationdate ) %] + + Expiration: + [% HOLD.expirationdate | $KohaDates %] + [% ELSE %] - Item waiting to be pulled from [% Branches.GetName( HOLD.branchcode ) | html %] + + Expiration: + Never expires + [% END %] [% ELSE %] - Item in transit to [% Branches.GetName( HOLD.branchcode ) | html %] + - [% END %] - [% ELSE %] - [% IF ( HOLD.is_in_transit ) %] - [% SET transfer = HOLD.item.get_transfer %] - Item in transit from [% Branches.GetName( transfer.frombranch ) | html %] since - [% transfer.datesent | $KohaDates %] - [% ELSIF ( HOLD.suspend ) %] - Suspended [% IF ( HOLD.suspend_until ) %] until [% HOLD.suspend_until | html %] [% END %] - [% ELSE %] - [% IF HOLD.itemtype %] - Pending for next available item of item type '[% ItemTypes.GetDescription( HOLD.itemtype ) | html %]' + + [% UNLESS( singleBranchMode) %] + + Pick up location: + [% HOLD.branch.branchname | html %] + + [% END %] + [% IF ( showpriority ) %] + + Priority: + [% HOLD.priority | html %] + + [% END %] + + Status: + [% IF ( HOLD.is_waiting ) %] + [% IF ( HOLD.is_at_destination ) %] + [% IF ( HOLD.found ) %] + Item waiting at [% HOLD.branch.branchname | html %] + [% IF ( HOLD.waitingdate ) %] + since [% HOLD.waitingdate | $KohaDates %] + [% IF HOLD.expirationdate %] + until [% HOLD.expirationdate | $KohaDates %] + [% END %] + [% END %] + + [% ELSE %] + Item waiting to be pulled from [% Branches.GetName( HOLD.branchcode ) | html %] + [% END %] [% ELSE %] - Pending + Item in transit to [% Branches.GetName( HOLD.branchcode ) | html %] [% END %] - [% END %] - [% END %] - - [% IF SuspendHoldsOpac and ! onlyinfo %] - - [% IF ( HOLD.is_cancelable_from_opac ) %] - [% IF HOLD.suspend %] -
- - -
+ [% ELSE %] + [% IF ( HOLD.is_in_transit ) %] + [% SET transfer = HOLD.item.get_transfer %] + Item in transit from [% Branches.GetName( transfer.frombranch ) | html %] since + [% transfer.datesent | $KohaDates %] + [% ELSIF ( HOLD.suspend ) %] + Suspended [% IF ( HOLD.suspend_until ) %] until [% HOLD.suspend_until | html %] [% END %] [% ELSE %] - [% IF AutoResumeSuspendedHolds %] - Suspend - [% # hold suspend modal form %] - + [% IF HOLD.itemtype %] + Pending for next available item of item type '[% ItemTypes.GetDescription( HOLD.itemtype ) | html %]' [% ELSE %] + Pending + [% END %] + [% END %] + [% END %] + + [% IF SuspendHoldsOpac and ! onlyinfo %] + + [% IF ( HOLD.is_cancelable_from_opac ) %] + [% IF HOLD.suspend %]
- +
- [% END # / IF AutoResumeSuspendedHolds %] - [% END # / IF HOLD.suspend %] - [% END # / IF ( HOLD.is_cancelable_from_opac )%] - - [% END # / IF SuspendHoldsOpac %] - [% IF ! onlyinfo %] - - [% IF ( HOLD.is_cancelable_from_opac ) %] -
- - -
- [% END %] - - [% END # / IF onlyinfo %] - - [% END # /FOREACH HOLDS %] + [% ELSE %] + [% IF AutoResumeSuspendedHolds %] + Suspend + [% # hold suspend modal form %] + + [% ELSE %] +
+ + +
+ [% END # / IF AutoResumeSuspendedHolds %] + [% END # / IF HOLD.suspend %] + [% END # / IF ( HOLD.is_cancelable_from_opac )%] + + [% END # / IF SuspendHoldsOpac %] + [% IF ! onlyinfo %] + + [% IF ( HOLD.is_cancelable_from_opac ) %] +
+ + +
+ [% END %] + + [% END # / IF onlyinfo %] + + [% END # /FOREACH HOLDS %] -- 2.1.4