From 723bd66627779907cf9a9b0234d045aae16063c1 Mon Sep 17 00:00:00 2001 From: Marliana Lara Date: Fri, 28 Jul 2017 09:29:32 -0400 Subject: [PATCH 1/2] Fix UX items related to Job Templates and Workflow Maker --- awx/ui/client/legacy-styles/forms.less | 7 ++-- awx/ui/client/legacy-styles/lists.less | 29 ++++++++++++++--- .../src/partials/job-template-details.html | 2 +- .../job_templates/job-template.form.js | 32 +++++++++---------- awx/ui/client/src/templates/main.js | 3 ++ awx/ui/client/src/templates/templates.list.js | 2 +- .../workflow-maker/workflow-maker.block.less | 5 +++ .../workflow-maker.partial.html | 2 +- 8 files changed, 56 insertions(+), 26 deletions(-) diff --git a/awx/ui/client/legacy-styles/forms.less b/awx/ui/client/legacy-styles/forms.less index 198c7ad04b..a1256e0b83 100644 --- a/awx/ui/client/legacy-styles/forms.less +++ b/awx/ui/client/legacy-styles/forms.less @@ -73,9 +73,7 @@ margin-left: 10px; text-transform: uppercase; font-weight: 100; - //position: absolute; margin-top: 2.25px; - height: 16px; } .Form-exitHolder { @@ -525,6 +523,11 @@ input[type='radio']:checked:before { .Form-mixedInputGroup { width: 100%; + + .Form-lookupButton { + border-right:1px solid @field-border; + + } } .FormToggle {} diff --git a/awx/ui/client/legacy-styles/lists.less b/awx/ui/client/legacy-styles/lists.less index 53449ad4c6..aab2a51776 100644 --- a/awx/ui/client/legacy-styles/lists.less +++ b/awx/ui/client/legacy-styles/lists.less @@ -463,14 +463,33 @@ table, tbody { justify-content: flex-end; font-size: 0.8em; cursor: pointer; + + .popover-content { + dl { + display: flex; + margin: 0; + } + dt, dd { + flex: 1 1 50%; + font-weight: inherit; + margin: 0; + } + } } -.List-infoCell a { - color: @default-icon; -} - -.List-infoCell a:hover, .List-infoCell a:focus { +.List-infoCell--badge { + height: 15px; color: @default-interface-txt; + background-color: @default-list-header-bg; + border-radius: 5px; + font-size: 10px; + padding-left: 10px; + padding-right: 10px; + margin-left: 10px; + text-transform: uppercase; + font-weight: 100; + margin-top: 2.25px; + outline: none; } .List-actionsInner { diff --git a/awx/ui/client/src/partials/job-template-details.html b/awx/ui/client/src/partials/job-template-details.html index 855d22b444..a0799d3733 100644 --- a/awx/ui/client/src/partials/job-template-details.html +++ b/awx/ui/client/src/partials/job-template-details.html @@ -1,3 +1,3 @@
- INFO + INFO
diff --git a/awx/ui/client/src/templates/job_templates/job-template.form.js b/awx/ui/client/src/templates/job_templates/job-template.form.js index daa43e44b4..a25cfeccd8 100644 --- a/awx/ui/client/src/templates/job_templates/job-template.form.js +++ b/awx/ui/client/src/templates/job_templates/job-template.form.js @@ -127,7 +127,7 @@ function(NotificationsList, CompletedJobsList, i18n) { includePlaybookNotFoundError: true }, credential: { - label: i18n._('Credentials'), + label: i18n._('Credential'), type: 'custom', control: ` " + i18n._("Optional labels that describe this job template, such as 'dev' or 'test'. Labels can be used to group and filter job templates and completed jobs.") + "

", + dataContainer: 'body', + ngDisabled: '!(job_template_obj.summary_fields.user_capabilities.edit || canAddJobTemplate)' + }, diff_mode: { label: i18n._('Show Changes'), type: 'toggleSwitch', @@ -265,6 +276,7 @@ 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'), @@ -344,18 +356,6 @@ function(NotificationsList, CompletedJobsList, i18n) { alwaysShowAsterisk: true } }, - labels: { - label: i18n._('Labels'), - type: 'select', - class: 'Form-formGroup--fullWidth', - ngOptions: 'label.label for label in labelOptions track by label.value', - multiSelect: true, - dataTitle: i18n._('Labels'), - dataPlacement: 'right', - awPopOver: "

" + i18n._("Optional labels that describe this job template, such as 'dev' or 'test'. Labels can be used to group and filter job templates and completed jobs.") + "

", - dataContainer: 'body', - ngDisabled: '!(job_template_obj.summary_fields.user_capabilities.edit || canAddJobTemplate)' - }, variables: { label: i18n._('Extra Variables'), type: 'textarea', @@ -397,9 +397,6 @@ function(NotificationsList, CompletedJobsList, i18n) { }, related: { - "completed_jobs": { - include: "CompletedJobsList" - }, permissions: { name: 'permissions', awToolTip: i18n._('Please save before assigning permissions.'), @@ -448,6 +445,9 @@ function(NotificationsList, CompletedJobsList, i18n) { }, "notifications": { include: "NotificationsList" + }, + "completed_jobs": { + include: "CompletedJobsList" } }, diff --git a/awx/ui/client/src/templates/main.js b/awx/ui/client/src/templates/main.js index 4ebb8f186b..dbaf88d3e6 100644 --- a/awx/ui/client/src/templates/main.js +++ b/awx/ui/client/src/templates/main.js @@ -667,6 +667,7 @@ angular.module('templates', [surveyMaker.name, templatesList.name, jobTemplates. nosort: true }; list.maxVisiblePages = 5; + list.searchBarFullWidth = true; return list; } @@ -679,6 +680,7 @@ angular.module('templates', [surveyMaker.name, templatesList.name, jobTemplates. delete list.fields.last_updated; list.fields.name.columnClass = "col-md-11"; list.maxVisiblePages = 5; + list.searchBarFullWidth = true; return list; } @@ -687,6 +689,7 @@ angular.module('templates', [surveyMaker.name, templatesList.name, jobTemplates. (InventorySourcesList) => { let list = _.cloneDeep(InventorySourcesList); list.maxVisiblePages = 5; + list.searchBarFullWidth = true; return list; } diff --git a/awx/ui/client/src/templates/templates.list.js b/awx/ui/client/src/templates/templates.list.js index 2e7f60293a..7b9c703f2c 100644 --- a/awx/ui/client/src/templates/templates.list.js +++ b/awx/ui/client/src/templates/templates.list.js @@ -63,7 +63,7 @@ export default ['i18n', function(i18n) { ngShow: 'canAddJobTemplate' }, { - optionContent: i18n._('Workflow Job Template'), + optionContent: i18n._('Workflow Template'), optionSref: 'templates.addWorkflowJobTemplate', ngShow: 'canAddWorkflowJobTemplate' } diff --git a/awx/ui/client/src/templates/workflows/workflow-maker/workflow-maker.block.less b/awx/ui/client/src/templates/workflows/workflow-maker/workflow-maker.block.less index c506907a09..a7bb20a1b4 100644 --- a/awx/ui/client/src/templates/workflows/workflow-maker/workflow-maker.block.less +++ b/awx/ui/client/src/templates/workflows/workflow-maker/workflow-maker.block.less @@ -1,6 +1,11 @@ .WorkflowMaker-dialog { padding: 0px; margin-bottom: 20px; + position: fixed; + top: 0 !important; + bottom: 0; + width: 100vw !important; + overflow: scroll; .ui-dialog-buttonpane, .ui-dialog-titlebar { display:none; diff --git a/awx/ui/client/src/templates/workflows/workflow-maker/workflow-maker.partial.html b/awx/ui/client/src/templates/workflows/workflow-maker/workflow-maker.partial.html index bca6af0f4f..57e1344ac0 100644 --- a/awx/ui/client/src/templates/workflows/workflow-maker/workflow-maker.partial.html +++ b/awx/ui/client/src/templates/workflows/workflow-maker/workflow-maker.partial.html @@ -21,7 +21,7 @@
-
EDIT WORKFLOW
+
{{ workflowJobTemplateObj.name }}