diff --git a/awx/ui/client/legacy-styles/ansible-ui.less b/awx/ui/client/legacy-styles/ansible-ui.less index d9a319a298..efeda91fdd 100644 --- a/awx/ui/client/legacy-styles/ansible-ui.less +++ b/awx/ui/client/legacy-styles/ansible-ui.less @@ -1887,6 +1887,11 @@ tr td button i { padding-right: 15px; } + .list-actions { + margin-bottom: 20px; + text-align: left; + } + } .nvtooltip { @@ -2051,10 +2056,6 @@ tr td button i { opacity: 0; } -.list-actions button, .list-actions .checkbox-inline { - margin-top: 10px; -} - /* Overwrite select2 base styles for single/multiple selects so that match up with other form elements. Also overwrite disabled styles. */ .select2-container--disabled,.select2-container--disabled .select2-selection--single,.select2-container--disabled .select2-selection--multiple { cursor: not-allowed !important; diff --git a/awx/ui/client/legacy-styles/forms.less b/awx/ui/client/legacy-styles/forms.less index 79e7c5e5f5..f298483741 100644 --- a/awx/ui/client/legacy-styles/forms.less +++ b/awx/ui/client/legacy-styles/forms.less @@ -463,7 +463,7 @@ input[type='radio']:checked:before { } .Form-formGroup--singleColumn { - width: 100%; + width: 100% !important; padding-right: 0px; } @@ -473,10 +473,15 @@ input[type='radio']:checked:before { color: @default-interface-txt; } +.Form-formGroup { + max-width: 33%; +} + @media only screen and (max-width: 650px) { .Form-formGroup { flex: 1 0 auto; margin-bottom: 25px; + max-width: 100%; width: 100%; padding-right: 50px; } @@ -486,6 +491,7 @@ input[type='radio']:checked:before { .Form-formGroup { flex: 1 0 auto; margin-bottom: 25px; + max-width: 50%; width: 50%; padding-right: 50px; } diff --git a/awx/ui/client/legacy-styles/lists.less b/awx/ui/client/legacy-styles/lists.less index 49e0e840f7..93e5c62656 100644 --- a/awx/ui/client/legacy-styles/lists.less +++ b/awx/ui/client/legacy-styles/lists.less @@ -47,6 +47,10 @@ table, tbody { text-align: right; } +.List-tableHeader:not([ng-click]) { + cursor: default !important; +} + .List-tableHeaderSort { color: @list-header-icon; } @@ -183,10 +187,6 @@ table, tbody { display: flex; } -.List-actions { - margin-top: -10px; -} - .List-auxAction + .List-actions { margin-left: 20px; } diff --git a/awx/ui/client/src/access/addPermissions/addPermissions.block.less b/awx/ui/client/src/access/addPermissions/addPermissions.block.less index ea41f8d214..7dd95a32d3 100644 --- a/awx/ui/client/src/access/addPermissions/addPermissions.block.less +++ b/awx/ui/client/src/access/addPermissions/addPermissions.block.less @@ -90,7 +90,7 @@ font-weight: bold; border-radius: 50%; background-color: @default-list-header-bg; - padding: 2px 6px; + padding: 2px 8px; margin-right: 10px; } @@ -122,9 +122,7 @@ } .AddPermissions-roleType { - border-radius: 5px; padding: 0px 6px; - border: 1px solid @d7grey; font-size: 10px; color: @default-interface-txt; text-transform: uppercase; @@ -143,7 +141,7 @@ .AddPermissions-roleRemove { border-radius: 50%; - padding: 5px 3px; + padding: 3px 4.5px; line-height: 11px; color: @default-icon; background-color: @default-tertiary-bg; @@ -187,11 +185,15 @@ .AddPermissions-keyPane { margin: 20px 0; - border-radius: 5px; + font-size: 12px; + width: 100%; padding: 15px; - padding-bottom: 0px; - border: 1px solid @d7grey; - color: @default-interface-txt; + padding-top: 10px; + margin-bottom: 15px; + border-radius: 4px; + border: 1px solid @login-notice-border; + background-color: @login-notice-bg; + color: @login-notice-text; } .AddPermissions-keyRow { diff --git a/awx/ui/client/src/access/addPermissions/addPermissions.controller.js b/awx/ui/client/src/access/addPermissions/addPermissions.controller.js index b95f851f07..938b47985e 100644 --- a/awx/ui/client/src/access/addPermissions/addPermissions.controller.js +++ b/awx/ui/client/src/access/addPermissions/addPermissions.controller.js @@ -75,18 +75,19 @@ export default ['$rootScope', '$scope', 'GetBasePath', 'Rest', '$q', 'Wait', 'Pr }); } else { // selected, so add to the allSelected list + var getName = function(val) { + if (val.type === "user") { + return (val.first_name && + val.last_name) ? + val.first_name + " " + + val.last_name : + val.username; + } else { + return val.name; + } + }; scope.allSelected.push({ - name: function() { - if (val.type === "user") { - return (val.first_name && - val.last_name) ? - val.first_name + " " + - val.last_name : - val.username; - } else { - return val .name; - } - }, + name: getName(val), type: val.type, roles: [], id: val.id diff --git a/awx/ui/client/src/access/addPermissions/addPermissions.partial.html b/awx/ui/client/src/access/addPermissions/addPermissions.partial.html index dd81f1a823..5d0d4f01b9 100644 --- a/awx/ui/client/src/access/addPermissions/addPermissions.partial.html +++ b/awx/ui/client/src/access/addPermissions/addPermissions.partial.html @@ -21,7 +21,7 @@
- 1. + 1 Please select Users / Teams from the lists below.
@@ -55,7 +55,7 @@
- 2. + 2 Please assign roles to the selected users/teams
- 1. + 1 Please click the button below to visit Ansible's website to get a Tower license key. @@ -89,7 +89,7 @@
- 2. + 2 Choose your license file, agree to the End User License Agreement, and click submit. diff --git a/awx/ui/client/src/organizations/linkout/organizations-linkout.controller.js b/awx/ui/client/src/organizations/linkout/organizations-linkout.controller.js index 7d47f544b2..6609f1f624 100644 --- a/awx/ui/client/src/organizations/linkout/organizations-linkout.controller.js +++ b/awx/ui/client/src/organizations/linkout/organizations-linkout.controller.js @@ -4,21 +4,27 @@ export default ['$scope', '$stateParams', '$state', 'Rest', 'UserList', 'Invento var list = {}; if (mode === 'users') { list = _.cloneDeep(UserList); + list.emptyListText = "Please add items to this list"; list.actions.add.buttonContent = '+ ADD user'; } else if (mode === 'inventories') { list = _.cloneDeep(InventoryList); + list.emptyListText = "List is empty"; delete list.actions.add; } else if (mode === 'job_templates') { list = _.cloneDeep(JobTemplateList); + list.emptyListText = "List is empty"; delete list.actions.add; } else if (mode === 'teams') { list = _.cloneDeep(TeamList); + list.emptyListText = "List is empty"; delete list.actions.add; } else if (mode === 'projects') { list = _.cloneDeep(ProjectList); + list.emptyListText = "List is empty"; delete list.actions.add; } else if (mode === 'admins') { list = _.cloneDeep(UserList); + list.emptyListText = "Please add items to this list"; list.actions.add.buttonContent = '+ ADD administrator'; } return list; diff --git a/awx/ui/client/src/search/tagSearch.block.less b/awx/ui/client/src/search/tagSearch.block.less index 80cccde89d..0a604dd18c 100644 --- a/awx/ui/client/src/search/tagSearch.block.less +++ b/awx/ui/client/src/search/tagSearch.block.less @@ -82,11 +82,11 @@ } .TagSearch-dropdownItem:hover { - background-color: @default-tertiary-bg; + background-color: @default-no-items-bord; } .TagSearch-dropdownItem.is-selected { - background-color: @default-no-items-bord; + background-color: @default-white-button-bord; } .TagSearch-searchTermContainer { diff --git a/awx/ui/client/src/shared/form-generator.js b/awx/ui/client/src/shared/form-generator.js index 7e0a2888df..03d2eeaac3 100644 --- a/awx/ui/client/src/shared/form-generator.js +++ b/awx/ui/client/src/shared/form-generator.js @@ -1783,7 +1783,7 @@ angular.module('FormGenerator', [GeneratorHelpers.name, 'Utilities', listGenerat html += `
-
${tagSearch}
-
+
${actionButtons}
diff --git a/awx/ui/client/src/shared/list-generator/list-generator.factory.js b/awx/ui/client/src/shared/list-generator/list-generator.factory.js index a7736f109f..111771c8e8 100644 --- a/awx/ui/client/src/shared/list-generator/list-generator.factory.js +++ b/awx/ui/client/src/shared/list-generator/list-generator.factory.js @@ -329,7 +329,7 @@ export default ['$location', '$compile', '$rootScope', 'SearchWidget', 'Paginate html += "
"; } html += "
"; - html += "
\n"; diff --git a/awx/ui/client/src/shared/modal/modal.less b/awx/ui/client/src/shared/modal/modal.less index f379a2997b..9d67dba204 100644 --- a/awx/ui/client/src/shared/modal/modal.less +++ b/awx/ui/client/src/shared/modal/modal.less @@ -37,12 +37,14 @@ height:20px; font-size: 20px; background-color:@default-bg; - color:@default-icon; + color:@default-icon-hov; line-height:1; + opacity: 1; } .Modal-exit:hover{ - color:@default-icon-hov; + color: @default-icon; + opacity: 1; } .Modal-body { @@ -96,6 +98,10 @@ color: @btn-txt-sel; } +.Modal-errorButton:focus { + color: @btn-txt-sel; +} + .Modal-footerButton { padding: 4px 8px; }