From ed78699381a57c2cfc53b429d02e4eaf6d42b9c2 Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Tue, 17 Jan 2023 12:45:35 +0000 Subject: [PATCH] Bug 32600: Housebound module needs page-section treatment This patch adds a .page-section container to two areas in the patron homebound template. This patch contains indentation changes, so please ignore whitespace when looking at the diff. To test, apply the patch and make sure the HouseboundModule system preference is enabled. - Locate a patron and edit their record. - In the "Housebound roles" section, check both "Chooser" and "Deliverer." - Locate another patron and click on the "Housebound" menu item in the left-hand sidebar. - On the "Manage housebound profile" page, set a delivery day and frequency and save changes. - On the "Housebound details for..." page the details section at the top should be correctly styled. - Click "Add a new delivery." - Fill out some delivery details and click "Save." - Now the "Housebound details for..." page should show a "Deliveries" section which is correctly styled. Signed-off-by: Lucas Gass Signed-off-by: Katrin Fischer Signed-off-by: Tomas Cohen Arazi (cherry picked from commit 5a0dbb3cd70660e1d66ab60ac732223e3d6c6cdb) Signed-off-by: Jacob O'Mara --- .../prog/en/modules/members/housebound.tt | 91 ++++++++++--------- 1 file changed, 48 insertions(+), 43 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/housebound.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/housebound.tt index 54f0013daa..338209d4cf 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/housebound.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/housebound.tt @@ -369,51 +369,56 @@ -

Housebound details

- [% PROCESS 'homebound-details' %] - +
+

Housebound details

+ [% PROCESS 'homebound-details' %] + +
[% ELSIF ( housebound_profile ) %] - [% PROCESS 'homebound-details' %] -
- Edit -
-
-

Deliveries

- [% housebound_visits = housebound_profile.housebound_visits %] - [% IF housebound_visits.count > 0 %] - - - - - [% FOREACH entry IN housebound_visits %] - - - - - - - +
+ [% PROCESS 'homebound-details' %] +
+ Edit +
+
+ +
+

Deliveries

+ [% housebound_visits = housebound_profile.housebound_visits %] + [% IF housebound_visits.count > 0 %] +
IDDateChooserDelivererActions
[% entry.id | html %][% entry.appointment_date | $KohaDates %] ([% entry.day_segment | html %]) - - [% INCLUDE 'patron-title.inc' patron = entry.chooser invert_name = 0 %] - - - - [% INCLUDE 'patron-title.inc' patron = entry.deliverer invert_name = 0 %] - - - Edit - Delete -
+ + + + [% FOREACH entry IN housebound_visits %] + + + + + + + + [% END %] +
IDDateChooserDelivererActions
[% entry.id | html %][% entry.appointment_date | $KohaDates %] ([% entry.day_segment | html %]) + + [% INCLUDE 'patron-title.inc' patron = entry.chooser invert_name = 0 %] + + + + [% INCLUDE 'patron-title.inc' patron = entry.deliverer invert_name = 0 %] + + + Edit + Delete +
[% END %] - - [% END %] - -
+ + [% END %] -- 2.39.5