From d2994a9fa55a762d241e42099d5c0234c2033fba Mon Sep 17 00:00:00 2001
From: Owen Leonard <oleonard@myacpl.org>
Date: Tue, 25 Jul 2023 14:29:42 +0000
Subject: [PATCH] Bug 34373: Improve layout of curbside pickups items ready
 list

This patch adds fieldset + list markup around the list of titles ready
for pickup on the staff interface curbside pickup page.

- Properly testing requires testing data. You can run this command to
  REPLACE your curbside pickup data with sample data:

  bash <(curl -s https://gitlab.com/-/snippets/2572579/raw/main/test_curbside_pickups.sh)
- Apply the patch and restart services.
- Place multiple holds for a single patron and check them in to mark
  them waiting.
- Under Circulation -> Curbside pickups, click the "Schedule pickup"
  tab.
  - Search for the patron you placed the holds for.
  - When the patron information comes up, the list of items ready for
    pickup should be well-formatted.
---
 .../prog/en/modules/circ/curbside_pickups.tt  | 22 ++++++++++---------
 1 file changed, 12 insertions(+), 10 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/curbside_pickups.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/curbside_pickups.tt
index e1eec439a8c..df0cc315c38 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/curbside_pickups.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/curbside_pickups.tt
@@ -447,17 +447,19 @@
 
                                             <li>
                                                 <label>Items ready for pickup: </label>
-                                                <span>
-                                                    [% IF waiting_holds.count %]
-                                                        [% FOREACH h IN waiting_holds %]
-                                                            <p>
-                                                                <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% h.biblionumber | uri %]">[% h.biblio.title | html %]</a> ([% h.biblio.author | html %], <a href="/cgi-bin/koha/catalogue/moredetail.pl?itemnumber=[% h.itemnumber | html %]&biblionumber=[% h.biblionumber | html %]#item[% h.itemnumber | html %]">[% h.item.barcode | html %]</a>)
-                                                            </p>
+                                                <fieldset>
+                                                    <ul>
+                                                        [% IF waiting_holds.count %]
+                                                            [% FOREACH h IN waiting_holds %]
+                                                                <li>
+                                                                    <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% h.biblionumber | uri %]">[% h.biblio.title | html %]</a> ([% h.biblio.author | html %], <a href="/cgi-bin/koha/catalogue/moredetail.pl?itemnumber=[% h.itemnumber | html %]&biblionumber=[% h.biblionumber | html %]#item[% h.itemnumber | html %]">[% h.item.barcode | html %]</a>)
+                                                                </li>
+                                                            [% END %]
+                                                        [% ELSE %]
+                                                            <li>There are no waiting holds for this patron at this library.</li>
                                                         [% END %]
-                                                    [% ELSE %]
-                                                        <span>There are no waiting holds for this patron at this library.</span>
-                                                    [% END %]
-                                                </span>
+                                                    </ul>
+                                                </fieldset>
                                             </li>
 
                                             <li>
-- 
2.30.2