From 093193d3a3852eddc0e9474a360c1027eb4e7006 Mon Sep 17 00:00:00 2001
From: Lucas Gass <lucas@bywatersolutions.com>
Date: Mon, 3 Jan 2022 18:07:14 +0000
Subject: [PATCH] Bug 29526: (follow-up) Put delete buttons in HTML table

Signed-off-by: Barbara Johnson <barbara.johnson@bedfordtx.gov>
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Signed-off-by: Fridolin Somers <fridolin.somers@biblibre.com>
---
 .../bootstrap/en/modules/opac-privacy.tt      | 46 ++++++++++++-------
 1 file changed, 30 insertions(+), 16 deletions(-)

diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-privacy.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-privacy.tt
index adede9145a..4e291acd73 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-privacy.tt
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-privacy.tt
@@ -154,34 +154,48 @@
 
                         <h2>Immediate deletion</h2>
 
-                        <p>Whatever your privacy rule you choose, you can delete all your checkout and hold history immediately by clicking here. <strong>BE CAREFUL</strong>. Once you've confirmed the deletion, no one can retrieve the list!</p>
+                        <p>You can delete all your checkout and hold history immediately by clicking here. <strong>BE CAREFUL</strong>. Once you've confirmed the deletion, no one can retrieve the list!</p>
 
-                        <form action="/cgi-bin/koha/opac-privacy.pl" method="post" id="opac-privacy-delete-form">
-                            <legend class="sr-only">Checkout history deletion</legend>
+                        <form action="/cgi-bin/koha/opac-privacy.pl" method="post" id="opac-privacy-delete-checkouts">
                             <input type="hidden" name="op" value="delete_record" />
                             <input type="hidden" name="checkouts" value="1" />
-                            <fieldset class="action">
-                                <input type="submit" value="Checkout history" class="btn btn-danger" onclick="return confirmDelete(MSG_CONFIRM_AGAIN);" />
-                            </fieldset>
                         </form>
 
-                        <form action="/cgi-bin/koha/opac-privacy.pl" method="post" id="opac-privacy-delete-form">
-                            <legend class="sr-only">Hold history deletion</legend>
+                        <form action="/cgi-bin/koha/opac-privacy.pl" method="post" id="opac-privacy-delete-holds">
                             <input type="hidden" name="op" value="delete_record" />
                             <input type="hidden" name="holds" value="1" />
-                            <fieldset class="action">
-                                <input type="submit" value="Hold history" class="btn btn-danger" onclick="return confirmDelete(MSG_CONFIRM_AGAIN);" />
-                            </fieldset>
                         </form>
 
-                        <form action="/cgi-bin/koha/opac-privacy.pl" method="post" id="opac-privacy-delete-form">
-                            <legend class="sr-only">Checkout and hold history deletion</legend>
+                        <form action="/cgi-bin/koha/opac-privacy.pl" method="post" id="opac-privacy-delete-all">
                             <input type="hidden" name="op" value="delete_record" />
                             <input type="hidden" name="all" value="1" />
-                            <fieldset class="action">
-                                <input type="submit" value="Checkout and hold history" class="btn btn-danger" onclick="return confirmDelete(MSG_CONFIRM_AGAIN);" />
-                            </fieldset>
                         </form>
+                        <table class="table table-bordered table-condensed table-striped">
+                            <tr>
+                                <td colspan=7>Immediately delete my checkout history. This action cannot be undone.</td>
+                                <td colspan=1>
+                                    <fieldset class="action">
+                                        <input type="submit" value="Delete checkout history" form="opac-privacy-delete-checkouts" class="btn btn-danger btn-block" onclick="return confirmDelete(MSG_CONFIRM_AGAIN);" />
+                                    </fieldset>
+                                </td>
+                            </tr>
+                            <tr>
+                                <td colspan=7>Immediately delete my hold history. This action cannot be undone.</td>
+                                <td colspan=1>
+                                    <fieldset class="action">
+                                        <input type="submit" value="Delete hold history" form="opac-privacy-delete-holds" class="btn btn-danger btn-block" onclick="return confirmDelete(MSG_CONFIRM_AGAIN);" />
+                                    </fieldset>
+                                </td>
+                            </tr>
+                            <tr>
+                                <td colspan=7>Immediately delete my checkout history & my hold history. This action cannot be undone.</td>
+                                <td colspan=1>
+                                    <fieldset class="action">
+                                        <input type="submit" value="Delete checkout and hold history" form="opac-privacy-delete-all" class="btn btn-danger btn-block" onclick="return confirmDelete(MSG_CONFIRM_AGAIN);" />
+                                    </fieldset>
+                                </td>
+                            </tr>
+                        </table>
 
                         [% IF Koha.Preference('StoreLastBorrower') %]
                             <p id="store-last-borrower-msg">Please note, the last person to return an item is tracked for the management of items returned damaged.</p>
-- 
2.39.5