From bf7a259f0b22a237a5151dfccb9c322416d6047e Mon Sep 17 00:00:00 2001 From: Ken Hoes Date: Tue, 3 May 2016 12:55:13 -0400 Subject: [PATCH 01/32] Updated hardcoded colors to LESS variables --- awx/ui/client/src/dashboard/dashboard.block.less | 1 + awx/ui/client/src/dashboard/lists/dashboard-list.block.less | 4 ++-- awx/ui/client/src/notifications/notifications.block.less | 2 +- awx/ui/client/src/scheduler/scheduleToggle.block.less | 2 +- 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/awx/ui/client/src/dashboard/dashboard.block.less b/awx/ui/client/src/dashboard/dashboard.block.less index 75d9525040..151286d9f8 100644 --- a/awx/ui/client/src/dashboard/dashboard.block.less +++ b/awx/ui/client/src/dashboard/dashboard.block.less @@ -1,4 +1,5 @@ /** @define Dashboard */ +<<<<<<< HEAD @import "../shared/branding/colors.default.less"; .Dashboard { diff --git a/awx/ui/client/src/dashboard/lists/dashboard-list.block.less b/awx/ui/client/src/dashboard/lists/dashboard-list.block.less index 89b266847f..4c25e4d4ad 100644 --- a/awx/ui/client/src/dashboard/lists/dashboard-list.block.less +++ b/awx/ui/client/src/dashboard/lists/dashboard-list.block.less @@ -145,9 +145,9 @@ } .DashboardList-actionButton--edit:hover { - background-color: #337AB7; + background-color: @default-link; color: @default-bg; - border: 1px solid #337AB7; + border: 1px solid @default-link; } .DashboardList-noJobs { diff --git a/awx/ui/client/src/notifications/notifications.block.less b/awx/ui/client/src/notifications/notifications.block.less index 0ca491aa08..d3ebf96651 100644 --- a/awx/ui/client/src/notifications/notifications.block.less +++ b/awx/ui/client/src/notifications/notifications.block.less @@ -9,7 +9,7 @@ } .alert-success{ - background-color: #5CB85C; + background-color: @default-succ; color: @default-bg; } diff --git a/awx/ui/client/src/scheduler/scheduleToggle.block.less b/awx/ui/client/src/scheduler/scheduleToggle.block.less index 84b3aa62cf..a4eb13612a 100644 --- a/awx/ui/client/src/scheduler/scheduleToggle.block.less +++ b/awx/ui/client/src/scheduler/scheduleToggle.block.less @@ -25,7 +25,7 @@ } .ScheduleToggle.is-on { - border-color: #337AB7; + border-color: @default-link; background-color: @default-bg; } From ae394fb9b5781674b6226e9e728bd550a0dafef0 Mon Sep 17 00:00:00 2001 From: John Mitchell Date: Tue, 3 May 2016 13:05:49 -0400 Subject: [PATCH 02/32] fixed global colors --- awx/ui/client/src/dashboard/dashboard.block.less | 1 - 1 file changed, 1 deletion(-) diff --git a/awx/ui/client/src/dashboard/dashboard.block.less b/awx/ui/client/src/dashboard/dashboard.block.less index 151286d9f8..75d9525040 100644 --- a/awx/ui/client/src/dashboard/dashboard.block.less +++ b/awx/ui/client/src/dashboard/dashboard.block.less @@ -1,5 +1,4 @@ /** @define Dashboard */ -<<<<<<< HEAD @import "../shared/branding/colors.default.less"; .Dashboard { From fd5edbc125aef5e705f412481f77466836647741 Mon Sep 17 00:00:00 2001 From: John Mitchell Date: Tue, 3 May 2016 13:06:09 -0400 Subject: [PATCH 03/32] fixed grammar of dashboard project sync failure count --- .../client/src/dashboard/counts/dashboard-counts.directive.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/awx/ui/client/src/dashboard/counts/dashboard-counts.directive.js b/awx/ui/client/src/dashboard/counts/dashboard-counts.directive.js index 64c8b3216e..868742154a 100644 --- a/awx/ui/client/src/dashboard/counts/dashboard-counts.directive.js +++ b/awx/ui/client/src/dashboard/counts/dashboard-counts.directive.js @@ -62,7 +62,7 @@ export default { url: "/#/projects/?status=failed", number: scope.data.projects.failed, - label: "Projects Sync Failures", + label: "Project Sync Failures", isFailureCount: true } ], function(val) { return addFailureToCount(val); }); From dcd89aabfcbe82659af81e2cd3ccf6dbb07240cb Mon Sep 17 00:00:00 2001 From: Leigh Johnson Date: Tue, 3 May 2016 13:30:34 -0400 Subject: [PATCH 04/32] update errors/invalid to use @default-err --- awx/ui/client/legacy-styles/ansible-ui.less | 4 ++-- awx/ui/client/src/license/license.block.less | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/awx/ui/client/legacy-styles/ansible-ui.less b/awx/ui/client/legacy-styles/ansible-ui.less index 7f434cbb2c..3396792945 100644 --- a/awx/ui/client/legacy-styles/ansible-ui.less +++ b/awx/ui/client/legacy-styles/ansible-ui.less @@ -627,7 +627,7 @@ dd { /* Outline required fields in Red when there is an error */ .form-control.ng-dirty.ng-invalid, .form-control.ng-dirty.ng-invalid:focus { - border-color: rgba(255, 88, 80, 0.8); + border-color: @default-err; outline: 0; -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 5px rgba(255, 88, 80, 0.6); box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 5px rgba(255, 88, 80, 0.6); @@ -635,7 +635,7 @@ dd { .form-control.ng-dirty.ng-invalid + .select2 .select2-selection, .form-control.ng-dirty.ng-invalid + .select2 .select2-selection:focus { - border-color: rgba(255, 88, 80, 0.8) !important; + border-color: @default-err !important; outline: 0 !important; box-shadow: none !important; } diff --git a/awx/ui/client/src/license/license.block.less b/awx/ui/client/src/license/license.block.less index 5ea5065d6e..40c1b7f07d 100644 --- a/awx/ui/client/src/license/license.block.less +++ b/awx/ui/client/src/license/license.block.less @@ -50,7 +50,7 @@ color: @submit-button-bg; } .License-redText{ - color: #d9534f; + color: @default-err; } .License-fields{ .OnePlusTwo-left--details; From adb4703d456efb91f7f37a8752eda94a4d683871 Mon Sep 17 00:00:00 2001 From: Leigh Johnson Date: Tue, 3 May 2016 14:31:15 -0400 Subject: [PATCH 05/32] remove license input field and add ng-class to default text --- awx/ui/client/src/license/license.block.less | 3 +++ awx/ui/client/src/license/license.controller.js | 2 +- awx/ui/client/src/license/license.partial.html | 4 ++-- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/awx/ui/client/src/license/license.block.less b/awx/ui/client/src/license/license.block.less index 40c1b7f07d..2204d37454 100644 --- a/awx/ui/client/src/license/license.block.less +++ b/awx/ui/client/src/license/license.block.less @@ -13,6 +13,9 @@ .License-field--label{ .OnePlusTwo-left--detailsLabel; } +.License-fileName{ + padding-left: 20px; +} .License-management .CodeMirror-scroll{ min-height: 140px; } diff --git a/awx/ui/client/src/license/license.controller.js b/awx/ui/client/src/license/license.controller.js index 4b26604793..53a6a7746f 100644 --- a/awx/ui/client/src/license/license.controller.js +++ b/awx/ui/client/src/license/license.controller.js @@ -73,7 +73,7 @@ export default return moment().add(days, 'days').calendar(); }; var init = function(){ - $scope.fileName = "Please choose a file..."; + $scope.fileName = "No file selected."; $scope.title = $rootScope.licenseMissing ? "Tower License" : "License Management"; Wait('start'); CheckLicense.get() diff --git a/awx/ui/client/src/license/license.partial.html b/awx/ui/client/src/license/license.partial.html index 7d35cce503..414749c79d 100644 --- a/awx/ui/client/src/license/license.partial.html +++ b/awx/ui/client/src/license/license.partial.html @@ -98,8 +98,8 @@
License File
- Browse... - + Browse + {{fileName}}
End User License Agreement
From 5987d86a4b1ea9e7a0fe14670f2adec8a2b9e301 Mon Sep 17 00:00:00 2001 From: John Mitchell Date: Tue, 3 May 2016 14:48:34 -0400 Subject: [PATCH 06/32] update general styling of first-time license page --- awx/ui/client/src/footer/footer.block.less | 2 +- awx/ui/client/src/license/license.block.less | 29 +++++++++++++++++-- .../client/src/license/license.partial.html | 19 +++++++----- 3 files changed, 40 insertions(+), 10 deletions(-) diff --git a/awx/ui/client/src/footer/footer.block.less b/awx/ui/client/src/footer/footer.block.less index 95ec11463d..3f40c009de 100644 --- a/awx/ui/client/src/footer/footer.block.less +++ b/awx/ui/client/src/footer/footer.block.less @@ -3,7 +3,7 @@ .Footer { height: 40px; - background-color: @default-no-items-bord; + background-color: @default-secondary-bg; color: @default-interface-txt; width: 100%; z-index: 1040; diff --git a/awx/ui/client/src/license/license.block.less b/awx/ui/client/src/license/license.block.less index 2204d37454..6493169a06 100644 --- a/awx/ui/client/src/license/license.block.less +++ b/awx/ui/client/src/license/license.block.less @@ -10,6 +10,13 @@ .License-container{ .OnePlusTwo-container; } + +.License-container--missing { + max-width: 800px; + margin: 0 auto; + padding: 0 20px; +} + .License-field--label{ .OnePlusTwo-left--detailsLabel; } @@ -33,10 +40,22 @@ .License-submit--success.ng-hide{ opacity: 0; } -.License-eula textarea{ + +.License-eulaNotice{ + font-size: 12px; width: 100%; - height: 200px; + max-height: 129px; + padding: 15px; + padding-top: 10px; + margin-bottom: 10px; + border-radius: 4px; + border: 1px solid @login-notice-border; + background-color: @login-notice-bg; + color: @login-notice-text; + overflow-y: scroll; + overflow-x: visible; } + .License-field label{ width: 155px; } @@ -76,9 +95,11 @@ color:@default-bg; } .License-downloadLicenseButton:hover{ + background-color: @default-link-hov !important; color:@default-bg !important; } .License-downloadLicenseButton:focus{ + background-color: @default-link-hov !important; color:@default-bg !important; } .License-submit--container{ @@ -111,3 +132,7 @@ border-top-right-radius: 4px !important; border-bottom-right-radius: 4px !important; } + +.License-detailsGroup { + margin-bottom: 20px; +} diff --git a/awx/ui/client/src/license/license.partial.html b/awx/ui/client/src/license/license.partial.html index 414749c79d..0c109e361a 100644 --- a/awx/ui/client/src/license/license.partial.html +++ b/awx/ui/client/src/license/license.partial.html @@ -1,4 +1,5 @@ -
+
Details
@@ -102,14 +103,18 @@ {{fileName}}
-
End User License Agreement
-
- +
End User License Agreement
-
+
+ {{ license.eula }} +
+
-
I agree to the End User License Agreement
+
From c1069775a40bb5bcf53027498692f4a09c0decd7 Mon Sep 17 00:00:00 2001 From: John Mitchell Date: Tue, 3 May 2016 13:05:49 -0400 Subject: [PATCH 07/32] fixed global colors --- awx/ui/client/src/shared/branding/colors.default.less | 1 + 1 file changed, 1 insertion(+) diff --git a/awx/ui/client/src/shared/branding/colors.default.less b/awx/ui/client/src/shared/branding/colors.default.less index 2e986fdb9f..7ee5f8bc4d 100644 --- a/awx/ui/client/src/shared/branding/colors.default.less +++ b/awx/ui/client/src/shared/branding/colors.default.less @@ -8,6 +8,7 @@ @default-bg: #FFFFFF; // also selected btn txt @default-secondary-bg: #FCFCFC; // page/input field bg, just adds depth @default-tertiary-bg: #FAFAFA; // hover bg, alt-list +<<<<<<< HEAD @default-err: #D9534F; @default-err-hov: #C9302C; @default-succ: #5CB85C; From c982834cbef54327a0114689e97f886f9dd7efeb Mon Sep 17 00:00:00 2001 From: Leigh Johnson Date: Tue, 3 May 2016 15:29:24 -0400 Subject: [PATCH 08/32] fix hover state colors on mobile menu --- awx/ui/client/src/main-menu/main-menu.block.less | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/awx/ui/client/src/main-menu/main-menu.block.less b/awx/ui/client/src/main-menu/main-menu.block.less index 69789c28a3..ee9f2a6115 100644 --- a/awx/ui/client/src/main-menu/main-menu.block.less +++ b/awx/ui/client/src/main-menu/main-menu.block.less @@ -264,7 +264,8 @@ .MainMenu-item:hover, .MainMenu-logo:hover, .MainMenu-item.is-currentRoute { - color: @menu-link; + background-color: @default-tertiary-bg; + color: @default-icon; } // item on From 8e75d1c3ce89404ef1b6eb8f85d2baa99a8d6690 Mon Sep 17 00:00:00 2001 From: Leigh Johnson Date: Tue, 3 May 2016 15:38:31 -0400 Subject: [PATCH 09/32] fix empty list text on Dashboard > Hosts, change border color for no results found --- awx/ui/client/legacy-styles/lists.less | 2 +- awx/ui/client/src/dashboard/hosts/dashboard-hosts.list.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/awx/ui/client/legacy-styles/lists.less b/awx/ui/client/legacy-styles/lists.less index 452c2104ea..a7685c38e7 100644 --- a/awx/ui/client/legacy-styles/lists.less +++ b/awx/ui/client/legacy-styles/lists.less @@ -313,7 +313,7 @@ table, tbody { height: 200px; border-radius: 5px; border: 1px solid @list-no-items-bord; - background-color: @list-no-items-bg; + background-color: @default-no-items-bord; color: @list-no-items-txt; text-transform: uppercase; } diff --git a/awx/ui/client/src/dashboard/hosts/dashboard-hosts.list.js b/awx/ui/client/src/dashboard/hosts/dashboard-hosts.list.js index 63ec02e404..7ec32008c8 100644 --- a/awx/ui/client/src/dashboard/hosts/dashboard-hosts.list.js +++ b/awx/ui/client/src/dashboard/hosts/dashboard-hosts.list.js @@ -15,7 +15,7 @@ export default function(){ index: false, hover: true, well: true, - emptyListText: 'NO ACTIVE FAILURES FOUND', + emptyListText: 'NO HOSTS FOUND', fields: { status: { basePath: 'unified_jobs', From f5232953ac0831bc887f0a3937b2ce5537905465 Mon Sep 17 00:00:00 2001 From: Leigh Johnson Date: Tue, 3 May 2016 16:33:24 -0400 Subject: [PATCH 10/32] fix related set active color && remove disable cursor in anticipation of #1796 --- awx/ui/client/legacy-styles/forms.less | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/awx/ui/client/legacy-styles/forms.less b/awx/ui/client/legacy-styles/forms.less index 3a16e2869c..f5c1db9146 100644 --- a/awx/ui/client/legacy-styles/forms.less +++ b/awx/ui/client/legacy-styles/forms.less @@ -129,13 +129,12 @@ .Form-tab.is-selected { color: @btn-txt-sel; - background-color: @btn-bg-sel; - border-color: @btn-bord-sel; + background-color: @default-icon-hov; + border-color: @default-icon-hov; } .Form-tab--disabled { opacity: 0.4; - cursor: not-allowed !important; } .Form-tab--disabled:hover { From c7f0de41e93be7800553127b4fa78f42a36fc17d Mon Sep 17 00:00:00 2001 From: Jared Tabor Date: Tue, 3 May 2016 13:46:16 -0700 Subject: [PATCH 11/32] License Page UX Audit Changes --- awx/ui/client/src/app.js | 1 + awx/ui/client/src/license/license.block.less | 3 +++ .../client/src/license/license.partial.html | 20 +++++++++---------- 3 files changed, 14 insertions(+), 10 deletions(-) diff --git a/awx/ui/client/src/app.js b/awx/ui/client/src/app.js index dd42857423..020fcf5624 100644 --- a/awx/ui/client/src/app.js +++ b/awx/ui/client/src/app.js @@ -110,6 +110,7 @@ var tower = angular.module('Tower', [ JobTemplates.name, portalMode.name, search.name, + AdminsList.name, 'ngToast', 'templates', 'Utilities', diff --git a/awx/ui/client/src/license/license.block.less b/awx/ui/client/src/license/license.block.less index 6493169a06..ff36d71fb7 100644 --- a/awx/ui/client/src/license/license.block.less +++ b/awx/ui/client/src/license/license.block.less @@ -61,6 +61,7 @@ } .License-field--content{ .OnePlusTwo-left--detailsContent; + text-transform: capitalize; } .License-field{ .OnePlusTwo-left--detailsRow; @@ -70,9 +71,11 @@ } .License-greenText{ color: @submit-button-bg; + padding-right: 10px; } .License-redText{ color: @default-err; + padding-right: 10px; } .License-fields{ .OnePlusTwo-left--details; diff --git a/awx/ui/client/src/license/license.partial.html b/awx/ui/client/src/license/license.partial.html index 0c109e361a..cf840ae6a5 100644 --- a/awx/ui/client/src/license/license.partial.html +++ b/awx/ui/client/src/license/license.partial.html @@ -7,32 +7,32 @@
License
- Valid - Invalid + Valid + Invalid
Version
- {{license.version || "No result found"}} + {{license.version}}
License Type
- {{license.license_info.license_type || "No result found"}} + {{license.license_info.license_type}}
Subscription
- {{license.license_info.subscription_name || "No result found"}} + {{license.license_info.subscription_name}}
License Key
- {{license.license_info.license_key || "No result found"}} + {{license.license_info.license_key}}
@@ -50,24 +50,24 @@
Hosts Available
- {{license.license_info.available_instances || "No result found"}} + {{license.license_info.available_instances}}
Hosts Used
- {{license.license_info.current_instances || "No result found"}} + {{license.license_info.current_instances}}
Hosts Remaining
- {{license.license_info.free_instances || "No result found"}} + {{license.license_info.free_instances}}
If you are ready to upgrade, please contact us by clicking the button below
- +
From 4a2580f7edc87c05db0d915be8d2c8e54e2f4a9a Mon Sep 17 00:00:00 2001 From: Jared Tabor Date: Tue, 3 May 2016 14:24:48 -0700 Subject: [PATCH 12/32] Removing stale Admin.js from /controllers and /lists These were used for the /organizations/:id/admin route, which has been updated in 3.0. These files are no longer needed. --- awx/ui/client/src/app.js | 3 -- awx/ui/client/src/controllers/Admins.js | 46 ------------------------- awx/ui/client/src/lists/Admins.js | 37 -------------------- 3 files changed, 86 deletions(-) delete mode 100644 awx/ui/client/src/controllers/Admins.js delete mode 100644 awx/ui/client/src/lists/Admins.js diff --git a/awx/ui/client/src/app.js b/awx/ui/client/src/app.js index 020fcf5624..cd107a5590 100644 --- a/awx/ui/client/src/app.js +++ b/awx/ui/client/src/app.js @@ -55,7 +55,6 @@ import search from './search/main'; import {ProjectsList, ProjectsAdd, ProjectsEdit} from './controllers/Projects'; import OrganizationsList from './organizations/list/organizations-list.controller'; import OrganizationsAdd from './organizations/add/organizations-add.controller'; -import {AdminsList} from './controllers/Admins'; import {UsersList, UsersAdd, UsersEdit} from './controllers/Users'; import {TeamsList, TeamsAdd, TeamsEdit} from './controllers/Teams'; @@ -110,7 +109,6 @@ var tower = angular.module('Tower', [ JobTemplates.name, portalMode.name, search.name, - AdminsList.name, 'ngToast', 'templates', 'Utilities', @@ -127,7 +125,6 @@ var tower = angular.module('Tower', [ 'SearchHelper', 'PaginationHelpers', 'RefreshHelper', - 'AdminListDefinition', 'AWDirectives', 'InventoriesListDefinition', 'InventoryFormDefinition', diff --git a/awx/ui/client/src/controllers/Admins.js b/awx/ui/client/src/controllers/Admins.js deleted file mode 100644 index ffc298532f..0000000000 --- a/awx/ui/client/src/controllers/Admins.js +++ /dev/null @@ -1,46 +0,0 @@ -/************************************************* - * Copyright (c) 2015 Ansible, Inc. - * - * All Rights Reserved - *************************************************/ - - /** - * @ngdoc overview - * @name controllers - * @description These are all the controllers that are used throughout the application - * -*/ -/** - * @ngdoc function - * @name controllers.function:Admins - * @description This controller's for administrators - * Admins.js - * - * Controller functions for ading Admins to an Organization. - * -*/ - - -export function AdminsList($scope, $rootScope, $location, $log, $stateParams, Rest, Alert, AdminList, GenerateList, - Prompt, SearchInit, PaginateInit, ReturnToCaller, GetBasePath, SelectionInit) { - - var list = AdminList, - defaultUrl = GetBasePath('organizations') + $stateParams.organization_id + '/users/', - generator = GenerateList, - mode = 'select', - url = GetBasePath('organizations') + $stateParams.organization_id + '/admins/'; - - generator.inject(AdminList, { mode: mode, scope: $scope }); - - SelectionInit({ scope: $scope, list: list, url: url, returnToCaller: 1 }); - - SearchInit({ scope: $scope, set: 'admins', list: list, url: defaultUrl }); - - PaginateInit({ scope: $scope, list: list, url: defaultUrl }); - - $scope.search(list.iterator); -} - -AdminsList.$inject = ['$scope', '$rootScope', '$location', '$log', '$stateParams', 'Rest', 'Alert', 'AdminList', 'generateList', - 'Prompt', 'SearchInit', 'PaginateInit', 'ReturnToCaller', 'GetBasePath', 'SelectionInit' -]; diff --git a/awx/ui/client/src/lists/Admins.js b/awx/ui/client/src/lists/Admins.js deleted file mode 100644 index e1c49772f0..0000000000 --- a/awx/ui/client/src/lists/Admins.js +++ /dev/null @@ -1,37 +0,0 @@ -/************************************************* - * Copyright (c) 2015 Ansible, Inc. - * - * All Rights Reserved - *************************************************/ - -export default - angular.module('AdminListDefinition', []) - .value('AdminList', { - - name: 'admins', - iterator: 'admin', - selectTitle: 'Add Administrators', - editTitle: 'Admins', - selectInstructions: '

Select existing users by clicking each user or checking the related checkbox. When finished, click the blue ' + - 'Select button, located bottom right.

', - base: 'users', - index: false, - hover: true, - - fields: { - username: { - key: true, - label: 'Username' - }, - first_name: { - label: 'First Name' - }, - last_name: { - label: 'Last Name' - } - }, - - actions: {}, - - fieldActions: {} - }); From c4f6d018ed48fdf9fa142c2ac7b75168d54b691d Mon Sep 17 00:00:00 2001 From: Jared Tabor Date: Tue, 3 May 2016 14:30:58 -0700 Subject: [PATCH 13/32] removing admins list from list imports --- awx/ui/client/src/lists.js | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/awx/ui/client/src/lists.js b/awx/ui/client/src/lists.js index 925f57bd65..f36cd3f687 100644 --- a/awx/ui/client/src/lists.js +++ b/awx/ui/client/src/lists.js @@ -4,7 +4,6 @@ * All Rights Reserved *************************************************/ -import Admins from "./lists/Admins"; import CloudCredentials from "./lists/CloudCredentials"; import CompletedJobs from "./lists/CompletedJobs"; import AllJobs from "./lists/AllJobs"; @@ -31,8 +30,7 @@ import Teams from "./lists/Teams"; import Users from "./lists/Users"; export - { Admins, - CloudCredentials, + { CloudCredentials, CompletedJobs, AllJobs, Credentials, From b6222e58576e024172b6a709a4296687337abd77 Mon Sep 17 00:00:00 2001 From: Jared Tabor Date: Tue, 3 May 2016 14:38:06 -0700 Subject: [PATCH 14/32] Making "Request License" btn-primary to match other buttons --- awx/ui/client/src/license/license.block.less | 10 ---------- awx/ui/client/src/license/license.partial.html | 2 +- 2 files changed, 1 insertion(+), 11 deletions(-) diff --git a/awx/ui/client/src/license/license.block.less b/awx/ui/client/src/license/license.block.less index ff36d71fb7..6f36784152 100644 --- a/awx/ui/client/src/license/license.block.less +++ b/awx/ui/client/src/license/license.block.less @@ -93,17 +93,7 @@ height: auto; } .License-downloadLicenseButton{ - background-color: @default-link !important; margin-bottom: 10px; - color:@default-bg; -} -.License-downloadLicenseButton:hover{ - background-color: @default-link-hov !important; - color:@default-bg !important; -} -.License-downloadLicenseButton:focus{ - background-color: @default-link-hov !important; - color:@default-bg !important; } .License-submit--container{ height: 33px; diff --git a/awx/ui/client/src/license/license.partial.html b/awx/ui/client/src/license/license.partial.html index cf840ae6a5..956d443ef8 100644 --- a/awx/ui/client/src/license/license.partial.html +++ b/awx/ui/client/src/license/license.partial.html @@ -83,7 +83,7 @@
- From 1f0d88c7abdd87b2841acb7c2f5a4ff089a568d6 Mon Sep 17 00:00:00 2001 From: Jared Tabor Date: Tue, 3 May 2016 16:17:10 -0700 Subject: [PATCH 15/32] UX feedback on Activity Streams As well as tags and some select2 --- awx/ui/client/legacy-styles/ansible-ui.less | 4 ++-- awx/ui/client/legacy-styles/forms.less | 2 +- awx/ui/client/legacy-styles/lists.less | 3 +-- .../src/activity-stream/activitystream.block.less | 9 +++++++++ .../streamDetailModal/streamDetailModal.block.less | 6 +++++- .../streamDetailModal/streamDetailModal.partial.html | 4 ++-- awx/ui/client/src/lists/Streams.js | 8 ++++---- awx/ui/client/src/search/tagSearch.block.less | 10 +++++----- 8 files changed, 29 insertions(+), 17 deletions(-) create mode 100644 awx/ui/client/src/activity-stream/activitystream.block.less diff --git a/awx/ui/client/legacy-styles/ansible-ui.less b/awx/ui/client/legacy-styles/ansible-ui.less index 3396792945..287e92b690 100644 --- a/awx/ui/client/legacy-styles/ansible-ui.less +++ b/awx/ui/client/legacy-styles/ansible-ui.less @@ -146,7 +146,7 @@ a:focus { /* Bring primary (blue) buttons in line with link colors */ .btn-primary { - background-color: @blue-link; + background-color: @default-link; } .btn-primary:hover { @@ -2012,7 +2012,7 @@ tr td button i { .form-control + .select2 .select2-selection { border-color: @d7grey !important; - background-color: #f6f6f6 !important; + background-color: #fcfcfc !important; color: @default-data-txt !important; transition: border-color 0.3s !important; box-shadow: none !important; diff --git a/awx/ui/client/legacy-styles/forms.less b/awx/ui/client/legacy-styles/forms.less index f5c1db9146..79e7c5e5f5 100644 --- a/awx/ui/client/legacy-styles/forms.less +++ b/awx/ui/client/legacy-styles/forms.less @@ -272,7 +272,7 @@ } .select2-container--default .select2-results__option[aria-selected=true]{ - background-color: @field-border !important; + background-color: @default-white-button-bord !important; } .select2-container--default .select2-selection--single .select2-selection__arrow b{ diff --git a/awx/ui/client/legacy-styles/lists.less b/awx/ui/client/legacy-styles/lists.less index a7685c38e7..49e0e840f7 100644 --- a/awx/ui/client/legacy-styles/lists.less +++ b/awx/ui/client/legacy-styles/lists.less @@ -181,7 +181,6 @@ table, tbody { .List-actionHolder { justify-content: flex-end; display: flex; - height: 34px; } .List-actions { @@ -189,7 +188,7 @@ table, tbody { } .List-auxAction + .List-actions { - margin-left: 10px; + margin-left: 20px; } .List-auxAction { diff --git a/awx/ui/client/src/activity-stream/activitystream.block.less b/awx/ui/client/src/activity-stream/activitystream.block.less new file mode 100644 index 0000000000..2f49163095 --- /dev/null +++ b/awx/ui/client/src/activity-stream/activitystream.block.less @@ -0,0 +1,9 @@ +.ActivityStream-refreshButton{ + height: 30px; + padding-top: 0px; + padding-bottom: 0px; +} + +.ActivityStream-eventColumnHeader:hover{ + cursor: auto; +} diff --git a/awx/ui/client/src/activity-stream/streamDetailModal/streamDetailModal.block.less b/awx/ui/client/src/activity-stream/streamDetailModal/streamDetailModal.block.less index ae6de6cdae..1cd280225e 100644 --- a/awx/ui/client/src/activity-stream/streamDetailModal/streamDetailModal.block.less +++ b/awx/ui/client/src/activity-stream/streamDetailModal/streamDetailModal.block.less @@ -25,9 +25,13 @@ margin-bottom: 5px; } +.StreamDetail-actions{ + word-break: break-all; +} + .StreamDetail-changes { border: none; - background-color: @default-secondary-bg; + background-color: @default-no-items-bord; margin-bottom: 0; max-height: 200px; overflow: scroll; diff --git a/awx/ui/client/src/activity-stream/streamDetailModal/streamDetailModal.partial.html b/awx/ui/client/src/activity-stream/streamDetailModal/streamDetailModal.partial.html index 34c322c72b..4806a2eb4d 100644 --- a/awx/ui/client/src/activity-stream/streamDetailModal/streamDetailModal.partial.html +++ b/awx/ui/client/src/activity-stream/streamDetailModal/streamDetailModal.partial.html @@ -14,7 +14,7 @@
ACTION
-
+
CHANGES
@@ -22,7 +22,7 @@
- OK + OK
diff --git a/awx/ui/client/src/lists/Streams.js b/awx/ui/client/src/lists/Streams.js index 4cf443c0b8..0842019c4c 100644 --- a/awx/ui/client/src/lists/Streams.js +++ b/awx/ui/client/src/lists/Streams.js @@ -24,7 +24,7 @@ export default fields: { timestamp: { - label: 'Event Time', + label: 'Time', key: true, desc: true, noLink: true, @@ -44,11 +44,11 @@ export default columnClass: 'col-lg-3 col-md-3 col-sm-3 col-xs-3' }, description: { - label: 'Action', + label: 'Event', ngBindHtml: 'activity.description', nosort: true, searchable: false, - columnClass: 'col-lg-5 col-md-6 col-sm-4 col-xs-4' + columnClass: 'ActivityStream-eventColumnHeader col-lg-5 col-md-6 col-sm-4 col-xs-4' }, actor: { label: 'System event', @@ -263,7 +263,7 @@ export default id: 'activity-stream-refresh-btn', awToolTip: "Refresh the page", ngClick: "refreshStream()", - actionClass: 'btn List-buttonDefault', + actionClass: 'btn List-buttonDefault ActivityStream-refreshButton', buttonContent: 'REFRESH' } }, diff --git a/awx/ui/client/src/search/tagSearch.block.less b/awx/ui/client/src/search/tagSearch.block.less index 06bc298d42..80cccde89d 100644 --- a/awx/ui/client/src/search/tagSearch.block.less +++ b/awx/ui/client/src/search/tagSearch.block.less @@ -174,7 +174,6 @@ border-radius: 5px; padding: 2px 10px; margin: 4px 0px; - border: 1px solid @d7grey; font-size: 12px; color: @default-interface-txt; text-transform: uppercase; @@ -192,11 +191,13 @@ border-bottom-right-radius: 0px; border-right: 0; max-wdith: ~"calc(100% - 23px)"; + background-color: @default-link; + color: white; } .TagSearch-deleteContainer { - border: 1px solid @d7grey; - border-left-color: @default-bg; + background-color: @default-link!important; + color: white; background-color: @default-bg; border-top-right-radius: 5px; border-bottom-right-radius: 5px; @@ -210,7 +211,6 @@ .TagSearch-tagDelete { font-size: 13px; - color: @default-icon; } .TagSearch-name { @@ -224,7 +224,7 @@ .TagSearch-deleteContainer:hover, { border-color: @default-err; - background-color: @default-err; + background-color: @default-err!important; } .TagSearch-deleteContainer:hover > .TagSearch-tagDelete { From 4463a4827e2bb52b7aadf2162687f8515fcd541e Mon Sep 17 00:00:00 2001 From: Ken Hoes Date: Wed, 4 May 2016 11:02:12 -0400 Subject: [PATCH 16/32] Dashboard updates --- awx/static/favicon.ico | Bin 6518 -> 1150 bytes awx/ui/client/assets/favicon.ico | Bin 5430 -> 1150 bytes awx/ui/client/legacy-styles/ansible-ui.less | 1 + .../legacy-styles/jquery-ui-overrides.less | 2 + .../counts/dashboard-counts.block.less | 46 ++++++ .../client/src/dashboard/dashboard.block.less | 18 +++ .../graphs/dashboard-graphs.partial.html | 132 +++++++++--------- .../dashboard/lists/dashboard-list.block.less | 2 +- .../job-templates-list.partial.html | 6 +- .../lists/jobs/jobs-list.partial.html | 6 +- .../src/smart-status/smart-status.block.less | 1 + 11 files changed, 143 insertions(+), 71 deletions(-) diff --git a/awx/static/favicon.ico b/awx/static/favicon.ico index 31b759caf9efd7d8b9130d6df61d9e62fccc36d0..5c6280873a3db0a72a05241afde4a13eae34d2ec 100644 GIT binary patch literal 1150 zcmaiz%WG3X6vijE;!21h?$l~pO&_$h#X@zHjV{!M_!qcQgf6=9MHh-9MXivk_(H^P zMJNUT0WBh}NppQ*d{m_|y|F&JFj1ir+t2U2&0NM1knp=_=FIs{X3m^3Ccer46YgJ!F`8WApCbZH_r=O4a&3J6~cpzkq>b zGuYPd;mJe^eTUu!=W}B@R)4&$@}Y%w9KH7q!`z2-6OW7N>F~muI`J8fZ#(m_jt37+ z2X)Zd&kyEn{kLM1BtgEoIaJ5)HV>2Bx9|VPuEdMr9^Dv@XNh{fo?Ia6Pg|Fujz@Tx z$ss@J3wMp3{I%7^pLf3x>ij_v%ztNlmj{pDw literal 6518 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 diff --git a/awx/ui/client/assets/favicon.ico b/awx/ui/client/assets/favicon.ico index f53629b961508ea2f031df98bdabefd57143a620..41132fb823fe65afe5e9f967cd9b0c690f188e01 100644 GIT binary patch literal 1150 zcmaiz+e=hY6vmfm`6^Kck!6n7Skc9xkidrmeb652PbjG9At<^K^blAikr_b{^J>(Th=Sk9blij3@6qMS|vz)erd?r|g zkBqmIWyI>#t|0eGu5Rt3TIBowFz*hrW9XVY2{x>Yp<(j~Hr2(8=2u;`CWfu`2^-fj zE|F5wOui82#L?3|jmsC`+qqD?CWdVr6S&beh2Gnr+_9&r(OUJYR*6)3IDKLq{>UtL zHTbAm?V+jhIUe=RV17Pl#t!XI>pWrg+Sj(TwWxopppAQVG1634>_Gq`poz>z~^7#_-C=XSqPQzw6n?R$=2sN>;-Z;*&*G592n zs~wZ5{daE7y+zu{H+KxJquv9L^M06`L(85QrY>#{+j>v;l5%pB6zxsxc;@7|Id{Dm z;ePsh=geE6T}ApyQJ&tpde$No&(ZHAmBf7mI)<*}I|*y7ulwvGD~ZwChnV+uFRest js^_9-t4xx+q=hUcRwk)(k%3Z?3nhine;b;s8rA*<4!;8` literal 5430 zcmc&%txhCC5T3oPL@W-u>T(GNfd#c>u%; z9sq$ru0S9Vec#vD-=wDLne9C;p^~D1>gTJjuC7^%qEmb;dc6YFFMf85;yY*kzw6)F z|AoCDSW<=C9sjo|2H20uIoGia`6_q_o`PqAIp^N0)s5$npMd9J*T9sW#CBX`f81bG z^R=?F!u8ntpikO9KR>&NhliTJe6Fpnxw0(X%gc-8J`TuvULW(>*%{nAx3#q;9Y1nS z-=zEdd&y{{T=_j>yuZJ@o0}WyxWmIk_xASYZTaWm;GmMhUU{zeZf|eh>+7rQ^?L5= z>dM>AW-}i?I^3^%2p%fs>vzlv%s7u-!D=R|NqYHGkx#?tUfdHy$KtJ6kqNL z(>?G-;1VNQ>%Ck*%jm&BF_|ly^R_v4KOGBvY=U{dHmo)oZ8w)Wt8`(~%?N{==o zerK#~(VX$x_~|FI`B0OPmsW@ITZ-}+`>WRDF|ikMGgq~f%9Eq#rwfs_p~p(Fezo!UL7>M(WJ z!sd8-dfMol_=qE!d&N8&jVgC>9a@=`?ESapEchq(g|Jd1zqOW_Yu*EE$`Y~m_xJsI zwZEul0(L7tW3pJRG3LP%*ZNJRH&1!Sn;~|YI=9_p{WcNLsJgUz@m*PeW=`yd_|&)O zQY>+8*`AfERfDUVB=*Am(~ejo-gW$@nFA5!39Qr}v9s{$pMFKkxo~WJd;{8FFcN!j zfllSi<~Pp0y&u(LhF{+UGxU56tY;DNWM}Ix(d#Qc>1%{9^}l5Qm7X1Kk5>)Y_sJe$ z^;_n)|7PET{U-1}Y=5#jX~9)|KKCXEWrmHnwRLFwZCn#A{z~C$gl_HkM~khqn6R%X zeiJP|KK%ZGlMeLx9+aQP(dJy>yo(%LVi2o|A)n;69t{hS!=o6GF= zS=fpLF)X|be*c+=jI+1qT$u5Q7{2WPFB=QuV1LN&Q9-x%zOBE{%tI`^8*&*~>!mSa H|E2T?(AG#m diff --git a/awx/ui/client/legacy-styles/ansible-ui.less b/awx/ui/client/legacy-styles/ansible-ui.less index 287e92b690..d9a319a298 100644 --- a/awx/ui/client/legacy-styles/ansible-ui.less +++ b/awx/ui/client/legacy-styles/ansible-ui.less @@ -1891,6 +1891,7 @@ tr td button i { .nvtooltip { border-radius: 4px; + padding: 10px; } .nvtooltip td.value { diff --git a/awx/ui/client/legacy-styles/jquery-ui-overrides.less b/awx/ui/client/legacy-styles/jquery-ui-overrides.less index f9748fc807..826b77e711 100644 --- a/awx/ui/client/legacy-styles/jquery-ui-overrides.less +++ b/awx/ui/client/legacy-styles/jquery-ui-overrides.less @@ -8,6 +8,7 @@ * */ +@import "awx/ui/client/src/shared/branding/colors.default.less"; table.ui-datepicker-calendar { background-color: @well; @@ -174,6 +175,7 @@ table.ui-datepicker-calendar { .dropdown-menu>li>a { color: @black; + color: @default-interface-txt } .pagination .active { diff --git a/awx/ui/client/src/dashboard/counts/dashboard-counts.block.less b/awx/ui/client/src/dashboard/counts/dashboard-counts.block.less index a29476fd90..cd563cfff3 100644 --- a/awx/ui/client/src/dashboard/counts/dashboard-counts.block.less +++ b/awx/ui/client/src/dashboard/counts/dashboard-counts.block.less @@ -42,6 +42,52 @@ } } +@media only screen and (max-width: 360px) { + .DashboardCounts-label { + font-size: 10px; + } + + .DashboardList-headerText { + white-space: normal; + line-height: 22px; + padding-top: 10px; + } + + .DashboardList-timeCell { + white-space: normal; + } +} + +.DashboardGraphs-filteringDropdowns { + display: inherit; +} + +@media only screen and (max-width: 540px) { + .DashboardGraphs-filteringDropdowns { + float: left; + width: 100%; + } + + .DashboardGraphs-filterLabel { + width: 50%; + float:left; + } + + .DashboardGraphs-periodDropdown { + width: 50%; + float: left; + } + + .DashboardList-container { + th { + width: 25%; + white-space: nowrap; + } + } +} + + + .DashboardCounts-buttonStyle:hover { background-color: @db-count-succ; border-color: @db-count-succ; diff --git a/awx/ui/client/src/dashboard/dashboard.block.less b/awx/ui/client/src/dashboard/dashboard.block.less index 75d9525040..286ee0c406 100644 --- a/awx/ui/client/src/dashboard/dashboard.block.less +++ b/awx/ui/client/src/dashboard/dashboard.block.less @@ -18,6 +18,24 @@ width: 100%; } +.DashboardGraphs-filterDropdownItems { + li > a { + color: @default-interface-txt; + } +} + +#status-dropdown + ul.dropdown-menu { + margin-left: -96px; +} + +#type-dropdown + ul.dropdown-menu { + margin-left: -95px; +} + +#period-dropdown + ul.dropdown-menu { + margin-left: -40px; +} + .Dashboard-list { border: 1px solid @default-border; border-radius: 5px; diff --git a/awx/ui/client/src/dashboard/graphs/dashboard-graphs.partial.html b/awx/ui/client/src/dashboard/graphs/dashboard-graphs.partial.html index 663a53b8ff..62e8ffe02d 100644 --- a/awx/ui/client/src/dashboard/graphs/dashboard-graphs.partial.html +++ b/awx/ui/client/src/dashboard/graphs/dashboard-graphs.partial.html @@ -4,74 +4,80 @@ JOB STATUS
-
Period
-
- - Past Month - - +
+
Period
+
+ + Past Month + + +
-
Job Type
-
+
+
Job Type
+
- + + All + + + +
+
+
+
View
+
+ All - -
-
View
-
- - All - - - + +
diff --git a/awx/ui/client/src/dashboard/lists/dashboard-list.block.less b/awx/ui/client/src/dashboard/lists/dashboard-list.block.less index 4c25e4d4ad..bad3b06e96 100644 --- a/awx/ui/client/src/dashboard/lists/dashboard-list.block.less +++ b/awx/ui/client/src/dashboard/lists/dashboard-list.block.less @@ -35,7 +35,7 @@ color: @btn-txt; background-color: @btn-bg; font-size: 12px; - border: 1px solid @btn-bord; + border: 1px solid @default-icon-hov; border-radius: 5px; margin-right: 15px; margin-top: 10px; diff --git a/awx/ui/client/src/dashboard/lists/job-templates/job-templates-list.partial.html b/awx/ui/client/src/dashboard/lists/job-templates/job-templates-list.partial.html index 103de983c9..da60bce8cf 100644 --- a/awx/ui/client/src/dashboard/lists/job-templates/job-templates-list.partial.html +++ b/awx/ui/client/src/dashboard/lists/job-templates/job-templates-list.partial.html @@ -10,10 +10,8 @@
-
+ Title - Activity @@ -53,7 +51,7 @@
-

It doesn't seem like you have used any currently available job templates.
+

No job templates were recently used.
You can create a job template here.

diff --git a/awx/ui/client/src/dashboard/lists/jobs/jobs-list.partial.html b/awx/ui/client/src/dashboard/lists/jobs/jobs-list.partial.html index 86235f700f..a728d64d2e 100644 --- a/awx/ui/client/src/dashboard/lists/jobs/jobs-list.partial.html +++ b/awx/ui/client/src/dashboard/lists/jobs/jobs-list.partial.html @@ -10,7 +10,7 @@
- +

- RECENT JOB RUNS + RECENTLY RUN JOBS

-

It doesn't seem like you have any recent job runs.

+

No jobs were recently run.

diff --git a/awx/ui/client/src/smart-status/smart-status.block.less b/awx/ui/client/src/smart-status/smart-status.block.less index fdb80aaa65..92b5244e4f 100644 --- a/awx/ui/client/src/smart-status/smart-status.block.less +++ b/awx/ui/client/src/smart-status/smart-status.block.less @@ -35,6 +35,7 @@ text-align: left; max-width: 250px; padding: 10px; + line-height: 22px; } .SmartStatus-tooltip--success{ From 0f77e77cf33ba104966fa62c6f8c47b5e33453a2 Mon Sep 17 00:00:00 2001 From: Ken Hoes Date: Wed, 4 May 2016 11:07:57 -0400 Subject: [PATCH 17/32] Reversing back to old favicon --- awx/static/favicon.ico | Bin 1150 -> 6518 bytes awx/ui/client/assets/favicon.ico | Bin 1150 -> 6518 bytes 2 files changed, 0 insertions(+), 0 deletions(-) diff --git a/awx/static/favicon.ico b/awx/static/favicon.ico index 5c6280873a3db0a72a05241afde4a13eae34d2ec..31b759caf9efd7d8b9130d6df61d9e62fccc36d0 100644 GIT binary patch literal 6518 zcmeHKNlaBq6n#tr4uBDds31-aYSMHXVw8npp~h9m#Ek<+d*#x^jXPr^3*0t?-8dyG zYNQnw&Bmc2p&bAdqXsc9G$!%^!3H$Q|9q_1=iILQQanBy*ZPu5Ro%MxoLjf1`#dkn zOZIYdJk$kVQJUxd;CWs_f$isd-Y<|9K?W6Q{4Yo4d63WWr8x4fGF1KRY|yPfkwu)6&wUz{a09Z=TOF==_F$hQ&#>bp~`>z~NID zB{p~N+zHf^EK8OwnZS6AV;1)>w9`@KBQF~M{Q2`^TefV8lOKJGu)`DAFS{k1< zYnI?x8w`16^v&wTySlpkTeohBE%c?vn7M!dzIpcS8TIHF=kf`48E|TW>91I^LU6BM zy=q2AMof8mx!CU9xzqIY^cdgw&Aof~#23shnv;`5tZLYI5pU_zrNlKGHf%71gM;SG znKS0lp+jb1V8DO%>Xmu-?wvV$^r+ZlPCADU*uO>bGcz+8C*f>qX)*8Lzc>B;{pS4n z^QN(}(Y$!^LdM9kXwjlLIbqjNd#)4ulQvf7;I9WwJRUa}FJ2Uz-rinw<;oRl7Znw; zj?>24ccrGLN?Z_kgII`OcXzkBapQ(LQF+3DJNVXY+O$dJ`T6qW1orpCN^^Tu%QH*ek)*_t(LSW`Dj8`yH)%d9g^WsCZOc69da*~F6l zi$3QYg{_e7aW_<}P)KTr(y$d{g;E;X=Z-$VY1I0%AeKEkc zwJW27{ahQBeRDPM$pVye6yB%u;ST+ZkN01)qrV*MyAScML*0t<9PJSnw0kJCWBXvU z+_58u-ldNCvrYF#F9z-@ls?^uU#j6tA8o);?6A0)j(A#A_fIA;PNIw{AKH^Ba#m2s zQMhke*jD)`M}G|RDllYP7R8=M8X7NzU8jQ+v-n13tRdr>lA?0kr!O%_)&cy&5J%Vt z^{o`~i&*>#v^h6&P2saV0l(X)E$mn%F18;5VaW_W=-L!I+)=a*->?M>7MQH8EW^Ib z6K;b??nBCi^_lCICTf26x^7&0oP3FUg5AsfO zjQq$A=tJDjaSZa{Y=ZN5E0;aX`RC>330_rImArM#GmalWF0z7x0$B%Q!v|yEZt<_P zvop|t^5lv7WVkNW=lm?!AL#STgG}xg9pjw1e=sIR^PKj7+NICAa4&G3HRcr+74oLj zPc7Be)uK;-iK*+$+U~_X)D>3FyG7QN`<(OA7@RwIPB2GDN6oHXy9AT@1oh}+Wo4z| z7{Ln$Kvz85?{!T_9@FB#Gd2C)wylozTFHB4GC^TLxYTIY%X8E zEOK%`efpGno%EZVn?#TMmvgt=Q(^!a^YJ!~i|VkZ4P&giA9Gi7FmF=s_V)IGn>pFB zW5=Zb@#9Ccckf=&LvAEBIK&5cu9*KFl;>8)yUO)b>~vorK73emNBVH~>{;{p@nhi{ zA0IdM_4T65T$RULaKMa>jftFbpuXn4I(K4Qu1Q<}I}<<0X-AyG!a}LJpUKPe=+PsyapOjj zQ>XFIMv=dK`7)3(Z+1A{cECSV{51}Yfu3FN$G*Nk;o%yPmocXN_3PIn=UJhgGWxGL zTHATM@lUw_9DO-wJj2Aje*JndPmPP-QNzQ-X6x3ifnV;vcktZxzXN%~^QZc(5hIx= z`FHQ$ZMeU=2D;7LDSaOCcf}&&^H#{ zFAk@>_k;u7z2rvWf6}z~Cu~bxy^Gl9KIa;6-mL5D>V#YOM54WCF~jcu z270D1HC!SuKRFY{#l^zEY}qoo^TYm!xcUD6NMd}F17Lhg{t>q4e4rb=3EQ@9V_qQq z&CSg+X8&Uoo;!=D>#O+(^PhzI*Gw@Wj^-byPoI{%cE^q#!msiKzH=XrTg-6&#TX>Y zKgYv3?DH%#7QB}k4=p@%Y;!Duop8f8QT_=t`7|G8{;l~4b3u8R+<5RT@J-;|$G1Jq z?dXQ{@1H|lwi{IHL-_wgaNtXDcF|@``9?^t&)V|x9TUGD8Dk#Ky93ftLw!i}|HatK zzYS{s6ESCEVO#!@l+*h1wf|r0iu%BQG2&g%wR5pQ*QPG~VSX9pxM;hW#QoA2{2N%s reBkZ}F8{y(Mq%zS%)&Mb-x9gcp`Y)7yJyT1e{X(|!1oAz>k;@5pB}e3 literal 1150 zcmaiz%WG3X6vijE;!21h?$l~pO&_$h#X@zHjV{!M_!qcQgf6=9MHh-9MXivk_(H^P zMJNUT0WBh}NppQ*d{m_|y|F&JFj1ir+t2U2&0NM1knp=_=FIs{X3m^3Ccer46YgJ!F`8WApCbZH_r=O4a&3J6~cpzkq>b zGuYPd;mJe^eTUu!=W}B@R)4&$@}Y%w9KH7q!`z2-6OW7N>F~muI`J8fZ#(m_jt37+ z2X)Zd&kyEn{kLM1BtgEoIaJ5)HV>2Bx9|VPuEdMr9^Dv@XNh{fo?Ia6Pg|Fujz@Tx z$ss@J3wMp3{I%7^pLf3x>ij_v%ztNlmj{pDw diff --git a/awx/ui/client/assets/favicon.ico b/awx/ui/client/assets/favicon.ico index 41132fb823fe65afe5e9f967cd9b0c690f188e01..31b759caf9efd7d8b9130d6df61d9e62fccc36d0 100644 GIT binary patch literal 6518 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 literal 1150 zcmaiz+e=hY6vmfm`6^Kck!6n7Skc9xkidrmeb652PbjG9At<^K^blAikr_b{^J>(Th=Sk9blij3@6qMS|vz)erd?r|g zkBqmIWyI>#t|0eGu5Rt3TIBowFz*hrW9XVY2{x>Yp<(j~Hr2(8=2u;`CWfu`2^-fj zE|F5wOui82#L?3|jmsC`+qqD?CWdVr6S&beh2Gnr+_9&r(OUJYR*6)3IDKLq{>UtL zHTbAm?V+jhIUe=RV17Pl#t!XI>pWrg+Sj(TwWxopppAQVG1634>_Gq`poz>z~^7#_-C=XSqPQzw6n?R$=2sN>;-Z;*&*G592n zs~wZ5{daE7y+zu{H+KxJquv9L^M06`L(85QrY>#{+j>v;l5%pB6zxsxc;@7|Id{Dm z;ePsh=geE6T}ApyQJ&tpde$No&(ZHAmBf7mI)<*}I|*y7ulwvGD~ZwChnV+uFRest js^_9-t4xx+q=hUcRwk)(k%3Z?3nhine;b;s8rA*<4!;8` From a968717222ecda79ba9406731f553901b80fa1a0 Mon Sep 17 00:00:00 2001 From: John Mitchell Date: Wed, 4 May 2016 13:29:57 -0400 Subject: [PATCH 18/32] fix of org problems found in audit --- awx/ui/client/legacy-styles/ansible-ui.less | 9 ++++---- awx/ui/client/legacy-styles/forms.less | 8 ++++++- awx/ui/client/legacy-styles/lists.less | 8 +++---- .../addPermissions/addPermissions.block.less | 18 ++++++++------- .../addPermissions.controller.js | 23 ++++++++++--------- .../addPermissions.partial.html | 4 ++-- .../client/src/license/license.partial.html | 4 ++-- .../organizations-linkout.controller.js | 6 +++++ awx/ui/client/src/search/tagSearch.block.less | 4 ++-- awx/ui/client/src/shared/form-generator.js | 4 ++-- .../list-generator/list-generator.factory.js | 2 +- awx/ui/client/src/shared/modal/modal.less | 10 ++++++-- 12 files changed, 61 insertions(+), 39 deletions(-) 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; } From 6b5bf5e75576a0004d2b0b9f091367702fc8a886 Mon Sep 17 00:00:00 2001 From: John Mitchell Date: Wed, 4 May 2016 13:37:54 -0400 Subject: [PATCH 19/32] fix search bars on groups/hosts page --- awx/ui/client/src/lists/InventoryGroups.js | 3 ++- awx/ui/client/src/lists/InventoryHosts.js | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/awx/ui/client/src/lists/InventoryGroups.js b/awx/ui/client/src/lists/InventoryGroups.js index 58277ed78d..6002000e53 100644 --- a/awx/ui/client/src/lists/InventoryGroups.js +++ b/awx/ui/client/src/lists/InventoryGroups.js @@ -12,6 +12,7 @@ export default iterator: 'group', editTitle: '{{ inventory.name }}', listTitle: 'Groups', + searchSize: 'col-lg-12 col-md-12 col-sm-12 col-xs-12', showTitle: false, well: true, index: false, @@ -31,7 +32,7 @@ export default nosort: true, label: '', type: 'badgeCount', - ngHide: 'group.total_groups == 0', + ngHide: 'group.total_groups == 0', }, source: { label: 'Source', diff --git a/awx/ui/client/src/lists/InventoryHosts.js b/awx/ui/client/src/lists/InventoryHosts.js index d71e9a0083..655f8e28ac 100644 --- a/awx/ui/client/src/lists/InventoryHosts.js +++ b/awx/ui/client/src/lists/InventoryHosts.js @@ -12,6 +12,7 @@ export default iterator: 'host', editTitle: '{{ selected_group }}', listTitle: 'Hosts', + searchSize: 'col-lg-12 col-md-12 col-sm-12 col-xs-12', showTitle: false, well: true, index: false, From a6529dd78804531d48bde20f9dca02dd199c96ac Mon Sep 17 00:00:00 2001 From: John Mitchell Date: Wed, 4 May 2016 13:55:58 -0400 Subject: [PATCH 20/32] fixed suit block styling of dashboard graphs stuff --- awx/ui/client/legacy-styles/ansible-ui.less | 11 +++ .../counts/dashboard-counts.block.less | 80 +++++-------------- .../client/src/dashboard/dashboard.block.less | 18 ----- .../graphs/dashboard-graphs.block.less | 47 ++++++++--- .../graphs/dashboard-graphs.partial.html | 2 +- .../job-status/job-status-graph.directive.js | 7 +- .../dashboard/lists/dashboard-list.block.less | 21 +++++ 7 files changed, 92 insertions(+), 94 deletions(-) diff --git a/awx/ui/client/legacy-styles/ansible-ui.less b/awx/ui/client/legacy-styles/ansible-ui.less index efeda91fdd..be9b73db0f 100644 --- a/awx/ui/client/legacy-styles/ansible-ui.less +++ b/awx/ui/client/legacy-styles/ansible-ui.less @@ -2107,3 +2107,14 @@ a:hover { .form-control:active, .form-control:focus { border-color: @default-link; } + +.nv-axislabel { + font-weight: bold !important; + fill: @db-graph-axis-label !important; + font-family: 'Open Sans' !important; +} + +.nv-axis text { + fill: @db-graph-axis-label !important; //rgb(169, 178, 189); + font-family: 'Open Sans' !important; +} diff --git a/awx/ui/client/src/dashboard/counts/dashboard-counts.block.less b/awx/ui/client/src/dashboard/counts/dashboard-counts.block.less index cd563cfff3..d9a85ed444 100644 --- a/awx/ui/client/src/dashboard/counts/dashboard-counts.block.less +++ b/awx/ui/client/src/dashboard/counts/dashboard-counts.block.less @@ -28,66 +28,6 @@ transition: background-color 0.2s, border-color 0.2s; } -@media only screen and (max-width: 710px) { - .DashboardCounts { - margin-bottom: -15px; - } - - .DashboardCounts-buttonStyle { - margin-bottom: 15px; - width: 33%; - flex-basis: ~"calc(33% - 7px)"; - max-width: ~"calc(33% - 7px)"; - height: 96px; - } -} - -@media only screen and (max-width: 360px) { - .DashboardCounts-label { - font-size: 10px; - } - - .DashboardList-headerText { - white-space: normal; - line-height: 22px; - padding-top: 10px; - } - - .DashboardList-timeCell { - white-space: normal; - } -} - -.DashboardGraphs-filteringDropdowns { - display: inherit; -} - -@media only screen and (max-width: 540px) { - .DashboardGraphs-filteringDropdowns { - float: left; - width: 100%; - } - - .DashboardGraphs-filterLabel { - width: 50%; - float:left; - } - - .DashboardGraphs-periodDropdown { - width: 50%; - float: left; - } - - .DashboardList-container { - th { - width: 25%; - white-space: nowrap; - } - } -} - - - .DashboardCounts-buttonStyle:hover { background-color: @db-count-succ; border-color: @db-count-succ; @@ -126,3 +66,23 @@ text-transform: uppercase; transition: color 0.2s; } + +@media only screen and (max-width: 710px) { + .DashboardCounts { + margin-bottom: -15px; + } + + .DashboardCounts-buttonStyle { + margin-bottom: 15px; + width: 33%; + flex-basis: ~"calc(33% - 7px)"; + max-width: ~"calc(33% - 7px)"; + height: 96px; + } +} + +@media only screen and (max-width: 360px) { + .DashboardCounts-label { + font-size: 10px; + } +} diff --git a/awx/ui/client/src/dashboard/dashboard.block.less b/awx/ui/client/src/dashboard/dashboard.block.less index 286ee0c406..75d9525040 100644 --- a/awx/ui/client/src/dashboard/dashboard.block.less +++ b/awx/ui/client/src/dashboard/dashboard.block.less @@ -18,24 +18,6 @@ width: 100%; } -.DashboardGraphs-filterDropdownItems { - li > a { - color: @default-interface-txt; - } -} - -#status-dropdown + ul.dropdown-menu { - margin-left: -96px; -} - -#type-dropdown + ul.dropdown-menu { - margin-left: -95px; -} - -#period-dropdown + ul.dropdown-menu { - margin-left: -40px; -} - .Dashboard-list { border: 1px solid @default-border; border-radius: 5px; diff --git a/awx/ui/client/src/dashboard/graphs/dashboard-graphs.block.less b/awx/ui/client/src/dashboard/graphs/dashboard-graphs.block.less index 3ef1d00c45..f191e26be8 100644 --- a/awx/ui/client/src/dashboard/graphs/dashboard-graphs.block.less +++ b/awx/ui/client/src/dashboard/graphs/dashboard-graphs.block.less @@ -28,6 +28,8 @@ color: @default-interface-txt; white-space: nowrap; margin-right: auto; + margin-bottom: 20px; + margin-top: 5px; } .DashboardGraphs-graphSection { @@ -70,17 +72,6 @@ flex-direction: column; } -.nv-axislabel { - font-weight: bold !important; - fill: @db-graph-axis-label !important; - font-family: 'Open Sans' !important; -} - -.nv-axis text { - fill: @db-graph-axis-label !important; //rgb(169, 178, 189); - font-family: 'Open Sans' !important; -} - .DashboardGraphs-graphToolbar { display: flex; flex-direction: row; @@ -141,7 +132,11 @@ } .DashboardGraphs-filterDropdownItems--jobType { - margin-left: -84px; + margin-left: -95px; +} + +.DashboardGraphs-filterDropdownItems--status { + margin-left: -96px; } .DashboardGraphs-statusFilters{ @@ -178,3 +173,31 @@ .DashboardGraphs-statusFilterIcon{ padding-right: 5px; } + +.DashboardGraphs-filteringDropdowns { + display: inherit; +} + +.DashboardGraphs-filterDropdownItems { + li > a { + color: @default-interface-txt; + } +} + +@media only screen and (max-width: 540px) { + .DashboardGraphs-filteringDropdowns { + float: left; + width: 100%; + margin-left: -10px; + } + + .DashboardGraphs-filterLabel { + width: 50%; + float:left; + } + + .DashboardGraphs-periodDropdown { + width: 50%; + float: left; + } +} diff --git a/awx/ui/client/src/dashboard/graphs/dashboard-graphs.partial.html b/awx/ui/client/src/dashboard/graphs/dashboard-graphs.partial.html index 62e8ffe02d..0c18724e42 100644 --- a/awx/ui/client/src/dashboard/graphs/dashboard-graphs.partial.html +++ b/awx/ui/client/src/dashboard/graphs/dashboard-graphs.partial.html @@ -66,7 +66,7 @@
View
-
+
- All + All + +
    "); config.tags = true; config.tokenSeparators = []; } From 53826689977752e2a9161f0744095c11abfb6d57 Mon Sep 17 00:00:00 2001 From: John Mitchell Date: Wed, 4 May 2016 15:43:13 -0400 Subject: [PATCH 22/32] change style of all tags fixes #1805 --- awx/ui/client/legacy-styles/ansible-ui.less | 34 +++++++++++++++++++ awx/ui/client/src/access/roleList.block.less | 23 ++++++------- .../client/src/access/roleList.partial.html | 8 ++--- awx/ui/client/src/search/tagSearch.block.less | 12 +++---- .../client/src/search/tagSearch.partial.html | 8 ++--- 5 files changed, 59 insertions(+), 26 deletions(-) diff --git a/awx/ui/client/legacy-styles/ansible-ui.less b/awx/ui/client/legacy-styles/ansible-ui.less index be9b73db0f..b52236ba6a 100644 --- a/awx/ui/client/legacy-styles/ansible-ui.less +++ b/awx/ui/client/legacy-styles/ansible-ui.less @@ -2118,3 +2118,37 @@ a:hover { fill: @db-graph-axis-label !important; //rgb(169, 178, 189); font-family: 'Open Sans' !important; } + +.select2-container--default .select2-selection--multiple .select2-selection__choice { + cursor: default; + float: left; + margin-right: 5px; + margin-top: 5px; + padding-left: 0px; + border-left-width: 0px; + border-bottom-width: 0px; + border-top-width: 0px; + padding-right: 10px; + border-right-width: 0px; + background-color: @default-link; + color: @default-bg; + border-radius: 5px; + line-height: 21px; + font-size: 13px; +} + +.select2-container--default .select2-selection--multiple .select2-selection__choice__remove { + cursor: pointer; + display: inline-block; + font-weight: bold; + margin-right: 8px !important; + padding: 0 6px; + color: @default-bg !important; + border-top-left-radius: 5px; + border-bottom-left-radius: 5px; + background-color: @default-link; +} + +.select2-container--default .select2-selection--multiple .select2-selection__choice__remove:hover { + background-color: @default-err; +} diff --git a/awx/ui/client/src/access/roleList.block.less b/awx/ui/client/src/access/roleList.block.less index e1384702c8..4ee5c146f5 100644 --- a/awx/ui/client/src/access/roleList.block.less +++ b/awx/ui/client/src/access/roleList.block.less @@ -5,6 +5,7 @@ display: flex; flex-wrap: wrap; align-items: flex-start; + padding-left: 15px; } .RoleList-tagContainer { @@ -16,11 +17,10 @@ border-radius: 5px; padding: 2px 10px; margin: 4px 0px; - border: 1px solid @d7grey; font-size: 12px; - color: @default-interface-txt; + color: @default-bg; text-transform: uppercase; - background-color: @default-bg; + background-color: @default-link; margin-right: 5px; max-width: 100%; white-space: nowrap; @@ -30,21 +30,20 @@ .RoleList-tag--deletable { margin-right: 0px; - border-top-right-radius: 0px; - border-bottom-right-radius: 0px; + border-top-left-radius: 0px; + border-bottom-left-radius: 0px; border-right: 0; max-wdith: ~"calc(100% - 23px)"; + margin-right: 5px; } .RoleList-deleteContainer { - border: 1px solid @d7grey; - border-left-color: @default-bg; - background-color: @default-bg; - border-top-right-radius: 5px; - border-bottom-right-radius: 5px; + background-color: @default-link; + border-top-left-radius: 5px; + border-bottom-left-radius: 5px; + color: @default-bg; padding: 0 5px; margin: 4px 0px; - margin-right: 5px; align-items: center; display: flex; cursor: pointer; @@ -52,7 +51,7 @@ .RoleList-tagDelete { font-size: 13px; - color: @default-icon; + color: @default-bg; } .RoleList-name { diff --git a/awx/ui/client/src/access/roleList.partial.html b/awx/ui/client/src/access/roleList.partial.html index bc49322d45..469604496e 100644 --- a/awx/ui/client/src/access/roleList.partial.html +++ b/awx/ui/client/src/access/roleList.partial.html @@ -1,13 +1,13 @@
    -
    - {{ role.name }} -
    +
    + {{ role.name }} +
    diff --git a/awx/ui/client/src/search/tagSearch.block.less b/awx/ui/client/src/search/tagSearch.block.less index 0a604dd18c..47cd5d4f3e 100644 --- a/awx/ui/client/src/search/tagSearch.block.less +++ b/awx/ui/client/src/search/tagSearch.block.less @@ -187,23 +187,23 @@ .TagSearch-tag--deletable { margin-right: 0px; - border-top-right-radius: 0px; - border-bottom-right-radius: 0px; + border-top-left-radius: 0px; + border-bottom-left-radius: 0px; border-right: 0; max-wdith: ~"calc(100% - 23px)"; background-color: @default-link; - color: white; + color: @default-bg; + margin-right: 5px; } .TagSearch-deleteContainer { background-color: @default-link!important; color: white; background-color: @default-bg; - border-top-right-radius: 5px; - border-bottom-right-radius: 5px; + border-top-left-radius: 5px; + border-bottom-left-radius: 5px; padding: 0 5px; margin: 4px 0px; - margin-right: 5px; align-items: center; display: flex; cursor: pointer; diff --git a/awx/ui/client/src/search/tagSearch.partial.html b/awx/ui/client/src/search/tagSearch.partial.html index 5609adc229..18a8d85d53 100644 --- a/awx/ui/client/src/search/tagSearch.partial.html +++ b/awx/ui/client/src/search/tagSearch.partial.html @@ -63,15 +63,15 @@
    +
    + +
    {{ tag.name }}
    -
    - -
From 89b97d40ad281a5c9772c1f167d67a5ccdef4084 Mon Sep 17 00:00:00 2001 From: John Mitchell Date: Thu, 5 May 2016 10:53:27 -0400 Subject: [PATCH 23/32] update cyan --- awx/api/templates/api/stdout.html | 4 ++-- awx/ui/client/src/shared/branding/colors.less | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/awx/api/templates/api/stdout.html b/awx/api/templates/api/stdout.html index e7b9559812..4f4f5c3ea2 100644 --- a/awx/api/templates/api/stdout.html +++ b/awx/api/templates/api/stdout.html @@ -19,7 +19,7 @@ .ansi33 { color: #AA5500; } .ansi34 { color: #0000AA; } .ansi35 { color: #E850A8; } -.ansi36 { color: #00AAAA; } +.ansi36 { color: #2dbaba; } .ansi37 { color: #F5F1DE; } .ansi40 { background-color: #000000; } .ansi41 { background-color: #ff5850; } @@ -27,7 +27,7 @@ .ansi43 { background-color: #AA5500; } .ansi44 { background-color: #0000AA; } .ansi45 { background-color: #E850A8; } -.ansi46 { background-color: #00AAAA; } +.ansi46 { background-color: #2dbaba; } .ansi47 { background-color: #F5F1DE; } body.ansi_back pre { font-family: Monaco, Menlo, Consolas, "Courier New", monospace; diff --git a/awx/ui/client/src/shared/branding/colors.less b/awx/ui/client/src/shared/branding/colors.less index 6f65c1bdd7..6764ec9df1 100644 --- a/awx/ui/client/src/shared/branding/colors.less +++ b/awx/ui/client/src/shared/branding/colors.less @@ -13,7 +13,7 @@ @info-color: #3a87ad; @unreachable: #FF0000; @changed: #FF9900; // Ansible Changed -@skipped: #00aaaa; // Ansible Skipped +@skipped: #2dbaba; // Ansible Skipped @warning: #FF9900; @well: #f5f5f5; /* well background color */ @well-border: #e3e3e3; From fbe1d64ed21f21d4308b72d81fd49f636f1dd7c2 Mon Sep 17 00:00:00 2001 From: Ken Hoes Date: Thu, 5 May 2016 11:09:49 -0400 Subject: [PATCH 24/32] Projects UI audit work --- awx/ui/client/legacy-styles/ansible-ui.less | 12 ++++++++++-- awx/ui/client/legacy-styles/forms.less | 9 ++++----- awx/ui/client/legacy-styles/lists.less | 2 +- .../access/addPermissions/addPermissions.block.less | 4 +++- awx/ui/client/src/controllers/Projects.js | 2 +- .../src/dashboard/hosts/dashboard-hosts.form.js | 2 +- awx/ui/client/src/forms/Groups.js | 8 ++++---- awx/ui/client/src/forms/Hosts.js | 4 ++-- awx/ui/client/src/forms/Inventories.js | 2 +- awx/ui/client/src/forms/JobTemplates.js | 2 +- awx/ui/client/src/forms/Projects.js | 2 +- awx/ui/client/src/helpers/JobSubmission.js | 2 +- awx/ui/client/src/scheduler/schedulertime.block.less | 1 - 13 files changed, 30 insertions(+), 22 deletions(-) diff --git a/awx/ui/client/legacy-styles/ansible-ui.less b/awx/ui/client/legacy-styles/ansible-ui.less index b52236ba6a..221d36f043 100644 --- a/awx/ui/client/legacy-styles/ansible-ui.less +++ b/awx/ui/client/legacy-styles/ansible-ui.less @@ -410,11 +410,20 @@ textarea.allowresize { .popover-title { padding-top: 5px; padding-bottom: 5px; + background-color: @default-interface-txt; + color: @default-bg; + font-weight: 600; + border-bottom: none; } .popover { z-index: 2000; min-width: 200px; max-width: 325px; + background-color: @default-interface-txt; + color: @default-bg; //white + } + .popover.right>.arrow:after { + border-right-color: @default-interface-txt; } .popover pre { white-space: pre-wrap; @@ -568,7 +577,7 @@ dd { .help-link:hover, .ui-widget-content a.help-link:hover { - color: @black; + color: @default-icon; text-decoration: none; } @@ -2042,7 +2051,6 @@ tr td button i { box-shadow: none !important; } - .error { opacity: 1; transition: opacity 0.2s; diff --git a/awx/ui/client/legacy-styles/forms.less b/awx/ui/client/legacy-styles/forms.less index f298483741..c4e27dd427 100644 --- a/awx/ui/client/legacy-styles/forms.less +++ b/awx/ui/client/legacy-styles/forms.less @@ -162,13 +162,12 @@ .Form-subForm { width: 100%; border-left: 5px solid @default-border; - margin-left: -20px; padding-left: 15px; margin-bottom: 15px; - - .Form-formGroup { - float: left; - } + display: flex; + flex-wrap: wrap; + flex-direction: row; + justify-content: space-between; } .Form-subForm--title { diff --git a/awx/ui/client/legacy-styles/lists.less b/awx/ui/client/legacy-styles/lists.less index 93e5c62656..f308d1fd04 100644 --- a/awx/ui/client/legacy-styles/lists.less +++ b/awx/ui/client/legacy-styles/lists.less @@ -75,7 +75,7 @@ table, tbody { } .List-tableCell { - padding-left: 15px; + padding-left: 20px; padding-right: 15px; border-top:0px!important; } diff --git a/awx/ui/client/src/access/addPermissions/addPermissions.block.less b/awx/ui/client/src/access/addPermissions/addPermissions.block.less index 7dd95a32d3..8aae7351d6 100644 --- a/awx/ui/client/src/access/addPermissions/addPermissions.block.less +++ b/awx/ui/client/src/access/addPermissions/addPermissions.block.less @@ -90,8 +90,10 @@ font-weight: bold; border-radius: 50%; background-color: @default-list-header-bg; - padding: 2px 8px; + padding: 1px 8px; margin-right: 10px; + width: 23px; + height: 23px; } .AddPermissions-separator { diff --git a/awx/ui/client/src/controllers/Projects.js b/awx/ui/client/src/controllers/Projects.js index c7ca0d1ab4..033328f838 100644 --- a/awx/ui/client/src/controllers/Projects.js +++ b/awx/ui/client/src/controllers/Projects.js @@ -479,7 +479,7 @@ export function ProjectsAdd(Refresh, $scope, $rootScope, $compile, $location, $l url: $scope.current_url }); - $state.go("^"); + $state.go('projects.edit', {id: data.id}, {reload: true}); }) .error(function (data, status) { Wait('stop'); diff --git a/awx/ui/client/src/dashboard/hosts/dashboard-hosts.form.js b/awx/ui/client/src/dashboard/hosts/dashboard-hosts.form.js index 2ae47e1046..99e5ab7683 100644 --- a/awx/ui/client/src/dashboard/hosts/dashboard-hosts.form.js +++ b/awx/ui/client/src/dashboard/hosts/dashboard-hosts.form.js @@ -57,7 +57,7 @@ export default function(){ default: '---', awPopOver: "

Enter variables using either JSON or YAML syntax. Use the radio button to toggle between the two.

" + "JSON:
\n" + - "
{
\"somevar\": \"somevalue\",
\"password\": \"magic\"
}
\n" + + "
{
 \"somevar\": \"somevalue\",
 \"password\": \"magic\"
}
\n" + "YAML:
\n" + "
---
somevar: somevalue
password: magic
\n" + '

View JSON examples at www.json.org

' + diff --git a/awx/ui/client/src/forms/Groups.js b/awx/ui/client/src/forms/Groups.js index 3b8940de66..a2a88ae6d8 100644 --- a/awx/ui/client/src/forms/Groups.js +++ b/awx/ui/client/src/forms/Groups.js @@ -49,7 +49,7 @@ export default "

Enter variables using either JSON or YAML syntax. Use the " + "radio button to toggle between the two.

" + "JSON:
\n" + - "
{
\"somevar\": \"somevalue\",
\"password\": \"magic\"
}
\n" + + "
{
  \"somevar\": \"somevalue\",
 \"password\": \"magic\"
}
\n" + "YAML:
\n" + "
---
somevar: somevalue
password: magic
\n" + '

View JSON examples at www.json.org

' + @@ -171,7 +171,7 @@ export default dataPlacement: 'right', awPopOver: "

Provide key/value pairs using either YAML or JSON.

" + "JSON:
\n" + - "
{
\"somevar\": \"somevalue\",
\"password\": \"magic\"
}
\n" + + "
{
 \"somevar\": \"somevalue\",
 \"password\": \"magic\"
}
\n" + "YAML:
\n" + "
---
somevar: somevalue
password: magic
\n", dataContainer: 'body' @@ -193,7 +193,7 @@ export default "view ec2.ini in the Ansible github repo.

" + "

Enter variables using either JSON or YAML syntax. Use the radio button to toggle between the two.

" + "JSON:
\n" + - "
{
\"somevar\": \"somevalue\",
\"password\": \"magic\"
}
\n" + + "
{
 \"somevar\": \"somevalue\",
 \"password\": \"magic\"
}
\n" + "YAML:
\n" + "
---
somevar: somevalue
password: magic
\n" + '

View JSON examples at www.json.org

' + @@ -219,7 +219,7 @@ export default "view vmware.ini in the Ansible github repo.

" + "

Enter variables using either JSON or YAML syntax. Use the radio button to toggle between the two.

" + "JSON:
\n" + - "
{
\"somevar\": \"somevalue\",
\"password\": \"magic\"
}
\n" + + "
{
 \"somevar\": \"somevalue\",
 \"password\": \"magic\"
}
\n" + "YAML:
\n" + "
---
somevar: somevalue
password: magic
\n" + '

View JSON examples at www.json.org

' + diff --git a/awx/ui/client/src/forms/Hosts.js b/awx/ui/client/src/forms/Hosts.js index 0efc38c4b6..c7a63c5a1f 100644 --- a/awx/ui/client/src/forms/Hosts.js +++ b/awx/ui/client/src/forms/Hosts.js @@ -64,7 +64,7 @@ export default "default": "---", awPopOver: "

Enter variables using either JSON or YAML syntax. Use the radio button to toggle between the two.

" + "JSON:
\n" + - "
{
\"somevar\": \"somevalue\",
\"password\": \"magic\"
}
\n" + + "
{
 \"somevar\": \"somevalue\",
 \"password\": \"magic\"
}
\n" + "YAML:
\n" + "
---
somevar: somevalue
password: magic
\n" + '

View JSON examples at www.json.org

' + @@ -87,7 +87,7 @@ export default }, cancel: { ngClick: 'formCancel()', - ngDisabled: true + ngDisabled: true } }, diff --git a/awx/ui/client/src/forms/Inventories.js b/awx/ui/client/src/forms/Inventories.js index 20ee5db148..e1ee63a3d3 100644 --- a/awx/ui/client/src/forms/Inventories.js +++ b/awx/ui/client/src/forms/Inventories.js @@ -55,7 +55,7 @@ export default "default": "---", awPopOver: "

Enter inventory variables using either JSON or YAML syntax. Use the radio button to toggle between the two.

" + "JSON:
\n" + - "
{
\"somevar\": \"somevalue\",
\"password\": \"magic\"
}
\n" + + "
{
 \"somevar\": \"somevalue\",
 \"password\": \"magic\"
}
\n" + "YAML:
\n" + "
---
somevar: somevalue
password: magic
\n" + '

View JSON examples at www.json.org

' + diff --git a/awx/ui/client/src/forms/JobTemplates.js b/awx/ui/client/src/forms/JobTemplates.js index 9185d73e90..fd3afd5b52 100644 --- a/awx/ui/client/src/forms/JobTemplates.js +++ b/awx/ui/client/src/forms/JobTemplates.js @@ -248,7 +248,7 @@ export default awPopOver: "

Pass extra command line variables to the playbook. This is the -e or --extra-vars command line parameter " + "for ansible-playbook. Provide key/value pairs using either YAML or JSON.

" + "JSON:
\n" + - "
{
\"somevar\": \"somevalue\",
\"password\": \"magic\"
}
\n" + + "
{
 \"somevar\": \"somevalue\",
 \"password\": \"magic\"
}
\n" + "YAML:
\n" + "
---
somevar: somevalue
password: magic
\n", dataTitle: 'Extra Variables', diff --git a/awx/ui/client/src/forms/Projects.js b/awx/ui/client/src/forms/Projects.js index cf75609b1a..c6f814f253 100644 --- a/awx/ui/client/src/forms/Projects.js +++ b/awx/ui/client/src/forms/Projects.js @@ -206,7 +206,7 @@ angular.module('ProjectFormDefinition', ['SchedulesListDefinition']) type: 'number', integer: true, min: 0, - ngShow: "scm_update_on_launch", + ngShow: "scm_update_on_launch && projectSelected", spinner: true, "default": '0', addRequired: false, diff --git a/awx/ui/client/src/helpers/JobSubmission.js b/awx/ui/client/src/helpers/JobSubmission.js index 82dd577869..f185231c40 100644 --- a/awx/ui/client/src/helpers/JobSubmission.js +++ b/awx/ui/client/src/helpers/JobSubmission.js @@ -496,7 +496,7 @@ function($compile, Rest, GetBasePath, TextareaResize,CreateDialog, GenerateForm, "

Extra variables are passed as command line variables to the playbook run. It is equivalent to the -e or --extra-vars " + "command line parameter for ansible-playbook. Provide key/value pairs using either YAML or JSON.

" + "JSON:
\n" + - "
{
\"somevar\": \"somevalue\",
\"password\": \"magic\"
}
\n" + + "
{
 \"somevar\": \"somevalue\",
 \"password\": \"magic\"
}
\n" + "YAML:
\n" + "
---
somevar: somevalue
password: magic
\n"; diff --git a/awx/ui/client/src/scheduler/schedulertime.block.less b/awx/ui/client/src/scheduler/schedulertime.block.less index a40c018249..1557d37a74 100644 --- a/awx/ui/client/src/scheduler/schedulertime.block.less +++ b/awx/ui/client/src/scheduler/schedulertime.block.less @@ -10,7 +10,6 @@ span.ui-spinner.ui-widget.ui-widget-content.ui-corner-all { flex: 1; - width: 100%; } .SchedulerTime-separator { From 4f46c307d459c9669ad6571e826cb5b139225f47 Mon Sep 17 00:00:00 2001 From: John Mitchell Date: Tue, 3 May 2016 14:48:34 -0400 Subject: [PATCH 25/32] update general styling of first-time license page --- awx/ui/client/src/license/license.block.less | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/awx/ui/client/src/license/license.block.less b/awx/ui/client/src/license/license.block.less index 6f36784152..475cdf0016 100644 --- a/awx/ui/client/src/license/license.block.less +++ b/awx/ui/client/src/license/license.block.less @@ -94,6 +94,15 @@ } .License-downloadLicenseButton{ margin-bottom: 10px; + color:@default-bg; +} +.License-downloadLicenseButton:hover{ + background-color: @default-link-hov !important; + color:@default-bg !important; +} +.License-downloadLicenseButton:focus{ + background-color: @default-link-hov !important; + color:@default-bg !important; } .License-submit--container{ height: 33px; From 32db96c17628fb875759d7b0dbacbe0749166399 Mon Sep 17 00:00:00 2001 From: John Mitchell Date: Thu, 5 May 2016 14:10:11 -0400 Subject: [PATCH 26/32] fix padding of lists --- awx/ui/client/legacy-styles/lists.less | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/awx/ui/client/legacy-styles/lists.less b/awx/ui/client/legacy-styles/lists.less index f308d1fd04..93e5c62656 100644 --- a/awx/ui/client/legacy-styles/lists.less +++ b/awx/ui/client/legacy-styles/lists.less @@ -75,7 +75,7 @@ table, tbody { } .List-tableCell { - padding-left: 20px; + padding-left: 15px; padding-right: 15px; border-top:0px!important; } From 1c1dcf3c01ceb14a74a0668e72cc4437d8b467ee Mon Sep 17 00:00:00 2001 From: Jared Tabor Date: Thu, 5 May 2016 14:48:31 -0400 Subject: [PATCH 27/32] adding websocket listener to portal page --- .../client/src/portal-mode/portal-mode-jobs.controller.js | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/awx/ui/client/src/portal-mode/portal-mode-jobs.controller.js b/awx/ui/client/src/portal-mode/portal-mode-jobs.controller.js index ccb911975f..7656237cb2 100644 --- a/awx/ui/client/src/portal-mode/portal-mode-jobs.controller.js +++ b/awx/ui/client/src/portal-mode/portal-mode-jobs.controller.js @@ -13,6 +13,13 @@ export function PortalModeJobsController($scope, $state, $rootScope, GetBasePath defaultUrl = GetBasePath('jobs') + '?created_by=' + $rootScope.current_user.id, pageSize = 12; + if ($rootScope.removeJobStatusChange) { + $rootScope.removeJobStatusChange(); + } + $rootScope.removeJobStatusChange = $rootScope.$on('JobStatusChange-portal', function() { + $scope.search('portal_job'); //processEvent(event); + }); + $scope.iterator = list.iterator; $scope.activeFilter = 'user'; From 9212568c6ef7d330ed17ea8de40962d5289b6142 Mon Sep 17 00:00:00 2001 From: Ken Hoes Date: Thu, 5 May 2016 15:09:02 -0400 Subject: [PATCH 28/32] Further projects audit work --- awx/ui/client/legacy-styles/ansible-ui.less | 6 +++++- awx/ui/client/legacy-styles/forms.less | 14 +++++++++++--- awx/ui/client/src/forms/Projects.js | 2 +- 3 files changed, 17 insertions(+), 5 deletions(-) diff --git a/awx/ui/client/legacy-styles/ansible-ui.less b/awx/ui/client/legacy-styles/ansible-ui.less index 221d36f043..21b470251b 100644 --- a/awx/ui/client/legacy-styles/ansible-ui.less +++ b/awx/ui/client/legacy-styles/ansible-ui.less @@ -414,6 +414,7 @@ textarea.allowresize { color: @default-bg; font-weight: 600; border-bottom: none; + text-transform: uppercase; } .popover { z-index: 2000; @@ -422,9 +423,12 @@ textarea.allowresize { background-color: @default-interface-txt; color: @default-bg; //white } - .popover.right>.arrow:after { + .popover.right>.arrow:after { border-right-color: @default-interface-txt; } + .popover.left>.arrow:after { + border-left-color: @default-interface-txt; + } .popover pre { white-space: pre-wrap; } diff --git a/awx/ui/client/legacy-styles/forms.less b/awx/ui/client/legacy-styles/forms.less index c4e27dd427..93ac6b76e7 100644 --- a/awx/ui/client/legacy-styles/forms.less +++ b/awx/ui/client/legacy-styles/forms.less @@ -161,13 +161,21 @@ .Form-subForm { width: 100%; - border-left: 5px solid @default-border; - padding-left: 15px; margin-bottom: 15px; display: flex; flex-wrap: wrap; flex-direction: row; - justify-content: space-between; + justify-content: flex-start; + position: relative; +} + +.Form-subForm:before { + content: ''; + left: -20px; + position: absolute; + width: 5px; + background-color: @default-border; + height: 100%; } .Form-subForm--title { diff --git a/awx/ui/client/src/forms/Projects.js b/awx/ui/client/src/forms/Projects.js index c6f814f253..5599683b06 100644 --- a/awx/ui/client/src/forms/Projects.js +++ b/awx/ui/client/src/forms/Projects.js @@ -78,7 +78,7 @@ angular.module('ProjectFormDefinition', ['SchedulesListDefinition']) }, base_dir: { label: 'Project Base Path', - type: 'textarea', + type: 'text', //"class": 'col-lg-6', showonly: true, ngShow: "scm_type.value == 'manual' " , From a0645e3d035752b7d708964dba341f8b723adfae Mon Sep 17 00:00:00 2001 From: John Mitchell Date: Thu, 5 May 2016 16:24:17 -0400 Subject: [PATCH 29/32] removed head tag --- awx/ui/client/src/shared/branding/colors.default.less | 1 - 1 file changed, 1 deletion(-) diff --git a/awx/ui/client/src/shared/branding/colors.default.less b/awx/ui/client/src/shared/branding/colors.default.less index 7ee5f8bc4d..2e986fdb9f 100644 --- a/awx/ui/client/src/shared/branding/colors.default.less +++ b/awx/ui/client/src/shared/branding/colors.default.less @@ -8,7 +8,6 @@ @default-bg: #FFFFFF; // also selected btn txt @default-secondary-bg: #FCFCFC; // page/input field bg, just adds depth @default-tertiary-bg: #FAFAFA; // hover bg, alt-list -<<<<<<< HEAD @default-err: #D9534F; @default-err-hov: #C9302C; @default-succ: #5CB85C; From 5b19cdcd003a0dca4598a93a6e41a0a0d6dc9703 Mon Sep 17 00:00:00 2001 From: John Mitchell Date: Thu, 5 May 2016 16:32:29 -0400 Subject: [PATCH 30/32] update api browser stdout colors to be consistent w tower --- awx/api/templates/api/stdout.html | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/awx/api/templates/api/stdout.html b/awx/api/templates/api/stdout.html index 4f4f5c3ea2..3e323f0ed3 100644 --- a/awx/api/templates/api/stdout.html +++ b/awx/api/templates/api/stdout.html @@ -13,22 +13,22 @@ .ansi3 { font-weight: italic; } .ansi4 { text-decoration: underline; } .ansi9 { text-decoration: line-through; } -.ansi30 { color: #000316; } -.ansi31 { color: #ff5850; } -.ansi32 { color: #60D66F; } -.ansi33 { color: #AA5500; } -.ansi34 { color: #0000AA; } -.ansi35 { color: #E850A8; } +.ansi30 { color: #161b1f; } +.ansi31 { color: #d9534f; } +.ansi32 { color: #5cb85c; } +.ansi33 { color: #f0ad4e; } +.ansi34 { color: #337ab7; } +.ansi35 { color: #e1539e; } .ansi36 { color: #2dbaba; } -.ansi37 { color: #F5F1DE; } -.ansi40 { background-color: #000000; } -.ansi41 { background-color: #ff5850; } -.ansi42 { background-color: #60D66F; } -.ansi43 { background-color: #AA5500; } -.ansi44 { background-color: #0000AA; } -.ansi45 { background-color: #E850A8; } +.ansi37 { color: #ffffff; } +.ansi40 { background-color: #161b1f; } +.ansi41 { background-color: #d9534f; } +.ansi42 { background-color: #5cb85c; } +.ansi43 { background-color: #f0ad4e; } +.ansi44 { background-color: #337ab7; } +.ansi45 { background-color: #e1539e; } .ansi46 { background-color: #2dbaba; } -.ansi47 { background-color: #F5F1DE; } +.ansi47 { background-color: #ffffff; } body.ansi_back pre { font-family: Monaco, Menlo, Consolas, "Courier New", monospace; font-size: 12px; @@ -47,4 +47,4 @@ div.ansi_back.ansi_dark { 
{{ body }}
-{% endif %} \ No newline at end of file +{% endif %} From 790e3fbd0e69d462b081b594fe39c8f180df2272 Mon Sep 17 00:00:00 2001 From: John Mitchell Date: Thu, 5 May 2016 16:46:51 -0400 Subject: [PATCH 31/32] varify all colors in ansible-ui --- awx/ui/client/legacy-styles/ansible-ui.less | 90 ++++++++++----------- 1 file changed, 45 insertions(+), 45 deletions(-) diff --git a/awx/ui/client/legacy-styles/ansible-ui.less b/awx/ui/client/legacy-styles/ansible-ui.less index 21b470251b..0b90e4be35 100644 --- a/awx/ui/client/legacy-styles/ansible-ui.less +++ b/awx/ui/client/legacy-styles/ansible-ui.less @@ -104,9 +104,9 @@ a:focus { } /* Old style TB default button with grey background */ .btn-grey { - color: #333; - background-color: #ccc; - border-color: #ccc; + color: @default-data-txt; + background-color: @d7grey; + border-color: @d7grey; } .btn-grey:hover { @@ -217,7 +217,7 @@ i:active, height: 46px; padding-top: 10px; text-align: right; - border-top: 1px solid #A6C9E2; + border-top: 1px solid @default-border; margin-top: 5px; a { margin-right: 8px; @@ -230,16 +230,16 @@ i:active, top: 0; left: 0; display: none; - border: 1px solid #e5e5e5; + border: 1px solid @default-border; border-radius: 4px; - box-shadow: 3px 3px 6px 0 #666; + box-shadow: 3px 3px 6px 0 @default-dark; padding: 0 10px 15px 8px; background-color: @white; z-index: 200; } #configure-schedules-title { - border-bottom: 1px solid #e5e5e5; + border-bottom: 1px solid @default-border; padding-bottom: 8px; margin-bottom: 10px; margin-top: 0; @@ -321,7 +321,7 @@ i:active, .success-badge { color: @default-bg; - background-color: #5cb85c; + background-color: @default-succ; } .bold-text .checkbox-inline { @@ -345,7 +345,7 @@ textarea.allowresize { width: 138px; height: 50px; text-align:center; - color: #eee; + color: @d7grey; background-color: @black; border: 1px solid @grey; border-radius: 6px; @@ -455,7 +455,7 @@ textarea.allowresize { } hr { - border-color: #e3e3e3; + border-color: @default-border; } .help { @@ -507,13 +507,13 @@ td.actions { } .btn .caret { - border-top-color: #696969; + border-top-color: @default-icon; } .btn-light { - color: #333; - background-color: #ddd; - border-color: #ddd; + color: @default-data-txt; + background-color: @d7grey; + border-color: @d7grey; } .refresh-grp { @@ -530,9 +530,9 @@ td.actions { } .btn-light:hover { - color: #333; - background-color: #ccc; - border-color: #ccc; + color: @d7grey; + background-color: @default-icon; + border-color: @default-icon; } /* Make a div or any element behave like pre. Use in conjunction with .mono-space */ @@ -562,7 +562,7 @@ dd { #navbar-container, .main-menu { width: 100%; - background-color: @black; + background-color: @default-dark; } .text-justify { @@ -750,7 +750,7 @@ legend { background-color: @default-bg; color: #428bca; border-color: none; - border: 1px solid #428bca; + border: 1px solid @default-link; } } @@ -828,10 +828,10 @@ select.page-size { margin-bottom: 15px; font-size: 14px; font-weight: bold; - background-color: #f5f5f5; - border: 1px solid #d8d8d8; + background-color: @default-no-items-bord; + border: 1px solid @d7grey; border-radius: 6px; - box-shadow: 3px 3px 4px 0 #808080; + box-shadow: 3px 3px 4px 0 @default-icon; .breadcrumb { display: inline-block; @@ -1007,11 +1007,11 @@ input[type="checkbox"].checkbox-no-label { .table-summary thead > tr > td, .table-summary tbody > tr > td, .table-summary tfoot > tr > td { - border-top: 1px solid #ccc; + border-top: 1px solid @d7grey; } .table-summary thead > tr > th { - border-bottom: 1px solid #ccc; + border-bottom: 1px solid @d7grey; } /* Table without row borders */ @@ -1060,7 +1060,7 @@ input[type="checkbox"].checkbox-no-label { .active-failures-true a:active, .job-failed, .job-error { - color: #da4f49; + color: @default-err; } .icon-failures-true a:hover { @@ -1069,7 +1069,7 @@ input[type="checkbox"].checkbox-no-label { .job-failures-true { padding-top: 5px; - color: #da4f49; + color: @default-err; } .job-event-status, @@ -1298,11 +1298,11 @@ input[type="checkbox"].checkbox-no-label { /* end */ .field-success { - color: #5bb75b; + color: @default-succ; } .field-success input { - border-color: #5bb75b; + border-color: @default-succ; } .field-failure { @@ -1374,8 +1374,8 @@ input[type="checkbox"].checkbox-no-label { input[readonly], textarea[readonly] { - background-color: #FBFBFB; - border: 1px solid #E0E0E0; + background-color: @default-border; + border: 1px solid @default-icon; } .fa-external-link { @@ -1389,8 +1389,8 @@ input[type="checkbox"].checkbox-no-label { color: @white; } .free-button:hover { - background-color: #E64F48; - border: 1px solid #E64F48; + background-color: @default-err-hov; + border: 1px solid @default-err-hov; color: @white; } } @@ -1452,8 +1452,8 @@ input[type="checkbox"].checkbox-no-label { .active-row { background-color: @white; - border-bottom: 1px solid #ddd; - border-right: 1px solid #ddd; + border-bottom: 1px solid @default-tertiary-bg; + border-right: 1px solid @default-tertiary-bg; } .node-toggle, .node-no-toggle { @@ -1577,7 +1577,7 @@ a.btn-disabled:hover { } .list-header .icon-sort { - color: #ccc; + color: @default-icon; } .list-header .icon-sort-down, @@ -1616,7 +1616,7 @@ tr td button i { margin-top: 0; margin-bottom: 10px; font-weight: bold; - border-bottom: 1px solid #d8d8d8; + border-bottom: 1px solid @default-border; } .modal-backdrop, @@ -1633,8 +1633,8 @@ tr td button i { .modal-header { padding: 15px 10px; - color: #2078be; - border-bottom: 1px solid #eee; + color: @default-link; + border-bottom: 1px solid @default-border; -webkit-border-top-right-radius: 3px; -moz-border-top-right-radius: 3px; border-top-right-radius: 3px; @@ -1921,7 +1921,7 @@ tr td button i { } .stdout-panel-body { - background-color: #e9e9e9; + background-color: @default-list-header-bg; } .job-stdout-panel { @@ -2023,7 +2023,7 @@ tr td button i { .form-control { border-color: @d7grey; - background-color: #f6f6f6; + background-color: @default-no-items-bord; color: @default-data-txt; transition: border-color 0.3s; box-shadow: none; @@ -2039,12 +2039,12 @@ tr td button i { .form-control:active, .form-control:focus { box-shadow: none; - border-color: #167ec4; + border-color: @default-link; } .form-control:active + .select2 .select2-selection, .form-control:focus + .select2 .select2-selection { box-shadow: none !important; - border-color: #167ec4 !important; + border-color: @default-link !important; } .form-control.ng-dirty.ng-invalid, .form-control.ng-dirty.ng-invalid:focus { @@ -2079,13 +2079,13 @@ tr td button i { .select2-container--default .select2-selection--single { background-color: @field-secondary-bg; - border: 1px solid #aaa; + border: 1px solid @d7grey; border-radius: 4px; } .select2-container--default .select2-selection--multiple { background-color: @field-secondary-bg; - border: 1px solid #aaa; + border: 1px solid @d7grey; border-radius: 4px; cursor: text; } @@ -2105,7 +2105,7 @@ input[type=file]:focus, input[type=radio]:focus, input[type=checkbox]:focus { } .btn-success:hover, .btn-success:focus, .btn-success:active, .btn-success.active, .open .dropdown-toggle.btn-success { - border-color: #5CB85C; + border-color: @default-succ; } a { From 72baf5432df88fad7ce03962f5968396b61de0f6 Mon Sep 17 00:00:00 2001 From: John Mitchell Date: Thu, 5 May 2016 16:47:31 -0400 Subject: [PATCH 32/32] remove extraneous color styling --- awx/ui/client/legacy-styles/jquery-ui-overrides.less | 1 - 1 file changed, 1 deletion(-) diff --git a/awx/ui/client/legacy-styles/jquery-ui-overrides.less b/awx/ui/client/legacy-styles/jquery-ui-overrides.less index 826b77e711..1c8f7d4900 100644 --- a/awx/ui/client/legacy-styles/jquery-ui-overrides.less +++ b/awx/ui/client/legacy-styles/jquery-ui-overrides.less @@ -174,7 +174,6 @@ table.ui-datepicker-calendar { } .dropdown-menu>li>a { - color: @black; color: @default-interface-txt }
Title Title Time