External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-07-29 08:59:55 -02:30
Code Issues Packages Projects Releases Wiki Activity

AC-931: Fixed typo. AC-925 clickin on failed inventory sync icon works again. Inventory Refactor: consolidated actions and status fields to a single column and simplified tool-tip text. Made 'sync' labeling more consistent, I think.

Browse Source
This commit is contained in:
chris Houseknecht
2014-01-15 04:31:11 -05:00
parent 298e55017f
commit ef324f2397
17 changed files with 75 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
awx/ui/static/js/lists/CloudCredentials.js
View File

@@ -59,7 +59,7 @@ angular.module('CloudCredentialsListDefinition', [])
icon: 'fa-edit',
label: 'Edit',
"class": 'btn-sm',
awToolTip: 'View/Edit credential',
awToolTip: 'Edit credential',
dataPlacement: 'top'
},

2
awx/ui/static/js/lists/Credentials.js
View File

@@ -73,7 +73,7 @@ angular.module('CredentialsListDefinition', [])
icon: 'fa-edit',
label: 'Edit',
"class": 'btn-sm',
awToolTip: 'View/Edit credential',
awToolTip: 'Edit credential',
dataPlacement: 'top'
},

4
awx/ui/static/js/lists/Groups.js
View File

@@ -44,7 +44,7 @@ angular.module('GroupListDefinition', [])
ngClick: "editGroup(\{\{ group.id \}\})",
icon: 'icon-edit',
"class": 'btn-xs',
awToolTip: 'View/Edit group',
awToolTip: 'Edit group',
dataPlacement: 'top'
},
@@ -57,4 +57,4 @@ angular.module('GroupListDefinition', [])
dataPlacement: 'top'
}
}
});
});

2
awx/ui/static/js/lists/Hosts.js
View File

@@ -44,7 +44,7 @@ angular.module('HostListDefinition', [])
ngClick: "editHost(\{\{ host.id \}\})",
icon: 'icon-edit',
"class": 'btn-xs',
awToolTip: 'View/Edit host',
awToolTip: 'Edit host',
dataPlacement: 'top'
},

39
awx/ui/static/js/lists/Inventories.js
View File

@@ -31,8 +31,8 @@ angular.module('InventoriesListDefinition', [])
sourceField: 'name',
excludeModal: true
},
failed_hosts: {
label: 'Failed Hosts',
/*failed_hosts: {
label: 'Failures',
ngHref: "\{\{ inventory.failed_hosts_link \}\}",
badgeIcon: "\{\{ 'fa icon-failures-' + inventory.failed_hosts_class \}\}",
badgeNgHref: "\{\{ inventory.failed_hosts_link \}\}",
@@ -48,7 +48,7 @@ angular.module('InventoriesListDefinition', [])
status: {
label: 'Status',
ngHref: "\{\{ inventory.status_link \}\}",
badgeIcon: "\{\{ 'fa icon-cloud-' + inventory.status_class \}\}",
badgeIcon: "\{\{ 'fa fa-cloud icon-cloud-' + inventory.status_class \}\}",
badgeNgHref: "\{\{ inventory.status_link \}\}",
badgePlacement: 'left',
badgeTipPlacement: 'top',
@@ -58,24 +58,25 @@ angular.module('InventoriesListDefinition', [])
searchable: false,
excludeModal: true,
sortField: "inventory_sources_with_failures"
},
},*/
has_inventory_sources: {
label: 'Has external sources?',
label: 'Cloud sourced',
searchSingleValue: true,
searchType: 'boolean',
searchValue: 'true',
searchOnly: true
},
has_active_failures: {
label: 'Has failed hosts?',
label: 'Failed hosts',
searchSingleValue: true,
searchType: 'boolean',
searchValue: 'true',
searchOnly: true
},
inventory_sources_with_failures: {
label: 'Has inventory update failures?',
searchType: 'gtzero',
label: 'Sync failures',
searchType: 'gtzero',
searchValue: 'true',
searchOnly: true
}
},
@@ -96,22 +97,33 @@ angular.module('InventoriesListDefinition', [])
},
fieldActions: {
status: {
//label: 'Status',
ngHref: "\{\{ inventory.status_link \}\}",
iconClass: "\{\{ 'fa fa-cloud icon-cloud-' + inventory.status_class \}\}",
awToolTip: "\{\{ inventory.status_tip \}\}",
dataPlacement: "top"
},
failed_hosts: {
//label: 'Failures',
ngHref: "\{\{ inventory.failed_hosts_link \}\}",
iconClass: "\{\{ 'fa icon-failures-' + inventory.failed_hosts_class \}\}",
awToolTip: "\{\{ inventory.failed_hosts_tip \}\}",
dataPlacement: "top",
},
edit: {
label: 'Edit',
ngClick: "editInventory(\{\{ inventory.id \}\})",
icon: 'icon-edit',
"class": 'btn-xs btn-default',
awToolTip: 'Edit inventory',
dataPlacement: 'top'
},
"delete": {
label: 'Delete',
ngClick: "deleteInventory(\{\{ inventory.id \}\},'\{\{ inventory.name \}\}')",
icon: 'icon-trash',
"class": 'btn-xs btn-danger',
awToolTip: 'Delete inventory',
dataPlacement: 'top'
},
}
/*,
dropdown: {
type: 'DropDown',
label: 'Jobs',
@@ -122,5 +134,6 @@ angular.module('InventoriesListDefinition', [])
{ ngClick: "viewFailedJobs(\{\{ inventory.id \}\})", label: 'Failed' }
]
}
*/
}
});

2
awx/ui/static/js/lists/Organizations.js
View File

@@ -47,7 +47,7 @@ angular.module('OrganizationListDefinition', [])
ngClick: "editOrganization(\{\{ organization.id \}\})",
icon: 'icon-edit',
"class": 'btn-xs btn-default',
awToolTip: 'View/Edit organization',
awToolTip: 'Edit organization',
dataPlacement: 'top'
},

2
awx/ui/static/js/lists/Permissions.js
View File

@@ -62,7 +62,7 @@ angular.module('PermissionListDefinition', [])
ngClick: "editPermission(\{\{ permission.id \}\})",
icon: 'icon-edit',
"class": 'btn-xs btn-default',
awToolTip: 'View/Edit permission',
awToolTip: 'Edit permission',
dataPlacement: 'top'
},

2
awx/ui/static/js/lists/Projects.js
View File

@@ -95,7 +95,7 @@ angular.module('ProjectsListDefinition', [])
ngClick: "editProject(\{\{ project.id \}\})",
icon: 'icon-edit',
"class": 'btn-xs btn-default',
awToolTip: 'View/edit project properties',
awToolTip: 'Edit project properties',
dataPlacement: 'top'
},
scm_update: {

2
awx/ui/static/js/lists/Teams.js
View File

@@ -54,7 +54,7 @@ angular.module('TeamsListDefinition', [])
ngClick: "editTeam(\{\{ team.id \}\})",
icon: 'icon-edit',
"class": 'btn-xs btn-default',
awToolTip: 'View/Edit team',
awToolTip: 'Edit team',
dataPlacement: 'top'
},

2
awx/ui/static/js/lists/Users.js
View File

@@ -56,7 +56,7 @@ angular.module('UserListDefinition', [])
ngClick: "editUser(\{\{ user.id \}\})",
icon: 'icon-edit',
"class": 'btn-xs btn-default',
awToolTip: 'View/Edit user',
awToolTip: 'Edit user',
dataPlacement: 'top'
},