From 70f7d801b7337445aa26c63455813b1990edcc90 Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Mon, 29 Oct 2018 12:32:58 +0000 Subject: [PATCH] Bug 21628: (follow-up) Indentation and filter corrections This patch modifies the new waiting_holds.inc to fix the indentation. A template variable filter has been added to quiet QA tool warnings. Buttons are now styled as Bootstrap buttons. To test, apply the patch and view the holds report. Confirm that everything looks correct. Validate the HTML and confirm that there are no errors in the HTML of the body of the page. Followed test plan, everything looked correct and no HTML errors on waitingreserves.tt found by HTML validator Signed-off-by: Alex Buckley Signed-off-by: Josef Moravec Signed-off-by: Nick Clemens --- .../prog/en/includes/waiting_holds.inc | 107 ++++++++++-------- 1 file changed, 58 insertions(+), 49 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/waiting_holds.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/waiting_holds.inc index b5b74c053d..edfea09515 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/waiting_holds.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/waiting_holds.inc @@ -1,51 +1,60 @@ [% USE ItemTypes %] - - - - - - - - - - - - - -[% FOREACH reserveloo IN reserveloop %] - - - - - - - - - - - - -[% END %] +
Waiting sinceDate hold placedTitlePatronHome branchCurrent locationCall numberCopy numberEnumerationAction
[% reserveloo.waitingdate | $KohaDates %][% reserveloo.reservedate | $KohaDates %][% INCLUDE 'biblio-default-view.inc' biblionumber = reserveloo.biblionumber %] - [% reserveloo.biblio.title | html %] [% FOREACH subtitl IN reserveloo.biblio.subtitles %] [% subtitl.subfield | html %][% END %] - - [% UNLESS ( item_level_itypes ) %][% IF ( ItemTypes.GetDescription(reserveloo.item.effective_itemtype) ) %]  ([% ItemTypes.GetDescription(reserveloo.item.effective_itemtype) | html %])[% END %][% END %] -
Barcode: [% reserveloo.item.barcode | html %] -
[% reserveloo.borrower.surname | html %], [% reserveloo.borrower.firstname | html %] - [% IF ( reserveloo.borrower.phone ) %]
[% reserveloo.borrower.phone | html %][% END %] - [% IF ( reserveloo.borrower.first_valid_email_address ) %]
- [% reserveloo.borrower.first_valid_email_address | html %][% END %] -
[% Branches.GetName( reserveloo.item.homebranch ) | html %][% Branches.GetName( reserveloo.item.holdingbranch ) | html %][% reserveloo.item.itemcallnumber | html %][% reserveloo.item.copynumber | html %][% reserveloo.item.enumchron | html %] -
- - - - - - [% IF ( reserveloo.item.homebranch != reserveloo.item.holdingbranch ) %] - - [% ELSE %] - - [% END %] -
-
+ + + + + + + + + + + + + + + + [% FOREACH reserveloo IN reserveloop %] + + + + + + + + + + + + + [% END %] +
Waiting sinceDate hold placedTitlePatronHome branchCurrent locationCall numberCopy numberEnumerationAction
[% reserveloo.waitingdate | $KohaDates %][% reserveloo.reservedate | $KohaDates %][% INCLUDE 'biblio-default-view.inc' biblionumber = reserveloo.biblionumber %] + [% reserveloo.biblio.title | html %] [% FOREACH subtitl IN reserveloo.biblio.subtitles %] [% subtitl.subfield | html %][% END %] + + [% UNLESS ( item_level_itypes ) %] + [% IF ( ItemTypes.GetDescription(reserveloo.item.effective_itemtype) ) %]  ([% ItemTypes.GetDescription(reserveloo.item.effective_itemtype) | html %]) + [% END %] + [% END %] +
Barcode: [% reserveloo.item.barcode | html %] +
[% reserveloo.borrower.surname | html %], [% reserveloo.borrower.firstname | html %] + [% IF ( reserveloo.borrower.phone ) %]
[% reserveloo.borrower.phone | html %][% END %] + [% IF ( reserveloo.borrower.first_valid_email_address ) %] +
+ [% reserveloo.borrower.first_valid_email_address | html %] + [% END %] +
[% Branches.GetName( reserveloo.item.homebranch ) | html %][% Branches.GetName( reserveloo.item.holdingbranch ) | html %][% reserveloo.item.itemcallnumber | html %][% reserveloo.item.copynumber | html %][% reserveloo.item.enumchron | html %] +
+ + + + + + [% IF ( reserveloo.item.homebranch != reserveloo.item.holdingbranch ) %] + + [% ELSE %] + + [% END %] +
+
-- 2.39.5