From d33229e472e9b10097ac5122d2c1648b91fe336d Mon Sep 17 00:00:00 2001
From: Robbie Antenesse <gamedev@alamantus.com>
Date: Sat, 12 Dec 2015 11:24:47 -0800
Subject: [PATCH] Hide info screen if account is open and vice versa, plus
 reorganize screens so loadAfterDeleteScreen always appears on top and can't
 be closed.

---
 index.php | 28 ++++++++++++++--------------
 js/ui.js  |  2 ++
 2 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/index.php b/index.php
index c6aee5e..9dbb1fc 100644
--- a/index.php
+++ b/index.php
@@ -199,20 +199,6 @@ require_once(SITE_LOCATION . '/php/notificationconditiontree.php');
         </div>
     </div>
 
-    <div id="loadAfterDeleteScreen" style="display:none;">
-        <div id="loadAfterDeleteFade"></div>
-        <div id="loadAfterDeletePage">
-            <div class="settingsCol">
-                <h1>Dictionary Deleted</h1>
-                <label>Select dictionary to load:<br />
-                    <select id="loadAfterDelete" onchange="ChangeDictionary(this);document.getElementById('loadAfterDeleteScreen').style.display = 'none';"></select>
-                </label>
-                <p>Or</p>
-                <label><button type="button" onclick="CreateNewDictionary();document.getElementById('loadAfterDeleteScreen').style.display = 'none';" style="cursor:pointer;">Create a New Dictionary</button></label>
-            </div>
-        </div>
-    </div>
-
     <?php if ($current_user > 0) {
         $user_email = Get_User_Email($current_user);
     ?>
@@ -246,6 +232,20 @@ require_once(SITE_LOCATION . '/php/notificationconditiontree.php');
         }
     ?>
 
+    <div id="loadAfterDeleteScreen" style="display:none;">
+        <div id="loadAfterDeleteFade"></div>
+        <div id="loadAfterDeletePage">
+            <div class="settingsCol">
+                <h1>Dictionary Deleted</h1>
+                <label>Select dictionary to load:<br />
+                    <select id="loadAfterDelete" onchange="ChangeDictionary(this);document.getElementById('loadAfterDeleteScreen').style.display = 'none';"></select>
+                </label>
+                <p>Or</p>
+                <label><button type="button" onclick="CreateNewDictionary();document.getElementById('loadAfterDeleteScreen').style.display = 'none';" style="cursor:pointer;">Create a New Dictionary</button></label>
+            </div>
+        </div>
+    </div>
+
     </contents>
     <footer>
         Dictionary Builder only guaranteed to work with most up-to-date HTML5 browsers. <a href="https://github.com/Alamantus/DictionaryBuilder/issues" target="_blank">Report a Problem</a> | <span class="clickable" onclick="ShowInfo('termsText')" style="font-size:12px;">Terms</span> <span class="clickable" onclick="ShowInfo('privacyText')" style="font-size:12px;">Privacy</span>
diff --git a/js/ui.js b/js/ui.js
index 0723900..27d41ff 100644
--- a/js/ui.js
+++ b/js/ui.js
@@ -261,6 +261,7 @@ function ShowInfo(variableName) {
             document.getElementById("dictionaryWarn").innerHTML = "If your current dictionary is not already saved to your account, be sure to <span class='exportWarnText' onclick='ExportDictionary()'>export it before logging in</span> so you don't lose anything!";
         }
     }
+    HideAccountSettings();
     document.getElementById("infoPage").scrollTop = 0;
     document.getElementById("infoScreen").style.display = "block";
 }
@@ -271,6 +272,7 @@ function HideInfo() {
 
 function ShowAccountSettings(variableName) {
     document.getElementById("accountSettingsScreen").style.display = "block";
+    HideInfo();
 }
 
 function HideAccountSettings() {