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

Ensure error messages are showing up, but not doubled

Browse Source
This commit is contained in:
beeankha
2019-01-28 16:12:20 -05:00
parent ea7e15bfc4
commit 5e3d47683d
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -14,7 +14,7 @@
ng-src="{{ customLogo }}" > ng-src="{{ customLogo }}" >
</div> </div>
<div class="LoginModal-body"> <div class="LoginModal-body">
<div class="LoginModal-alert" ng-show="!sessionExpired && !sessionLimitExpired && !attemptFailed && !thirdPartyAttemptFailed" translate> <div class="LoginModal-alert" ng-show="!sessionExpired && !sessionLimitExpired && !attemptFailed && !thirdPartyAttemptFailed && !userLoggedOut" translate>
Welcome to Ansible {{BRAND_NAME}}! &nbsp;Please sign in. Welcome to Ansible {{BRAND_NAME}}! &nbsp;Please sign in.
</div> </div>
<div class="LoginModal-alert LoginModal-alert--error" ng-show="sessionExpired"> <div class="LoginModal-alert LoginModal-alert--error" ng-show="sessionExpired">
@@ -23,6 +23,12 @@
Your session timed out due to inactivity. Please sign in. Your session timed out due to inactivity. Please sign in.
</div> </div>
</div> </div>
<div class="LoginModal-alert LoginModal-alert--error" ng-show="userLoggedOut && !sessionExpired">
<i class="LoginModal-alertIcon fa fa-exclamation-triangle"></i>
<div class="LoginModal-alertText" translate>
You have been logged out. Please sign in.
</div>
</div>
<div class="LoginModal-alert LoginModal-alert--error" ng-show="sessionLimitExpired"> <div class="LoginModal-alert LoginModal-alert--error" ng-show="sessionLimitExpired">
<i class="LoginModal-alertIcon fa fa-exclamation-triangle"></i> <i class="LoginModal-alertIcon fa fa-exclamation-triangle"></i>
<div class="LoginModal-alertText" translate> <div class="LoginModal-alertText" translate>