From eef7814d66edc423d54912f32cc43213aa1afc59 Mon Sep 17 00:00:00 2001 From: chouseknecht Date: Thu, 18 Jul 2013 18:16:29 -0400 Subject: [PATCH] AC-167 Added new AWX logo to site footer and login dialog. --- awx/ui/static/css/ansible-ui.css | 29 +++++++++---- awx/ui/static/img/AWX_logo.png | Bin 0 -> 9991 bytes awx/ui/static/img/ansible-logo-bw-invert.png | Bin 6572 -> 0 bytes awx/ui/static/js/app.js | 3 ++ .../static/js/controllers/Authentication.js | 7 +-- awx/ui/static/js/forms/Projects.js | 40 ++++++++++++++++++ awx/ui/static/partials/login-dialog.html | 7 +-- awx/ui/templates/ui/index.html | 13 ++++-- 8 files changed, 80 insertions(+), 19 deletions(-) create mode 100644 awx/ui/static/img/AWX_logo.png delete mode 100644 awx/ui/static/img/ansible-logo-bw-invert.png 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 0000000000000000000000000000000000000000..c07f70fb7ae1f1e0ecaf25e13d18e88753b73d0a GIT binary patch literal 9991 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�f=|Agwm>FZ9Kd|Rl7riReZKdsEzQ_J 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 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 @@