From 6fa10deb8ac99a4dc7aa553433c12011459ee207 Mon Sep 17 00:00:00 2001 From: Leigh Johnson Date: Mon, 22 Feb 2016 11:29:20 -0500 Subject: [PATCH 1/3] #999 move adhoc form to inventoryManage state, #951 fix styling & undefined fields of adhoc form --- awx/ui/client/legacy-styles/forms.less | 9 +++++++++ awx/ui/client/legacy-styles/main-layout.less | 4 ++++ awx/ui/client/src/adhoc/adhoc.controller.js | 8 ++++++-- awx/ui/client/src/adhoc/adhoc.form.js | 11 +++++++---- awx/ui/client/src/adhoc/adhoc.partial.html | 2 +- awx/ui/client/src/adhoc/adhoc.route.js | 4 ++-- awx/ui/client/src/controllers/Inventories.js | 3 ++- awx/ui/client/src/partials/inventory-manage.html | 1 + 8 files changed, 32 insertions(+), 10 deletions(-) diff --git a/awx/ui/client/legacy-styles/forms.less b/awx/ui/client/legacy-styles/forms.less index 0556f7e1cd..5f1ae9f449 100644 --- a/awx/ui/client/legacy-styles/forms.less +++ b/awx/ui/client/legacy-styles/forms.less @@ -363,6 +363,15 @@ input[type='radio']:checked:before { display: flex; justify-content: flex-end; } +.Form-button{ + margin-left: 4px; +} + +.Form-buttonDefault { + background-color: #FFFFFF; + color: #848992; + border-color: #E8E8E8; +} .Form-saveButton{ background-color: @submit-button-bg; diff --git a/awx/ui/client/legacy-styles/main-layout.less b/awx/ui/client/legacy-styles/main-layout.less index 803d554eaf..5b7f8f1c01 100644 --- a/awx/ui/client/legacy-styles/main-layout.less +++ b/awx/ui/client/legacy-styles/main-layout.less @@ -91,6 +91,10 @@ body { margin-top: 20px; } +.btn{ + text-transform: uppercase; +} + @media (max-width: 1075px) { #main-menu-container { diff --git a/awx/ui/client/src/adhoc/adhoc.controller.js b/awx/ui/client/src/adhoc/adhoc.controller.js index 24a289ebe9..17ca17783a 100644 --- a/awx/ui/client/src/adhoc/adhoc.controller.js +++ b/awx/ui/client/src/adhoc/adhoc.controller.js @@ -10,7 +10,7 @@ * @description This controller controls the adhoc form creation, command launching and navigating to standard out after command has been succesfully ran. */ function adhocController($q, $scope, $rootScope, $location, $stateParams, - CheckPasswords, PromptForPasswords, CreateLaunchDialog, adhocForm, + $state, CheckPasswords, PromptForPasswords, CreateLaunchDialog, adhocForm, GenerateForm, Rest, ProcessErrors, ClearScope, GetBasePath, GetChoices, KindChange, LookUpInit, CredentialList, Empty, Wait) { @@ -162,6 +162,10 @@ function adhocController($q, $scope, $rootScope, $location, $stateParams, privateFn.initializeForm(id, urls, hostPattern); + $scope.formCancel = function(){ + $state.go('inventoryManage'); + } + // remove all data input into the form and reset the form back to defaults $scope.formReset = function () { GenerateForm.reset(); @@ -291,7 +295,7 @@ function adhocController($q, $scope, $rootScope, $location, $stateParams, } export default ['$q', '$scope', '$rootScope', '$location', '$stateParams', - 'CheckPasswords', 'PromptForPasswords', 'CreateLaunchDialog', 'adhocForm', + '$state', 'CheckPasswords', 'PromptForPasswords', 'CreateLaunchDialog', 'adhocForm', 'GenerateForm', 'Rest', 'ProcessErrors', 'ClearScope', 'GetBasePath', 'GetChoices', 'KindChange', 'LookUpInit', 'CredentialList', 'Empty', 'Wait', adhocController]; diff --git a/awx/ui/client/src/adhoc/adhoc.form.js b/awx/ui/client/src/adhoc/adhoc.form.js index d200d37b47..2632a0e7bb 100644 --- a/awx/ui/client/src/adhoc/adhoc.form.js +++ b/awx/ui/client/src/adhoc/adhoc.form.js @@ -12,7 +12,7 @@ export default function() { return { - editTitle: 'Execute Command', + addTitle: 'Execute Command', name: 'adhoc', well: true, forceListeners: true, @@ -125,13 +125,16 @@ export default function() { buttons: { launch: { - label: 'Launch', + label: 'Save', ngClick: 'launchJob()', - ngDisabled: true + ngDisabled: true, + 'class': 'Form-buttonDefault Form-button' }, reset: { ngClick: 'formReset()', - ngDisabled: true + ngDisabled: true, + label: 'Reset', + 'class': 'Form-buttonDefault Form-button' } }, diff --git a/awx/ui/client/src/adhoc/adhoc.partial.html b/awx/ui/client/src/adhoc/adhoc.partial.html index 7420af3ea9..eb25ec5b56 100644 --- a/awx/ui/client/src/adhoc/adhoc.partial.html +++ b/awx/ui/client/src/adhoc/adhoc.partial.html @@ -1,4 +1,4 @@ -
+
diff --git a/awx/ui/client/src/adhoc/adhoc.route.js b/awx/ui/client/src/adhoc/adhoc.route.js index f5fa7e9639..5e7b47a850 100644 --- a/awx/ui/client/src/adhoc/adhoc.route.js +++ b/awx/ui/client/src/adhoc/adhoc.route.js @@ -7,8 +7,8 @@ import {templateUrl} from '../shared/template-url/template-url.factory'; export default { - route: '/inventories/:inventory_id/adhoc', - name: 'inventoryAdhoc', + route: '/adhoc', + name: 'inventoryManage.adhoc', templateUrl: templateUrl('adhoc/adhoc'), controller: 'adhocController', resolve: { diff --git a/awx/ui/client/src/controllers/Inventories.js b/awx/ui/client/src/controllers/Inventories.js index a506d78ead..9b2774bd98 100644 --- a/awx/ui/client/src/controllers/Inventories.js +++ b/awx/ui/client/src/controllers/Inventories.js @@ -859,7 +859,8 @@ export function InventoriesManage ($log, $scope, $rootScope, $location, } } $rootScope.hostPatterns = host_patterns; - $location.path('/inventories/' + $scope.inventory.id + '/adhoc'); + $state.go('inventoryManage.adhoc'); + //$location.path('/inventories/' + $scope.inventory.id + '/adhoc'); }; $scope.refreshHostsOnGroupRefresh = false; diff --git a/awx/ui/client/src/partials/inventory-manage.html b/awx/ui/client/src/partials/inventory-manage.html index 452df8bbb8..ecae801c20 100644 --- a/awx/ui/client/src/partials/inventory-manage.html +++ b/awx/ui/client/src/partials/inventory-manage.html @@ -1,4 +1,5 @@
+
From 28f693b7bdbbf44f06d86e9b7bb9f649ef412898 Mon Sep 17 00:00:00 2001 From: Leigh Johnson Date: Thu, 25 Feb 2016 09:43:20 -0500 Subject: [PATCH 2/3] #951 #999 add missing dependency injection to unit test, fix misc styles --- awx/ui/client/legacy-styles/forms.less | 3 ++- awx/ui/client/src/adhoc/adhoc.controller.js | 2 +- awx/ui/client/src/controllers/Inventories.js | 1 - awx/ui/client/tests/adhoc/adhoc.controller-test.js | 1 + 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/awx/ui/client/legacy-styles/forms.less b/awx/ui/client/legacy-styles/forms.less index 5f1ae9f449..86f10ec1c2 100644 --- a/awx/ui/client/legacy-styles/forms.less +++ b/awx/ui/client/legacy-styles/forms.less @@ -363,8 +363,9 @@ input[type='radio']:checked:before { display: flex; justify-content: flex-end; } + .Form-button{ - margin-left: 4px; + margin-left: 4px; } .Form-buttonDefault { diff --git a/awx/ui/client/src/adhoc/adhoc.controller.js b/awx/ui/client/src/adhoc/adhoc.controller.js index 17ca17783a..cb9e0a648e 100644 --- a/awx/ui/client/src/adhoc/adhoc.controller.js +++ b/awx/ui/client/src/adhoc/adhoc.controller.js @@ -1,5 +1,5 @@ /************************************************* - * Copyright (c) 2015 Ansible, Inc. + * Copyright (c) 2016 Ansible, Inc. * * All Rights Reserved *************************************************/ diff --git a/awx/ui/client/src/controllers/Inventories.js b/awx/ui/client/src/controllers/Inventories.js index 9b2774bd98..916b812976 100644 --- a/awx/ui/client/src/controllers/Inventories.js +++ b/awx/ui/client/src/controllers/Inventories.js @@ -860,7 +860,6 @@ export function InventoriesManage ($log, $scope, $rootScope, $location, } $rootScope.hostPatterns = host_patterns; $state.go('inventoryManage.adhoc'); - //$location.path('/inventories/' + $scope.inventory.id + '/adhoc'); }; $scope.refreshHostsOnGroupRefresh = false; diff --git a/awx/ui/client/tests/adhoc/adhoc.controller-test.js b/awx/ui/client/tests/adhoc/adhoc.controller-test.js index c60af03f44..26583b71dd 100644 --- a/awx/ui/client/tests/adhoc/adhoc.controller-test.js +++ b/awx/ui/client/tests/adhoc/adhoc.controller-test.js @@ -55,6 +55,7 @@ describe("adhoc.controller", function() { $provide.value('Wait', waitCallback); $provide.value('$stateExtender', stateExtenderCallback); $provide.value('$stateParams', angular.noop); + $provide.value('$state', angular.noop); }])); beforeEach("put $q in scope", window.inject(['$q', function($q) { From 908bc92f943f4150fe6765b5fd257219f740a0f5 Mon Sep 17 00:00:00 2001 From: Leigh Johnson Date: Thu, 25 Feb 2016 09:58:35 -0500 Subject: [PATCH 3/3] more misc styles #951 #999 --- awx/ui/client/legacy-styles/forms.less | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/awx/ui/client/legacy-styles/forms.less b/awx/ui/client/legacy-styles/forms.less index 86f10ec1c2..df21f8534c 100644 --- a/awx/ui/client/legacy-styles/forms.less +++ b/awx/ui/client/legacy-styles/forms.less @@ -369,9 +369,9 @@ input[type='radio']:checked:before { } .Form-buttonDefault { - background-color: #FFFFFF; - color: #848992; - border-color: #E8E8E8; + background-color: @default-bg; + color: @default-interface-txt; + border-color: @default-border; } .Form-saveButton{