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

demodalize login to deal with back button issues

Browse Source
This commit is contained in:
John Mitchell
2015-11-16 13:18:52 -05:00
parent 512a7992e8
commit 77f9523984
3 changed files with 19 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,6 +1,5 @@
/** @define LoginModal */ /** @define LoginModal */
.LoginModal-dialog { .LoginModal-dialog {
max-width: ~"calc(100% - 30px)";
margin: 30px auto; margin: 30px auto;
margin-top: 135px; margin-top: 135px;
} }
@@ -13,17 +12,28 @@
box-shadow: none; box-shadow: none;
background-color: #fff; background-color: #fff;
border-radius: 4px; border-radius: 4px;
opacity: 0;
transition: opacity 0.5s;
}
.LoginModal-content.is-loggedOut {
opacity: 1;
transition: opacity 0.5s;
} }
.LoginModal-header { .LoginModal-header {
text-align: center; text-align: center;
background-color: #167ec4; background-color: #167ec4;
border-bottom: 0; border-bottom: 0;
border-top-right-radius: 4px;
border-top-left-radius: 4px;
} }
.LoginModal-body { .LoginModal-body {
padding-top: 15px; padding-top: 15px;
padding-bottom: 0px; padding-bottom: 0px;
padding-left: 20px;
padding-right: 20px;
} }
.LoginModal-logoImage { .LoginModal-logoImage {
@@ -32,8 +42,8 @@
.LoginModal-logoImage--notCustom { .LoginModal-logoImage--notCustom {
max-width: 190px; max-width: 190px;
margin-top: -6px; margin-top: 6px;
margin-bottom: -6px; margin-bottom: 6px;
} }
.LoginModal-alert { .LoginModal-alert {

6
awx/ui/client/src/login/loginModal/loginModal.directive.js
View File

@@ -15,12 +15,6 @@ export default
controller: authenticationController, controller: authenticationController,
templateUrl: templateUrl('login/loginModal/loginModal'), templateUrl: templateUrl('login/loginModal/loginModal'),
link: function(scope, element, attrs) { link: function(scope, element, attrs) {
// Display the login dialog
$('#login-modal').modal({
show: true,
keyboard: false,
backdrop: 'static'
});
} }
}; };
} }

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

@@ -1,12 +1,13 @@
<div id="login-modal" class="modal fade LoginModal"> <div id="login-modal" class="LoginModal">
<div class="modal-dialog LoginModal-dialog"> <div class="LoginModal-dialog">
<div class="modal-content LoginModal-content"> <div class="LoginModal-content"
<div class="modal-header LoginModal-header"> ng-class="{'is-loggedOut' : !$root.current_user.username}">
<div class="LoginModal-header">
<img id="login_modal_image" class="LoginModal-logoImage" <img id="login_modal_image" class="LoginModal-logoImage"
ng-class="{'LoginModal-logoImage--notCustom': !customLogoPresent}" ng-class="{'LoginModal-logoImage--notCustom': !customLogoPresent}"
ng-src="/static/assets/{{ customLogo }}" > ng-src="/static/assets/{{ customLogo }}" >
</div> </div>
<div class="modal-body LoginModal-body"> <div class="LoginModal-body">
<div class="LoginModal-alert" ng-show="!sessionExpired && !sessionLimitExpired && !attemptFailed && !thirdPartyAttemptFailed"> <div class="LoginModal-alert" ng-show="!sessionExpired && !sessionLimitExpired && !attemptFailed && !thirdPartyAttemptFailed">
Welcome to Ansible Tower! &nbsp;Please sign in. Welcome to Ansible Tower! &nbsp;Please sign in.
</div> </div>