External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-01-12 18:40:01 -03:30
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1499 from marshmalien/style/display_invalid_items

Browse Source 
Add border between invalid and active template flags
This commit is contained in:
Marliana Lara 2018-03-12 12:37:42 -04:00 committed by GitHub
commit c19bb79587
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 24 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
awx/ui/client/lib/components/list/_index.less
View File

@ -81,6 +81,10 @@
border-top-right-radius: @at-border-radius;
}
.at-Row--active .at-Row--invalid {
border-left: @at-white solid 1px;
}
.at-Row--invalid {
align-items: center;
background: @at-color-error;

41
awx/ui/client/src/templates/job_templates/job-template.form.js
View File

@ -103,17 +103,6 @@ function(NotificationsList, CompletedJobsList, i18n) {
ngDisabled: '!(job_template_obj.summary_fields.user_capabilities.edit || canAddJobTemplate) || !canGetAllRelatedResources',
awLookupWhen: 'canGetAllRelatedResources'
},
custom_virtualenv: {
label: i18n._('Ansible Environment'),
type: 'select',
defaultText: i18n._('Select Ansible Environment'),
ngOptions: 'venv for venv in custom_virtualenvs_options track by venv',
awPopOver: "<p>" + i18n._("Select the custom Python virtual environment for this job template to run on.") + "</p>",
dataTitle: i18n._('Ansible Environment'),
dataContainer: 'body',
dataPlacement: 'right',
ngDisabled: '!(job_template_obj.summary_fields.user_capabilities.edit || canAdd)'
},
playbook: {
label: i18n._('Playbook'),
type:'select',
@ -197,15 +186,6 @@ function(NotificationsList, CompletedJobsList, i18n) {
},
ngDisabled: '!(job_template_obj.summary_fields.user_capabilities.edit || canAddJobTemplate)',
},
instance_groups: {
label: i18n._('Instance Groups'),
type: 'custom',
awPopOver: "<p>" + i18n._("Select the Instance Groups for this Job Template to run on.") + "</p>",
dataTitle: i18n._('Instance Groups'),
dataContainer: 'body',
dataPlacement: 'right',
control: '<instance-groups-multiselect instance-groups="instance_groups" field-is-disabled="!(job_template_obj.summary_fields.user_capabilities.edit || canAddJobTemplate)"></instance-groups-multiselect>',
},
job_tags: {
label: i18n._('Job Tags'),
type: 'select',
@ -251,6 +231,26 @@ function(NotificationsList, CompletedJobsList, i18n) {
dataContainer: 'body',
ngDisabled: '!(job_template_obj.summary_fields.user_capabilities.edit || canAddJobTemplate)'
},
custom_virtualenv: {
label: i18n._('Ansible Environment'),
type: 'select',
defaultText: i18n._('Select Ansible Environment'),
ngOptions: 'venv for venv in custom_virtualenvs_options track by venv',
awPopOver: "<p>" + i18n._("Select the custom Python virtual environment for this job template to run on.") + "</p>",
dataTitle: i18n._('Ansible Environment'),
dataContainer: 'body',
dataPlacement: 'right',
ngDisabled: '!(job_template_obj.summary_fields.user_capabilities.edit || canAdd)'
},
instance_groups: {
label: i18n._('Instance Groups'),
type: 'custom',
awPopOver: "<p>" + i18n._("Select the Instance Groups for this Job Template to run on.") + "</p>",
dataTitle: i18n._('Instance Groups'),
dataContainer: 'body',
dataPlacement: 'right',
control: '<instance-groups-multiselect instance-groups="instance_groups" field-is-disabled="!(job_template_obj.summary_fields.user_capabilities.edit || canAddJobTemplate)"></instance-groups-multiselect>',
},
diff_mode: {
label: i18n._('Show Changes'),
type: 'toggleSwitch',
@ -268,7 +268,6 @@ function(NotificationsList, CompletedJobsList, i18n) {
checkbox_group: {
label: i18n._('Options'),
type: 'checkbox_group',
class: 'Form-formGroup--fullWidth',
fields: [{
name: 'become_enabled',
label: i18n._('Enable Privilege Escalation'),