From f62b4e0aef2ebb37b73e6f357793db8a943c6add Mon Sep 17 00:00:00 2001
From: Lucas Gass <lucas@bywatersolutions.com>
Date: Mon, 24 Oct 2022 22:53:24 +0000
Subject: [PATCH] Bug 31935: Fix misaligned form when adding serial
 subscription

This patch attempts to fix the misaligned form on subscription-add.tt by removing some of the wrapping <p> tags and adding labels where appropriate.

To test:
1. Add a serial subscription and notice the misaligned form on step 1.
2. Apply patch
3. Look again and confirm that the form looks better.
4. Read through everything and make sure the form still makes sense.
5. Make sure the form still works properly.

Signed-off-by: David Nind <david@davidnind.com>
---
 .../en/modules/serials/subscription-add.tt    | 25 ++++++++-----------
 1 file changed, 11 insertions(+), 14 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tt
index 7896caf808..8c3ea64a8b 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tt
@@ -107,34 +107,31 @@ fieldset.rows table { clear: none; margin: 0; }
                                     </div>
                                 </li>
                                 <li class="radio">
+                                <label for="creating_record">When receiving this serial:</label>
                                     [% IF ( serialsadditems ) %]
-                                        <p><input type="radio" id="serialsadditems-yes" name="serialsadditems" value="1" checked="checked" /><label class="widelabel" for="serialsadditems-yes"> Create an item record when receiving this serial</label></p>
-                                        <p><input type="radio" id="serialsadditems-no" name="serialsadditems" value="0" /><label class="widelabel" for="serialsadditems-no"> Do not create an item record when receiving this serial </label></p>
+                                        <input type="radio" id="serialsadditems-yes" name="serialsadditems" value="1" checked="checked" />
+                                        <label class="widelabel" for="serialsadditems-yes"> Create an item record</label>
+                                        <input type="radio" id="serialsadditems-no" name="serialsadditems" value="0" />
+                                        <label class="widelabel" for="serialsadditems-no"> Do not create an item record</label>
                                     [% ELSE %]
-                                        <p><input type="radio" id="serialsadditems-yes" name="serialsadditems" value="1"/><label class="widelabel" for="serialsadditems-yes"> Create an item record when receiving this serial</label></p>
-                                        <p><input type="radio" id="serialsadditems-no" name="serialsadditems" value="0" checked="checked" /><label class="widelabel" for="serialsadditems-no"> Do not create an item record when receiving this serial</label></p>
+                                        <input type="radio" id="serialsadditems-yes" name="serialsadditems" value="1"/>
+                                        <label class="widelabel" for="serialsadditems-yes"> Create an item record</label>
+                                        <input type="radio" id="serialsadditems-no" name="serialsadditems" value="0" checked="checked" />
+                                        <label class="widelabel" for="serialsadditems-no"> Do not create an item record</label>
                                     [% END %]
                                 </li>
                                 <li class="radio">
-                                  <p>When there is an irregular issue:</p>
+                                <label for="irregular_issue">When there is an irregular issue:</label>
                                   [% IF (skip_serialseq) %]
-                                    <p>
                                       <input type="radio" id="skip_serialseq_yes" name="skip_serialseq" value="1" checked="checked" />
                                       <label for="skip_serialseq_yes">Skip issue number</label>
-                                    </p>
-                                    <p>
                                       <input type="radio" id="skip_serialseq_no" name="skip_serialseq" value="0" />
                                       <label for="skip_serialseq_no">Keep issue number</label>
-                                    </p>
                                   [% ELSE %]
-                                    <p>
                                       <input type="radio" id="skip_serialseq_yes" name="skip_serialseq" value="1" />
                                       <label for="skip_serialseq_yes">Skip issue number</label>
-                                    </p>
-                                    <p>
                                       <input type="radio" id="skip_serialseq_no" name="skip_serialseq" value="0" checked="checked" />
                                       <label for="skip_serialseq_no">Keep issue number</label>
-                                    </p>
                                   [% END %]
                                 </li>
                                 <li>
@@ -566,7 +563,7 @@ fieldset.rows table { clear: none; margin: 0; }
                     </div>
                 </div> <!-- /.row#page_2 -->
             </form>
-        </div>
+        </div><!-- /.main -->
 
         <!-- Mana Search Result Modal -->
         <div class="modal" id="mana_search_result" tabindex="-1" role="dialog" aria-labelledby="mana_search_result_label">
-- 
2.30.2