From e5c6dda79f69098066fb579ac928e6361a029bc1 Mon Sep 17 00:00:00 2001
From: John Mitchell <jlmitch5@ncsu.edu>
Date: Mon, 28 Sep 2015 16:05:41 -0400
Subject: [PATCH] fixed login modal disappearing by improving ux

---
 awx/ui/client/src/login/loginModal/loginModal.block.less    | 4 ++++
 awx/ui/client/src/login/loginModal/loginModal.controller.js | 2 +-
 awx/ui/client/src/login/loginModal/loginModal.partial.html  | 3 +++
 3 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/awx/ui/client/src/login/loginModal/loginModal.block.less b/awx/ui/client/src/login/loginModal/loginModal.block.less
index ffbe68811e..262ab3a736 100644
--- a/awx/ui/client/src/login/loginModal/loginModal.block.less
+++ b/awx/ui/client/src/login/loginModal/loginModal.block.less
@@ -17,6 +17,10 @@
     text-align: center;
 }
 
+.LoginModal-alert--error {
+    color: #ff5850;
+}
+
 .LoginModal-labelAsterisk:before {
     margin-right: -2px;
 }
diff --git a/awx/ui/client/src/login/loginModal/loginModal.controller.js b/awx/ui/client/src/login/loginModal/loginModal.controller.js
index 8c73ff27c9..9aa8bfb283 100644
--- a/awx/ui/client/src/login/loginModal/loginModal.controller.js
+++ b/awx/ui/client/src/login/loginModal/loginModal.controller.js
@@ -208,7 +208,7 @@ export default ['$log', '$cookieStore', '$compile', '$window', '$rootScope', '$l
                             ' and accessible.';
                         }
                         scope.reset();
-                        Alert(hdr, msg, 'alert-danger', setLoginFocus, null, null, false);
+                        scope.attemptFailed = true;
                     }
                 });
         }
diff --git a/awx/ui/client/src/login/loginModal/loginModal.partial.html b/awx/ui/client/src/login/loginModal/loginModal.partial.html
index 1e552b7dad..4aadf504fd 100644
--- a/awx/ui/client/src/login/loginModal/loginModal.partial.html
+++ b/awx/ui/client/src/login/loginModal/loginModal.partial.html
@@ -62,6 +62,9 @@
                         </div>
                     </div>
                 </form>
+                <div class="LoginModal-alert LoginModal-alert--error" ng-show="attemptFailed">
+                    Invalid username and/or password.  Please try again.
+                </div>
                 <div class="LoginModalNotice" ng-if="customLoginInfoPresent"><div class="LoginModalNotice-title">Notice</div>{{ customLoginInfo | sanitize }}</div>
             </div>
             <div class="modal-footer LoginModal-footer">