From 523beea71270451e4790e1dcb42e53f5641a2dc0 Mon Sep 17 00:00:00 2001
From: Bill Erickson <berickxx@gmail.com>
Date: Thu, 25 Feb 2016 13:52:29 -0500
Subject: [PATCH] LP#1527342 Improve display of C/O history delete warning

Move the history warning to the top of the form for visbility and avoid
displaying the success message when the warning is also displayed.

Signed-off-by: Bill Erickson <berickxx@gmail.com>
Signed-off-by: Kathy Lussier <klussier@masslnc.org>
---
 .../src/templates/opac/myopac/prefs_settings.tt2   | 24 ++++++++++++----------
 1 file changed, 13 insertions(+), 11 deletions(-)

diff --git a/Open-ILS/src/templates/opac/myopac/prefs_settings.tt2 b/Open-ILS/src/templates/opac/myopac/prefs_settings.tt2
index edefb5c581..e98f6dda42 100644
--- a/Open-ILS/src/templates/opac/myopac/prefs_settings.tt2
+++ b/Open-ILS/src/templates/opac/myopac/prefs_settings.tt2
@@ -12,7 +12,18 @@
             title="[% l('Search and History Preferences') %]">
             <tbody>
 
-                [% IF ctx.updated_user_settings %]
+                [% IF ctx.confirm_history_delete %]
+                <tr><td colspan='2'>
+                  <div id='clear-history-confirm' class='renew-summary'>
+                  [% l('Disabling checkout or holds history will permanently remove all items from your history.') %]
+                  <br/>
+                  [% l('Are you sure you wish to continue?') %]
+                  </div>
+                  <a href="[% mkurl() %]">[% l('Cancel') %]</a>
+                  <input type='hidden' name='history_delete_confirmed' value='1'/>
+                  <input type="submit" value="[% l('Confirm') %]" class="opac-button"/>
+                </td></tr>
+                [% ELSIF ctx.updated_user_settings %]
                 <tr><td colspan='2'>
                     <div class='renew-summary'>
                         [% l('Account Successfully Updated') %]
@@ -123,16 +134,7 @@
 
             </tbody>
         </table>
-        [% IF ctx.confirm_history_delete %]
-        <div id='clear-history-confirm'>
-        [% l('Disabling checkout or holds history will permanently remove all items from your history.') %]
-        <br/>
-        [% l('Are you sure you wish to continue?') %]
-        </div>
-        <a href="[% mkurl() %]">[% l('Cancel') %]</a>
-        <input type='hidden' name='history_delete_confirmed' value='1'/>
-        <input type="submit" value="[% l('Confirm') %]" class="opac-button"/>
-        [% ELSE %]
+        [% IF !ctx.confirm_history_delete %]
         <input type="submit" value="[% l('Save') %]" class="opac-button"/>
         [% END %]
     </form>
-- 
2.11.0