shaba/awx
1
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2024-11-01 08:21:15 +03:00
Code Releases Activity

Merge pull request #32 from marshmalien/ux/fix/inventory

Browse Source 
UX Hit List: Inventories, Empty Lists, Lookup Buttons
This commit is contained in:
Marliana Lara 2017-07-25 09:20:31 -04:00 committed by GitHub
commit e8d55a6526
10 changed files with 29 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
awx/ui/client/legacy-styles/ansible-ui.less
View File

@ -728,7 +728,6 @@ dd {
}
.error {
margin-top: 5px;
font-size: 12px;
line-height: normal;
color: @red;

1
awx/ui/client/legacy-styles/forms.less
View File

@ -464,7 +464,6 @@
.Form-lookupButton:hover {
cursor: pointer;
background-color: @field-lookup-btn-hov-bg;
border: 1px solid @field-border;
color: @default-interface-txt;
}

4
awx/ui/client/legacy-styles/jobs.less
View File

@ -59,6 +59,10 @@
background-color: @white;
}
.List-noItems {
margin-top: 0;
}
}
@media (min-width: 1201px) {

5
awx/ui/client/src/inventories-hosts/hosts/host.form.js
View File

@ -79,11 +79,6 @@ function(i18n) {
dataTitle: i18n._('Host Variables'),
dataPlacement: 'right',
dataContainer: 'body'
},
inventory: {
type: 'hidden',
includeOnEdit: true,
includeOnAdd: true
}
},

9
awx/ui/client/src/inventories-hosts/inventories/inventories.block.less
View File

@ -1,3 +1,12 @@
.Inventories-hostStatus {
margin-left: 5px;
}
#inventories-panel {
.completed_jobsList.List-well {
margin: 0;
.List-noItems {
margin: 0;
}
}
}

2
awx/ui/client/src/inventories-hosts/inventories/related/completed-jobs/completed-jobs.list.js
View File

@ -19,7 +19,7 @@ export default ['i18n', function(i18n) {
editTitle: i18n._('COMPLETED JOBS'),
index: false,
hover: true,
well: false,
well: true,
emptyListText: i18n._('No completed jobs'),
fields: {

5
awx/ui/client/src/inventories-hosts/inventories/related/groups/related/nested-hosts/group-nested-hosts.form.js
View File

@ -79,11 +79,6 @@ function(i18n) {
dataTitle: i18n._('Host Variables'),
dataPlacement: 'right',
dataContainer: 'body'
},
inventory: {
type: 'hidden',
includeOnEdit: true,
includeOnAdd: true
}
},

10
awx/ui/client/src/inventories-hosts/inventory-hosts.block.less Normal file
View File

@ -0,0 +1,10 @@
#hosts-panel {
.List-noItems {
margin-top: 0px;
}
.groupsList {
.List-noItems {
margin-top: 52px;
}
}
}

5
awx/ui/client/src/organizations/organizations.block.less Normal file
View File

@ -0,0 +1,5 @@
#organizations {
.List-noItems {
margin-top: 20px;
}
}

8
awx/ui/client/src/shared/form-generator.js
View File

@ -740,18 +740,10 @@ angular.module('FormGenerator', [GeneratorHelpers.name, 'Utilities', listGenerat
html += "</div>\n";
}
if (field.type === 'hidden') {
if ((options.mode === 'edit' && field.includeOnEdit) ||
(options.mode === 'add' && field.includeOnAdd)) {
html += "<input type=\"hidden\" ng-model=\"" + fld + "\" name=\"" + fld + "\" />";
}
}
if ((!field.readonly) || (field.readonly && options.mode === 'edit')) {
if((field.excludeMode === undefined || field.excludeMode !== options.mode) && field.type !== 'alertblock' && field.type !== 'workflow-chart') {
html += "<div class='form-group Form-formGroup ";
html += (field.disabled) ? `Form-formGroup--disabled ` : ``;
html += (field.type === "checkbox") ? "Form-formGroup--checkbox" : "";