From 0b041b32c392e8c43af8d2c144542a06419bc259 Mon Sep 17 00:00:00 2001
From: Nick Clemens <nick@bywatersolutions.com>
Date: Fri, 13 Dec 2019 14:24:33 +0000
Subject: [PATCH] Bug 24240: Move form closing tag outside of conditional

To test:
1 - Create a public list
2 - View the list as a user not signed in
3 - Validate the HTML, note the div closed with open elements, and a form tag unclosed
4 - Apply patch
5 - Those errors are fixed

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>

Signed-off-by: Joy Nelson <joy@bywatersolutions.com>
(cherry picked from commit 1d57597e7334e6e183bbad1aa01c6eb9ff44f306)

Signed-off-by: Lucas Gass <lucas@bywatersolutions.com>
(cherry picked from commit c2afcb9a75d1689d79b27cd6608d63be5288f0bd)
Signed-off-by: Hayley Mapley <hayleymapley@catalyst.net.nz>
---
 koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-shelves.tt | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-shelves.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-shelves.tt
index 92109b8108..9d1fd3fa4a 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-shelves.tt
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-shelves.tt
@@ -539,15 +539,14 @@
                         <input type="hidden" name="shelfnumber" value="[% shelf.shelfnumber | html %]" />
                         <input type="hidden" name="modifyshelfcontents" value="1" />
                         <input type="submit" value="Remove selected items" id="remove-selected" class="btn btn-danger"/>
-                        </form>
                     [% ELSIF !itemsloop && can_manage_shelf %]
                         <form method="post" action="opac-shelves.pl">
                         <input type="hidden" name="op" value="delete" />
                         <input type="hidden" name="referer" value="list" />
                         <input type="hidden" name="shelfnumber" value="[% shelf.shelfnumber | html %]"/>
                         <input type="submit" class="btn btn-danger" value="Delete this list" onclick="return confirmDelete(MSG_CONFIRM_DELETE_LIST)" />
-                        </form>
                     [% END %]
+                            </form> <!-- / myform -->
 
                     [% IF op == 'add_form' OR op == 'edit_form' %]
                         <form method="post" action="/cgi-bin/koha/opac-shelves.pl">
-- 
2.39.5