diff --git a/awx/ui/client/src/helpers/LoadConfig.js b/awx/ui/client/src/helpers/LoadConfig.js
index eeab13bb50..c3ba75e4c7 100644
--- a/awx/ui/client/src/helpers/LoadConfig.js
+++ b/awx/ui/client/src/helpers/LoadConfig.js
@@ -22,14 +22,14 @@
export default
angular.module('LoadConfigHelper', ['Utilities'])
-.factory('LoadConfig', ['$log', '$rootScope', '$http', '$location',
- 'ProcessErrors', 'Store',
- function($log, $rootScope, $http, $location, ProcessErrors, Store) {
+.factory('LoadConfig', ['$log', '$rootScope', '$http', '$location', 'GetBasePath',
+ 'ProcessErrors', 'Rest', 'Store',
+ function($log, $rootScope, $http, $location, GetBasePath, ProcessErrors, Rest, Store) {
return function() {
// These ettings used to be found in config.js, hardcoded now.
var configSettings = {
- // 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_logo: false, // 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,
@@ -62,22 +62,37 @@ angular.module('LoadConfigHelper', ['Utilities'])
},
};
- // Auto-resolving what used to be found when attempting to load local_setting.json
- if ($rootScope.loginConfig) {
- $rootScope.loginConfig.resolve('config loaded');
- }
- $rootScope.$emit('ConfigReady');
+ var configInit = function() {
+ // Auto-resolving what used to be found when attempting to load local_setting.json
+ if ($rootScope.loginConfig) {
+ $rootScope.loginConfig.resolve('config loaded');
+ }
+ $rootScope.$emit('ConfigReady');
- // Load new hardcoded settings from above
- // TODO Add a check for a custom image to add to the settings.
- // Update flag to true
- // in loginModal.controller load the base64 src
- // change partial to use base65 in the img src
+ // Load new hardcoded settings from above
- global.$AnsibleConfig = configSettings;
- Store('AnsibleConfig', global.$AnsibleConfig);
- $rootScope.$emit('LoadConfig');
+ global.$AnsibleConfig = configSettings;
+ Store('AnsibleConfig', global.$AnsibleConfig);
+ $rootScope.$emit('LoadConfig');
+ };
+ // Retrieve the custom logo information - update configSettings from above
+ $http({
+ method: 'GET',
+ url: '/api',
+ })
+ .success(function(response) {
+ if(response.custom_logo) {
+ configSettings.custom_logo = true;
+ $rootScope.custom_logo = response.custom_logo;
+ configInit();
+ } else {
+ configSettings.custom_logo = false;
+ configInit();
+ }
+ }).error(function(error) {
+ console.log(error);
+ });
};
}
diff --git a/awx/ui/client/src/login/loginModal/loginModal.controller.js b/awx/ui/client/src/login/loginModal/loginModal.controller.js
index 69d509925f..635ced3e20 100644
--- a/awx/ui/client/src/login/loginModal/loginModal.controller.js
+++ b/awx/ui/client/src/login/loginModal/loginModal.controller.js
@@ -93,7 +93,7 @@ export default ['$log', '$cookieStore', '$compile', '$window', '$rootScope',
$rootScope.loginConfig.promise.then(function () {
if ($AnsibleConfig.custom_logo) {
- scope.customLogo = "custom_console_logo.png";
+ scope.customLogo = $rootScope.custom_logo;
scope.customLogoPresent = true;
} else {
scope.customLogo = "tower-logo-login.svg";
diff --git a/awx/ui/client/src/login/loginModal/loginModal.partial.html b/awx/ui/client/src/login/loginModal/loginModal.partial.html
index e0e46657f8..d6e30a20a3 100644
--- a/awx/ui/client/src/login/loginModal/loginModal.partial.html
+++ b/awx/ui/client/src/login/loginModal/loginModal.partial.html
@@ -6,8 +6,12 @@
ng-class="{'is-loggedOut' : !current_user || !current_user.username}">
![]()
+ ![]()
diff --git a/awx/ui/client/src/shared/directives.js b/awx/ui/client/src/shared/directives.js
index 433bbbcb78..16a0faea9a 100644
--- a/awx/ui/client/src/shared/directives.js
+++ b/awx/ui/client/src/shared/directives.js
@@ -123,6 +123,77 @@ angular.module('AWDirectives', ['RestServices', 'Utilities', 'JobsHelper'])
};
}])
+// imageUpload
+//
+// Accepts image and returns base64 information with basic validation
+// Can eventually expand to handle all uploads with different endpoints and handlers
+//
+.directive('imageUpload', ['ConfigurationUtils', function(ConfigurationUtils) {
+ return {
+ restrict: 'E',
+ scope: {
+ key: '@'
+ },
+ template: `
+
+
+
+
+
+
+
+ `,
+
+ link: function(scope) {
+ var fieldKey = scope.key;
+ var filePickerText = angular.element(document.getElementById('filePickerText'));
+ var filePickerError = angular.element(document.getElementById('filePickerError'));
+ var filePickerButton = angular.element(document.getElementById('filePickerButton'));
+
+ scope.imagePresent = global.$AnsibleConfig.custom_logo;
+
+ scope.$on('loginUpdated', function() {
+ scope.imagePresent = global.$AnsibleConfig.custom_logo;
+ });
+
+ scope.update = function(e) {
+ if(scope.$parent[fieldKey]) {
+ e.preventDefault();
+ scope.$parent[fieldKey] = '';
+ filePickerButton.html('BROWSE');
+ filePickerText.val('');
+ }
+ else {
+ // Nothing exists so open file picker
+ }
+ };
+
+ scope.fileChange = function(file) {
+ filePickerError.html('');
+
+ ConfigurationUtils.imageProcess(file[0])
+ .then(function(result) {
+ scope.$parent[fieldKey] = result;
+ filePickerText.val(file[0].name);
+ filePickerButton.html('REMOVE');
+ }).catch(function(error) {
+ filePickerText.html(file[0].name);
+ filePickerError.text(error);
+ }).finally(function() {
+
+ });
+ };
+
+ }
+ };
+}])
+
.directive('surveyCheckboxes', function() {
return {