From f1f9f5f982670e428fce39b9c3c2703ec1df452d Mon Sep 17 00:00:00 2001 From: John Mitchell Date: Fri, 25 Sep 2015 16:58:31 -0400 Subject: [PATCH] fixed custom logo path stuff to work with server --- awx/ui/client/src/config.js | 2 +- awx/ui/client/src/login/loginModal/loginModal.controller.js | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/awx/ui/client/src/config.js b/awx/ui/client/src/config.js index c1a6c4008a..cc68e83a8d 100644 --- a/awx/ui/client/src/config.js +++ b/awx/ui/client/src/config.js @@ -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 diff --git a/awx/ui/client/src/login/loginModal/loginModal.controller.js b/awx/ui/client/src/login/loginModal/loginModal.controller.js index 6954778c06..8c73ff27c9 100644 --- a/awx/ui/client/src/login/loginModal/loginModal.controller.js +++ b/awx/ui/client/src/login/loginModal/loginModal.controller.js @@ -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;