External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-01-14 19:30:39 -03:30
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #430 from jlmitch5/login_rebranding

Browse Source 
rebranding and notice in ui login support
This commit is contained in:
jlmitch5 2015-09-22 16:04:35 -04:00
commit 1aa82df7ee
5 changed files with 31 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
awx/ui/client/legacy-styles/ansible-ui.less
View File

@ -2031,3 +2031,7 @@ button.dropdown-toggle,
.input-group-btn {
z-index: 1;
}
#login-modal-body {
padding-bottom: 5px;
}

3
awx/ui/client/src/config.js
View File

@ -27,7 +27,8 @@
$.fn.systemTrackingDP = datepicker;
return {
// custom_logo: "example.png", // utilize a custom logo, see documentation for how to get the server to serve your logo to the browser
// custom_login_info: "example notice" // have a notice displayed in the login modal for users. note that, as a security measure, custom html is not supported and will be escaped.
tooltip_delay: {show: 500, hide: 100}, // Default number of milliseconds to delay displaying/hiding tooltips
debug_mode: false, // Enable console logging messages

5
awx/ui/client/src/login/authentication.controller.js
View File

@ -111,6 +111,11 @@ export default ['$log', '$cookieStore', '$compile', '$window', '$rootScope', '$l
setLoginFocus();
});
scope.customLogo = $AnsibleConfig.custom_logo || "tower_console_logo.png";
scope.customLoginInfo = $AnsibleConfig.custom_login_info;
scope.customLoginInfoPresent = (scope.customLoginInfo) ? true : false;
// Reset the login form
//scope.loginForm.login_username.$setPristine();
//scope.loginForm.login_password.$setPristine();

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

@ -4,7 +4,7 @@
<div class="modal-content" id="login-modal-content">
<div class="modal-header login-header">
<img src="" + $basePath + "assets/tower_console_logo.png" >
<img ng-src="/static/assets/{{ customLogo }}" >
</div>
<div class="modal-body" id="login-modal-body">
<div class="login-alert" ng-show="!sessionExpired">Welcome to Ansible Tower! &nbsp;Please sign in.</div>
@ -29,6 +29,7 @@
</div>
</div>
</form>
<div class="LoginModalNotice" ng-if="customLoginInfoPresent"><div class="LoginModalNotice-title">Notice</div>{{ customLoginInfo | sanitize }}</div>
</div>
<div class="modal-footer">
<button ng-click="systemLogin(login_username, login_password)" id="login-button" class="btn btn-primary"><i class="fa fa-sign-in"></i> Sign in</button>

18
awx/ui/client/src/login/loginMotalNotice.block.less Normal file
View File

@ -0,0 +1,18 @@
/** @define LoginModalNotice */
.LoginModalNotice {
font-size: 12px;
width: 100%;
height: 129px;
padding: 5px 10px;
border-radius: 4px;
border: 0px;
background-color: #efefef;
overflow: scroll;
}
.LoginModalNotice-title {
color: #808080;
font-weight: bold;
padding-bottom: 4px;
font-size: 14px;
}