From 964a63b486ca47a6c32c31916d9d9d9f44bae1af Mon Sep 17 00:00:00 2001
From: Katrin Fischer <katrin.fischer.83@web.de>
Date: Tue, 24 Mar 2020 10:14:55 +0100
Subject: [PATCH] Bug 24476: (QA follow-up) Move new option below warnings and
 messages in OPAC account

This makes it so the new option appears right above the table of checkouts etc.
but below any warnings, messages or dialogs.

Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
---
 .../bootstrap/en/modules/opac-user.tt         | 61 ++++++++++---------
 1 file changed, 31 insertions(+), 30 deletions(-)

diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt
index f886df0c5e..b4c92c6176 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt
@@ -49,36 +49,6 @@
 
                     <p><a href="/cgi-bin/koha/opac-main.pl?logout.x=1">Click here if you're not [% INCLUDE 'patron-title.inc' patron = logged_in_user %]</a></p>
 
-                    [% IF Koha.Preference('AllowPatronToControlAutorenewal') %]
-                    <form id="autorenewal_option" action="/cgi-bin/koha/opac-user.pl" method="post">
-                            <label for="yes-autorenew_checkouts">
-                                Allow auto renewal:
-                            </label>
-                                [% IF ( borrower.autorenew_checkouts ) %]
-                                    <label class="radio inline" for="yes-autorenew_checkouts">
-                                        Yes
-                                        <input type="radio" id="yes-autorenew_checkouts" name="borrower_autorenew_checkouts" value="1" checked="checked" />
-                                    </label>
-
-                                    <label class="radio inline" for="no-autorenew_checkouts">
-                                        No
-                                        <input type="radio" id="no-autorenew_checkouts" name="borrower_autorenew_checkouts" value="0" />
-                                    </label>
-                                [% ELSE %]
-                                    <label class="radio inline" for="yes-autorenew_checkouts">
-                                        Yes
-                                        <input type="radio" id="yes-autorenew_checkouts" name="borrower_autorenew_checkouts" value="1" />
-                                    </label>
-                                    <label class="radio inline" for="no-autorenew_checkouts">
-                                        No
-                                        <input type="radio" id="no-autorenew_checkouts" name="borrower_autorenew_checkouts" value="0" checked="checked" />
-                                    </label>
-                                [% END %]
-                        <input type="hidden" name="csrf_token" value="[% csrf_token | html %]" />
-                        <input type="hidden" name="update_arc" value="1" />
-                        <input type="submit" value="Update auto renewal preference" />
-                    </form>
-                    [% END %]
                     [% IF ( patronupdate ) %]<div class="alert alert-info"><h3>Thank you!</h3><p>Your corrections have been submitted to the library, and a staff member will update your record as soon as possible.</p></div>[% END %]
 
                     [% IF failed_holds %]
@@ -181,6 +151,37 @@
                         <div id="opac-my-summary-note">[% Koha.Preference('OPACMySummaryNote') | $raw %]</div>
                     [% END %]
 
+                    [% IF Koha.Preference('AllowPatronToControlAutorenewal') %]
+                    <form id="autorenewal_option" action="/cgi-bin/koha/opac-user.pl" method="post">
+                            <label for="yes-autorenew_checkouts">
+                                Allow auto renewal:
+                            </label>
+                                [% IF ( borrower.autorenew_checkouts ) %]
+                                    <label class="radio inline" for="yes-autorenew_checkouts">
+                                        Yes
+                                        <input type="radio" id="yes-autorenew_checkouts" name="borrower_autorenew_checkouts" value="1" checked="checked" />
+                                    </label>
+
+                                    <label class="radio inline" for="no-autorenew_checkouts">
+                                        No
+                                        <input type="radio" id="no-autorenew_checkouts" name="borrower_autorenew_checkouts" value="0" />
+                                    </label>
+                                [% ELSE %]
+                                    <label class="radio inline" for="yes-autorenew_checkouts">
+                                        Yes
+                                        <input type="radio" id="yes-autorenew_checkouts" name="borrower_autorenew_checkouts" value="1" />
+                                    </label>
+                                    <label class="radio inline" for="no-autorenew_checkouts">
+                                        No
+                                        <input type="radio" id="no-autorenew_checkouts" name="borrower_autorenew_checkouts" value="0" checked="checked" />
+                                    </label>
+                                [% END %]
+                        <input type="hidden" name="csrf_token" value="[% csrf_token | html %]" />
+                        <input type="hidden" name="update_arc" value="1" />
+                        <input type="submit" value="Update auto renewal preference" />
+                    </form>
+                    [% END %]
+
                     <div id="opac-user-views" class="toptabs">
                         <ul>
                             <li><a href="#opac-user-checkouts">Checked out ([% issues_count | html %])</a></li>
-- 
2.39.5