External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-05-15 05:17:36 -02:30
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #443 from jlmitch5/loginModalDisappears

Browse Source 
fixed login modal disappearing by improving ux
This commit is contained in:
jlmitch5
2015-09-28 16:42:33 -04:00
parent 2e43ed0405 e5c6dda79f
commit 924e8b8114
3 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
awx/ui/client/src/login/loginModal/loginModal.block.less
View File

@@ -17,6 +17,10 @@
text-align: center; text-align: center;
} }
.LoginModal-alert--error {
color: #ff5850;
}
.LoginModal-labelAsterisk:before { .LoginModal-labelAsterisk:before {
margin-right: -2px; margin-right: -2px;
} }

2
awx/ui/client/src/login/loginModal/loginModal.controller.js
View File

@@ -208,7 +208,7 @@ export default ['$log', '$cookieStore', '$compile', '$window', '$rootScope', '$l
' and accessible.'; ' and accessible.';
} }
scope.reset(); scope.reset();
Alert(hdr, msg, 'alert-danger', setLoginFocus, null, null, false); scope.attemptFailed = true;
} }
}); });
} }

3
awx/ui/client/src/login/loginModal/loginModal.partial.html
View File

@@ -62,6 +62,9 @@
</div> </div>
</div> </div>
</form> </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 class="LoginModalNotice" ng-if="customLoginInfoPresent"><div class="LoginModalNotice-title">Notice</div>{{ customLoginInfo | sanitize }}</div>
</div> </div>
<div class="modal-footer LoginModal-footer"> <div class="modal-footer LoginModal-footer">