From f9757b84bd4cc5a51c133daea5ec38c6956538a3 Mon Sep 17 00:00:00 2001
From: Lucas Gass <lucas@bywatersolutions.com>
Date: Mon, 24 Oct 2022 22:17:08 +0000
Subject: [PATCH] Bug 31910: Fix list and add page-section to
 request-article.tt

To test:
1. Apply patch
2. Look at article request form and ensure the fields and labels look good.
3. Ensure there are no more bullet points on the list.
4. Make sure the page-section div around the item selection looks good.

Signed-off-by: David Nind <david@davidnind.com>
---
 .../prog/en/modules/circ/request-article.tt   | 106 +++++++++---------
 1 file changed, 54 insertions(+), 52 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/request-article.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/request-article.tt
index 047b31ea22..94a0cf2e04 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/request-article.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/request-article.tt
@@ -124,7 +124,7 @@
 
                                 <fieldset class="rows">
                                     <legend>Place article request from [% biblio.title | html %] for [% patron.firstname | html %] [% patron.surname | html %] ( [% patron.cardnumber | html %] )</legend>
-                                    <ul>
+                                    <ol>
                                         <li>
                                             <label for="title">Title:</label>
                                             <input type="text" name="title" id="title" size="50"/>
@@ -190,67 +190,69 @@
                                                 [% END %]
                                             </select>
                                         </li>
-                                    </ul>
+                                    </ol>
                                 </fieldset>
 
                                 [% SET article_request_type = biblio.article_request_type( patron ) %]
                                 [% IF article_request_type != 'bib_only' %]
-                                    <table id="current-requests-table" class="ar-table table table-bordered table-striped">
-                                        <caption>Select item:</caption>
-                                        <thead>
-                                            <tr>
-                                                <th>&nbsp;</th>
-                                                <th>Item type</th>
-                                                <th>Barcode</th>
-                                                <th>Home library</th>
-                                                <th>Call number</th>
-                                                <th>Enumeration</th>
-                                            </tr>
-                                        </thead>
-
-                                        <tbody>
-                                            [% FOREACH item IN biblio.items %]
-                                                [% IF item.can_article_request( patron ) %]
+                                    <div class="page-section">
+                                        <table id="current-requests-table" class="ar-table table table-bordered table-striped">
+                                            <caption>Select item:</caption>
+                                            <thead>
+                                                <tr>
+                                                    <th>&nbsp;</th>
+                                                    <th>Item type</th>
+                                                    <th>Barcode</th>
+                                                    <th>Home library</th>
+                                                    <th>Call number</th>
+                                                    <th>Enumeration</th>
+                                                </tr>
+                                            </thead>
+
+                                            <tbody>
+                                                [% FOREACH item IN biblio.items %]
+                                                    [% IF item.can_article_request( patron ) %]
+                                                        <tr>
+                                                            <td>
+                                                                [% IF article_request_type == 'item_only' && !checked %]
+                                                                    [% SET checked = 1 %]
+                                                                    <input type="radio" name="itemnumber" value="[% item.itemnumber | html %]" checked="checked" />
+                                                                [% ELSE %]
+                                                                    <input type="radio" name="itemnumber" value="[% item.itemnumber | html %]" />
+                                                                [% END %]
+                                                            </td>
+                                                            <td>
+                                                                [% ItemTypes.GetDescription( item.itype ) | html %]
+                                                            </td>
+                                                            <td>
+                                                                [% item.barcode | html %]
+                                                            </td>
+                                                            <td>
+                                                                [% Branches.GetName( item.homebranch ) | html %]
+                                                            </td>
+                                                            <td>
+                                                                [% item.itemcallnumber | html %]
+                                                            </td>
+                                                            <td>
+                                                                [% item.enumchron | html %]
+                                                            </td>
+                                                        </tr>
+                                                    [% END %]
+                                                [% END %]
+
+                                                [% IF article_request_type != 'item_only' %]
                                                     <tr>
                                                         <td>
-                                                            [% IF article_request_type == 'item_only' && !checked %]
-                                                                [% SET checked = 1 %]
-                                                                <input type="radio" name="itemnumber" value="[% item.itemnumber | html %]" checked="checked" />
-                                                            [% ELSE %]
-                                                                <input type="radio" name="itemnumber" value="[% item.itemnumber | html %]" />
-                                                            [% END %]
+                                                            <input type="radio" name="itemnumber" value="" checked="checked"/>
                                                         </td>
-                                                        <td>
-                                                            [% ItemTypes.GetDescription( item.itype ) | html %]
-                                                        </td>
-                                                        <td>
-                                                            [% item.barcode | html %]
-                                                        </td>
-                                                        <td>
-                                                            [% Branches.GetName( item.homebranch ) | html %]
-                                                        </td>
-                                                        <td>
-                                                            [% item.itemcallnumber | html %]
-                                                        </td>
-                                                        <td>
-                                                            [% item.enumchron | html %]
+                                                        <td colspan="5">
+                                                            Any item
                                                         </td>
                                                     </tr>
                                                 [% END %]
-                                            [% END %]
-
-                                            [% IF article_request_type != 'item_only' %]
-                                                <tr>
-                                                    <td>
-                                                        <input type="radio" name="itemnumber" value="" checked="checked"/>
-                                                    </td>
-                                                    <td colspan="5">
-                                                        Any item
-                                                    </td>
-                                                </tr>
-                                            [% END %]
-                                        </tbody>
-                                    </table>
+                                            </tbody>
+                                        </table>
+                                    </div><!-- /.page-section -->
                                 [% END %]
 
                                 <p>
-- 
2.30.2