diff --git a/awx/ui/static/css/ansible-ui.css b/awx/ui/static/css/ansible-ui.css index e24910095d..032ae04370 100644 --- a/awx/ui/static/css/ansible-ui.css +++ b/awx/ui/static/css/ansible-ui.css @@ -141,10 +141,12 @@ background-color: #36454F; color: #A9A9A9; padding-top: 20px; + padding-bottom: 40px; + text-align: center; } .copyright { - margin-top: 40px; + display: inline-block; font-size: 11px; font-weight: normal; text-align: center; @@ -166,19 +168,19 @@ .site-footer .logo { display: inline-block; - text-align: left; - font-size: 12px; - margin-right: 20px; + margin-right: 35px; } .site-footer .logo img { - max-width: 165px; + max-width: 125px; } - .site-footer .logo .tag-line { - line-height: normal; - margin-top: 5px; - margin-left: 15px; + .login-header { + text-align: center; + } + + .login-header img { + max-width: 100px; } .error { @@ -615,6 +617,15 @@ margin-top: 0; } + +.modal-backdrop, +.modal-backdrop.fade.in { + opacity: 0.6; + filter: alpha(opacity=60); +} + + + /* overrides to TB modal */ .modal-header { padding: 15px 10px; diff --git a/awx/ui/static/img/AWX_logo.png b/awx/ui/static/img/AWX_logo.png new file mode 100644 index 0000000000..c07f70fb7a Binary files /dev/null and b/awx/ui/static/img/AWX_logo.png differ diff --git a/awx/ui/static/img/ansible-logo-bw-invert.png b/awx/ui/static/img/ansible-logo-bw-invert.png deleted file mode 100644 index 55e3274721..0000000000 Binary files a/awx/ui/static/img/ansible-logo-bw-invert.png and /dev/null differ diff --git a/awx/ui/static/js/app.js b/awx/ui/static/js/app.js index 2949170ea0..015e3be081 100644 --- a/awx/ui/static/js/app.js +++ b/awx/ui/static/js/app.js @@ -98,6 +98,9 @@ angular.module('ansible', [ when('/projects/:id', { templateUrl: urlPrefix + 'partials/projects.html', controller: ProjectsEdit }). + when('/projects/:project_id/organizations', + { templateUrl: urlPrefix + 'partials/projects.html', controller: OrganizationsList }). + when('/inventories', { templateUrl: urlPrefix + 'partials/inventories.html', controller: InventoriesList }). diff --git a/awx/ui/static/js/controllers/Authentication.js b/awx/ui/static/js/controllers/Authentication.js index 01a772feee..bc37741cd5 100644 --- a/awx/ui/static/js/controllers/Authentication.js +++ b/awx/ui/static/js/controllers/Authentication.js @@ -23,8 +23,9 @@ function Authenticate($scope, $rootScope, $location, Authorization, ToggleClass, //gets set back to true by Authorization.setToken(). $scope.sessionExpired = Authorization.didSessionExpire(); //Display session timeout message - $scope.sessionTimeout = ($AnsibleConfig.session_timeout / 60).toFixed(2) - + $scope.sessionTimeout = ($AnsibleConfig.session_timeout / 60).toFixed(2); + $scope.AWXLoginLogo = $staticURL + 'img/AWX_logo.png'; + $('#login-password').bind('keypress', function(e) { var code = (e.keyCode ? e.keyCode : e.which); if (code == 13) { @@ -33,7 +34,7 @@ function Authenticate($scope, $rootScope, $location, Authorization, ToggleClass, }); // Display the login dialog - $('#login-modal').modal({ show: true, keyboard: false, backdrop: false }); + $('#login-modal').modal({ show: true, keyboard: false, backdrop: 'static' }); $scope.reset = function() { $('#login-form input').each( function(index) { $(this).val(''); }); diff --git a/awx/ui/static/js/forms/Projects.js b/awx/ui/static/js/forms/Projects.js index 3dba322409..38162efd22 100644 --- a/awx/ui/static/js/forms/Projects.js +++ b/awx/ui/static/js/forms/Projects.js @@ -73,7 +73,47 @@ angular.module('ProjectFormDefinition', []) }, related: { //related colletions (and maybe items?) + organizations: { + type: 'collection', + title: 'Organizations', + iterator: 'organization', + open: false, + actions: { + add: { + ngClick: "add('organizations')", + icon: 'icon-plus', + label: 'Add', + awToolTip: 'Add an organization' + } + }, + + fields: { + name: { + key: true, + label: 'Name' + }, + description: { + label: 'Description' + } + }, + + fieldActions: { + edit: { + label: 'Edit', + ngClick: "edit('organizations', \{\{ organization.id \}\}, '\{\{ organization.name \}\}')", + icon: 'icon-edit', + awToolTip: 'Edit the credential' + }, + "delete": { + label: 'Delete', + ngClick: "delete('organizations', \{\{ organization.id \}\}, '\{\{ organization.name \}\}', 'organizations')", + icon: 'icon-remove', + "class": 'btn-danger', + awToolTip: 'Delete the credential' + } + } + }, } }); // Form diff --git a/awx/ui/static/partials/login-dialog.html b/awx/ui/static/partials/login-dialog.html index 4997bde384..5214e9a2ad 100644 --- a/awx/ui/static/partials/login-dialog.html +++ b/awx/ui/static/partials/login-dialog.html @@ -2,11 +2,12 @@