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

fixed custom logo path stuff to work with server

Browse Source
This commit is contained in:
John Mitchell 2015-09-25 16:58:31 -04:00
parent a3410920a9
commit f1f9f5f982
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -27,7 +27,7 @@
$.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_logo: true // load /var/lib/awx/public/static/assets/custom_console_logo.png as the login modal header. if false, will load the standard tower console logo
// 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

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

@ -111,7 +111,8 @@ export default ['$log', '$cookieStore', '$compile', '$window', '$rootScope', '$l
setLoginFocus();
});
scope.customLogo = $AnsibleConfig.custom_logo || "tower_console_logo.png";
scope.customLogo = ($AnsibleConfig.custom_logo) ? "custom_console_logo.png" : "tower_console_logo.png";
scope.customLoginInfo = $AnsibleConfig.custom_login_info;
scope.customLoginInfoPresent = (scope.customLoginInfo) ? true : false;