diff --git a/awx/ui/client/legacy-styles/forms.less b/awx/ui/client/legacy-styles/forms.less index 41fd02897e..594b5f073e 100644 --- a/awx/ui/client/legacy-styles/forms.less +++ b/awx/ui/client/legacy-styles/forms.less @@ -216,6 +216,10 @@ border:1px solid @field-border-sel; } +.Form-monospace{ + font-family: Menlo,Monaco,Consolas,"Courier New",monospace!important; +} + .ui-spinner{ height: 30px; background-color: @field-secondary-bg; diff --git a/awx/ui/client/src/forms/Credentials.js b/awx/ui/client/src/forms/Credentials.js index 237993e213..6b9902fa97 100644 --- a/awx/ui/client/src/forms/Credentials.js +++ b/awx/ui/client/src/forms/Credentials.js @@ -79,24 +79,7 @@ export default dataTitle: 'Type', dataPlacement: 'right', dataContainer: "body", - hasSubForm: true, - // helpCollapse: [{ - // hdr: 'Select a Credential Type', - // content: '
\n' + - // '
Machine
\n' + - // '
Authentication for remote machine access. This can include SSH keys, usernames, passwords, ' + - // 'and sudo information. Machine credentials are used when submitting jobs to run playbooks against ' + - // 'remote hosts.
' + - // '
Source Control
\n' + - // '
Used to check out and synchronize playbook repositories with a remote source control ' + - // 'management system such as Git, Subversion (svn), or Mercurial (hg). These credentials are ' + - // 'used on the Projects tab.
\n' + - // '
Others (Cloud Providers)
\n' + - // '
Access keys for authenticating to the specific ' + - // 'cloud provider, usually used for inventory sync ' + - // 'and deployment.
\n' + - // '
\n' - // }] + hasSubForm: true }, access_key: { label: 'Access Key', @@ -255,6 +238,7 @@ export default init: true }, class: 'Form-textAreaLabel Form-formGroup--fullWidth', + elementClass: 'Form-monospace', hintText: "{{ key_hint }}", addRequired: false, editRequired: false, diff --git a/awx/ui/client/src/inventory-scripts/add/add.controller.js b/awx/ui/client/src/inventory-scripts/add/add.controller.js index af0f924940..66c54d49df 100644 --- a/awx/ui/client/src/inventory-scripts/add/add.controller.js +++ b/awx/ui/client/src/inventory-scripts/add/add.controller.js @@ -49,7 +49,6 @@ export default script: scope.script }) .success(function (data) { - $rootScope.addedItem = data.id; $state.go('inventoryScripts', {}, {reload: true}); Wait('stop'); }) diff --git a/awx/ui/client/src/inventory-scripts/edit/edit.controller.js b/awx/ui/client/src/inventory-scripts/edit/edit.controller.js index a24c9d1766..7ed84066b8 100644 --- a/awx/ui/client/src/inventory-scripts/edit/edit.controller.js +++ b/awx/ui/client/src/inventory-scripts/edit/edit.controller.js @@ -79,9 +79,8 @@ export default script: $scope.script }) .success(function () { - $state.transitionTo('inventoryScriptsList'); + $state.transitionTo('inventoryScripts'); Wait('stop'); - }) .error(function (data, status) { ProcessErrors($scope, data, status, form, { hdr: 'Error!', diff --git a/awx/ui/client/src/inventory-scripts/inventory-scripts.form.js b/awx/ui/client/src/inventory-scripts/inventory-scripts.form.js index 243292c47c..1bbf128caf 100644 --- a/awx/ui/client/src/inventory-scripts/inventory-scripts.form.js +++ b/awx/ui/client/src/inventory-scripts/inventory-scripts.form.js @@ -48,6 +48,7 @@ export default function() { type: 'textarea', hintText: "Drag and drop an inventory script on the field below", class: 'Form-formGroup--fullWidth', + elementClass: 'Form-monospace', addRequired: true, editRequired: true, awDropFile: true, diff --git a/awx/ui/client/src/management-jobs/card/card.controller.js b/awx/ui/client/src/management-jobs/card/card.controller.js index 37d50608fd..d1fcbff93a 100644 --- a/awx/ui/client/src/management-jobs/card/card.controller.js +++ b/awx/ui/client/src/management-jobs/card/card.controller.js @@ -7,16 +7,14 @@ // import listGenerator from 'tower/shared/list-generator/main'; export default - [ 'Wait', '$location' , '$compile', 'CreateDialog', - 'GetBasePath' , 'SearchInit' , 'PaginateInit', - 'SchedulesList', - 'Rest' , 'ProcessErrors', 'managementJobsListObject', '$rootScope', - '$state','$scope', - function( Wait, $location, $compile, CreateDialog, - GetBasePath, SearchInit, PaginateInit, - SchedulesList, - Rest, ProcessErrors, managementJobsListObject, $rootScope, - $state, $scope) { + [ 'Wait', '$location' , '$compile', 'CreateDialog', 'GetBasePath' , + 'SearchInit' , 'PaginateInit', 'SchedulesList', 'Rest' , + 'ProcessErrors', 'managementJobsListObject', '$rootScope', '$state', + '$scope', 'CreateSelect2', + function( Wait, $location, $compile, CreateDialog, GetBasePath, + SearchInit, PaginateInit, SchedulesList, Rest, ProcessErrors, + managementJobsListObject, $rootScope, $state, $scope, + CreateSelect2) { var defaultUrl = GetBasePath('system_job_templates'); @@ -154,6 +152,14 @@ export default // $('#configure-tower-dialog').dialog('close'); $('#prompt-for-days-facts').show(); $('#prompt-for-days-facts').dialog('open'); + CreateSelect2({ + element: '#keep_unit', + multiple: false + }); + CreateSelect2({ + element: '#granularity_keep_unit', + multiple: false + }); Wait('stop'); }); }; @@ -238,7 +244,7 @@ export default }; $scope.chooseRunJob = function(id, name) { - if(id === 4) { + if(this.card.job_type === "cleanup_facts") { // Run only for 'Cleanup Fact Details' $scope.submitCleanupJob(id, name); } else { diff --git a/awx/ui/client/src/management-jobs/card/card.partial.html b/awx/ui/client/src/management-jobs/card/card.partial.html index b3e1047c22..7c01cd0b9b 100644 --- a/awx/ui/client/src/management-jobs/card/card.partial.html +++ b/awx/ui/client/src/management-jobs/card/card.partial.html @@ -16,17 +16,20 @@

{{ card.name }}

- +
diff --git a/awx/ui/client/src/management-jobs/card/mgmtcards.block.less b/awx/ui/client/src/management-jobs/card/mgmtcards.block.less index 768a1acff6..c8bd17a390 100644 --- a/awx/ui/client/src/management-jobs/card/mgmtcards.block.less +++ b/awx/ui/client/src/management-jobs/card/mgmtcards.block.less @@ -22,6 +22,14 @@ border-left: 5px solid #337AB7; } +.MgmtCards-card--promptElements{ + padding-top: 10px; +} + +// .MgmtCards-promptText{ +// color:@default-interface-txt; +// } + .MgmtCards-header { display: flex; flex-wrap: nowrap; diff --git a/awx/ui/templates/ui/index.html b/awx/ui/templates/ui/index.html index 446c6d1798..3d1c7ba0d6 100644 --- a/awx/ui/templates/ui/index.html +++ b/awx/ui/templates/ui/index.html @@ -157,9 +157,9 @@