From b7653e20a8d93ce9b47590df24b5d1cc9cca7731 Mon Sep 17 00:00:00 2001
From: Katrin Fischer <katrin.fischer.83@web.de>
Date: Sun, 18 Oct 2020 16:30:24 +0000
Subject: [PATCH] Bug 26727: Fix <p/> appearing in the templates

The self-closing p is not valid in HTML5:

Error: Self-closing syntax (/>) used on a non-void HTML element.
Ignoring the slash and treating as a start tag.

To test:

1)
- Activate Article requests
- Search for a record to place an article request on in staff
- Look up the patron
- Verify the article request form looks ok
2)
- Search for a list of patrons
- Check 2 patrons and merge them using the button above the list
- Verify the distance between the button and the table looks ok
3)
- Create a new MARC modification template
- Create a new action
- Verify the distances between the first and second line of form
  elements looks ok
4)
- Place a hold in staff
- Click on the Suspend link in the holds table (not below)
- Verify the modal looks ok

Signed-off-by: David Nind <david@davidnind.com>
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
(cherry picked from commit bbf0d21284924d6b7529017fc78178b98242aaee)

Signed-off-by: Lucas Gass <lucas@bywatersolutions.com>
(cherry picked from commit 5643d5432906776d34ea5a13296b0f607fcae306)

Signed-off-by: Aleisha Amohia <aleishaamohia@hotmail.com>
---
 .../prog/en/modules/cataloguing/value_builder/EXAMPLE.tt        | 2 +-
 koha-tmpl/intranet-tmpl/prog/en/modules/circ/request-article.tt | 2 +-
 .../intranet-tmpl/prog/en/modules/members/merge-patrons.tt      | 2 +-
 .../prog/en/modules/tools/marc_modification_templates.tt        | 2 +-
 koha-tmpl/intranet-tmpl/prog/js/holds.js                        | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/EXAMPLE.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/EXAMPLE.tt
index 70064c887d..c2323f2c3b 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/EXAMPLE.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/EXAMPLE.tt
@@ -10,7 +10,7 @@
 <p>Hi, you are looking at the result of launching the EXAMPLE plugin.</p>
 <p>I received this from you:</p>
 <input type="text" id="received" value="[% result | html %]" disabled />
-<p/>
+</p>
 <p>I will pass back what you type here, if you press OK.</p>
 <input type="text" id="return" value="[% result | html %]" />
 <p>
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 c65582918c..7167f1892b 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
@@ -90,7 +90,7 @@
 
                                 <fieldset class="rows">
                                     <legend>Place article request from [% biblio.title | html %] for [% patron.firstname | html %] [% patron.surname | html %] ( [% patron.cardnumber | html %] )</legend>
-                                    <p/>
+                                    <p>
                                     <ul>
                                         <li>
                                             <label for="title">Title:</label>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/merge-patrons.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/merge-patrons.tt
index 94abaa34e6..2bf7794110 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/merge-patrons.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/merge-patrons.tt
@@ -85,7 +85,7 @@
                             <input type="hidden" name="id" value="[% p.id | html %]" />
                         [% END %]
 
-                        <p/>
+                        <br>
 
                         <input type="hidden" name="action" value="merge" />
                         <input id="merge-patrons" type="submit" value="Merge patrons" />
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/marc_modification_templates.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/marc_modification_templates.tt
index 37477c73b6..1630b1dc0b 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/marc_modification_templates.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/marc_modification_templates.tt
@@ -219,7 +219,7 @@
                                 </span>
                             </span>
 
-                            <p/>
+                            <br><br>
 
                             <select name="conditional" id="conditional" onchange="onConditionalChange(this);">
                                 <option value="" selected="selected" />
diff --git a/koha-tmpl/intranet-tmpl/prog/js/holds.js b/koha-tmpl/intranet-tmpl/prog/js/holds.js
index 41d47624e0..430370daaf 100644
--- a/koha-tmpl/intranet-tmpl/prog/js/holds.js
+++ b/koha-tmpl/intranet-tmpl/prog/js/holds.js
@@ -258,7 +258,7 @@ $(document).ready(function() {
                     <label for='suspend-modal-until'>" + SUSPEND_UNTIL + "</label>\
                     <input name='suspend_until' id='suspend-modal-until' class='suspend-until' size='10' />\
 \
-                    <p/><a class='btn btn-link' id='suspend-modal-clear-date' >" + CLEAR_DATE_TO_SUSPEND_INDEFINITELY + "</a></p>\
+                    <p><a class='btn btn-link' id='suspend-modal-clear-date' >" + CLEAR_DATE_TO_SUSPEND_INDEFINITELY + "</a></p>\
 \
                 </div>\
 \
-- 
2.39.5