External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-03-13 15:09:32 -02:30
Code Issues Packages Projects Releases Wiki Activity

AC-322 Job list now presents either a Delete or Cancel button based on the job's status. Changed delete icon from icon-remove to icon-trash throughout application.

Browse Source
This commit is contained in:
chouseknecht
2013-07-31 11:53:36 -04:00
parent b1fd10c924
commit 4b8f0c2829
22 changed files with 41 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -121,7 +121,7 @@ angular.module('CredentialFormDefinition', [])
reset: { reset: {
ngClick: 'formReset()', ngClick: 'formReset()',
label: 'Reset', label: 'Reset',
icon: 'icon-remove', icon: 'icon-trash',
ngDisabled: true //Disabled when $pristine ngDisabled: true //Disabled when $pristine
} }
}, },

2
awx/ui/static/js/forms/Groups.js
View File

@@ -61,7 +61,7 @@ angular.module('GroupFormDefinition', [])
reset: { reset: {
ngClick: 'formReset()', ngClick: 'formReset()',
label: 'Reset', label: 'Reset',
icon: 'icon-remove', icon: 'icon-trash',
ngDisabled: true //Disabled when $pristine ngDisabled: true //Disabled when $pristine
} }
}, },

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

@@ -75,7 +75,7 @@ angular.module('HostFormDefinition', [])
reset: { reset: {
ngClick: 'formReset()', ngClick: 'formReset()',
label: 'Reset', label: 'Reset',
icon: 'icon-remove', icon: 'icon-trash',
ngDisabled: true //Disabled when $pristine ngDisabled: true //Disabled when $pristine
} }
}, },

4
awx/ui/static/js/forms/Inventories.js
View File

@@ -91,7 +91,7 @@ angular.module('InventoryFormDefinition', [])
reset: { reset: {
ngClick: 'formReset()', ngClick: 'formReset()',
label: 'Reset', label: 'Reset',
icon: 'icon-remove', icon: 'icon-trash',
ngDisabled: true //Disabled when $pristine ngDisabled: true //Disabled when $pristine
} }
}, },
@@ -166,7 +166,7 @@ angular.module('InventoryFormDefinition', [])
}, },
"delete": { "delete": {
ngClick: "deleteHost(\{\{ host.id \}\}, '\{\{ host.name \}\}')", ngClick: "deleteHost(\{\{ host.id \}\}, '\{\{ host.name \}\}')",
icon: 'icon-remove', icon: 'icon-trash',
label: 'Delete', label: 'Delete',
"class": 'btn-danger', "class": 'btn-danger',
awToolTip: 'Permanently remove this host from the inventory' awToolTip: 'Permanently remove this host from the inventory'

2
awx/ui/static/js/forms/JobTemplates.js
View File

@@ -231,7 +231,7 @@ angular.module('JobTemplateFormDefinition', [])
reset: { reset: {
ngClick: 'formReset()', ngClick: 'formReset()',
label: 'Reset', label: 'Reset',
icon: 'icon-remove', icon: 'icon-trash',
ngDisabled: true //Disabled when $pristine ngDisabled: true //Disabled when $pristine
} }
}, },

6
awx/ui/static/js/forms/Organizations.js
View File

@@ -42,7 +42,7 @@ angular.module('OrganizationFormDefinition', [])
reset: { reset: {
ngClick: 'formReset()', ngClick: 'formReset()',
label: 'Reset', label: 'Reset',
icon: 'icon-remove', icon: 'icon-trash',
ngDisabled: true //Disabled when $pristine ngDisabled: true //Disabled when $pristine
} }
}, },
@@ -87,7 +87,7 @@ angular.module('OrganizationFormDefinition', [])
"delete": { "delete": {
label: 'Delete', label: 'Delete',
ngClick: "delete('users', \{\{ user.id \}\}, '\{\{ user.username \}\}', 'users')", ngClick: "delete('users', \{\{ user.id \}\}, '\{\{ user.username \}\}', 'users')",
icon: 'icon-remove', icon: 'icon-trash',
"class": 'btn-danger', "class": 'btn-danger',
awToolTip: 'Remove user' awToolTip: 'Remove user'
} }
@@ -130,7 +130,7 @@ angular.module('OrganizationFormDefinition', [])
"delete": { "delete": {
label: 'Delete', label: 'Delete',
ngClick: "delete('admins', \{\{ admin.id \}\}, '\{\{ admin.username \}\}', 'administrators')", ngClick: "delete('admins', \{\{ admin.id \}\}, '\{\{ admin.username \}\}', 'administrators')",
icon: 'icon-remove', icon: 'icon-trash',
"class": 'btn-danger', "class": 'btn-danger',
awToolTip: 'Remove administrator' awToolTip: 'Remove administrator'
} }

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

@@ -97,7 +97,7 @@ angular.module('PermissionFormDefinition', [])
reset: { reset: {
ngClick: 'formReset()', ngClick: 'formReset()',
label: 'Reset', label: 'Reset',
icon: 'icon-remove', icon: 'icon-trash',
ngDisabled: true //Disabled when $pristine ngDisabled: true //Disabled when $pristine
} }
}, },

4
awx/ui/static/js/forms/Projects.js
View File

@@ -82,7 +82,7 @@ angular.module('ProjectFormDefinition', [])
reset: { reset: {
ngClick: 'formReset()', ngClick: 'formReset()',
label: 'Reset', label: 'Reset',
icon: 'icon-remove', icon: 'icon-trash',
ngDisabled: true //Disabled when $pristine ngDisabled: true //Disabled when $pristine
} }
}, },
@@ -123,7 +123,7 @@ angular.module('ProjectFormDefinition', [])
"delete": { "delete": {
label: 'Delete', label: 'Delete',
ngClick: "delete('organizations', \{\{ organization.id \}\}, '\{\{ organization.name \}\}', 'organizations')", ngClick: "delete('organizations', \{\{ organization.id \}\}, '\{\{ organization.name \}\}', 'organizations')",
icon: 'icon-remove', icon: 'icon-trash',
"class": 'btn-danger', "class": 'btn-danger',
awToolTip: 'Delete the organization' awToolTip: 'Delete the organization'
} }

10
awx/ui/static/js/forms/Teams.js
View File

@@ -56,7 +56,7 @@ angular.module('TeamFormDefinition', [])
reset: { reset: {
ngClick: 'formReset()', ngClick: 'formReset()',
label: 'Reset', label: 'Reset',
icon: 'icon-remove', icon: 'icon-trash',
ngDisabled: true //Disabled when $pristine ngDisabled: true //Disabled when $pristine
} }
}, },
@@ -98,7 +98,7 @@ angular.module('TeamFormDefinition', [])
"delete": { "delete": {
label: 'Delete', label: 'Delete',
ngClick: "delete('credentials', \{\{ credential.id \}\}, '\{\{ credential.name \}\}', 'credentials')", ngClick: "delete('credentials', \{\{ credential.id \}\}, '\{\{ credential.name \}\}', 'credentials')",
icon: 'icon-remove', icon: 'icon-trash',
"class": 'btn-danger', "class": 'btn-danger',
awToolTip: 'Remove the credential' awToolTip: 'Remove the credential'
} }
@@ -154,7 +154,7 @@ angular.module('TeamFormDefinition', [])
"delete": { "delete": {
label: 'Delete', label: 'Delete',
ngClick: "delete('permissions', \{\{ permission.id \}\}, '\{\{ permission.name \}\}', 'permissions')", ngClick: "delete('permissions', \{\{ permission.id \}\}, '\{\{ permission.name \}\}', 'permissions')",
icon: 'icon-remove', icon: 'icon-trash',
"class": 'btn-danger', "class": 'btn-danger',
awToolTip: 'Delete the permission' awToolTip: 'Delete the permission'
} }
@@ -196,7 +196,7 @@ angular.module('TeamFormDefinition', [])
"delete": { "delete": {
label: 'Delete', label: 'Delete',
ngClick: "delete('projects', \{\{ project.id \}\}, '\{\{ project.name \}\}', 'projects')", ngClick: "delete('projects', \{\{ project.id \}\}, '\{\{ project.name \}\}', 'projects')",
icon: 'icon-remove', icon: 'icon-trash',
"class": 'btn-danger', "class": 'btn-danger',
awToolTip: 'Remove the project' awToolTip: 'Remove the project'
} }
@@ -241,7 +241,7 @@ angular.module('TeamFormDefinition', [])
"delete": { "delete": {
label: 'Delete', label: 'Delete',
ngClick: "delete('users', \{\{ user.id \}\}, '\{\{ user.username \}\}', 'users')", ngClick: "delete('users', \{\{ user.id \}\}, '\{\{ user.username \}\}', 'users')",
icon: 'icon-remove', icon: 'icon-terash',
"class": 'btn-danger', "class": 'btn-danger',
awToolTip: 'Remove user' awToolTip: 'Remove user'
} }

6
awx/ui/static/js/forms/Users.js
View File

@@ -97,7 +97,7 @@ angular.module('UserFormDefinition', [])
reset: { reset: {
ngClick: 'formReset()', ngClick: 'formReset()',
label: 'Reset', label: 'Reset',
icon: 'icon-remove', icon: 'icon-trash',
ngDisabled: true //Disabled when $pristine ngDisabled: true //Disabled when $pristine
} }
}, },
@@ -139,7 +139,7 @@ angular.module('UserFormDefinition', [])
"delete": { "delete": {
label: 'Delete', label: 'Delete',
ngClick: "delete('credentials', \{\{ credential.id \}\}, '\{\{ credential.name \}\}', 'credentials')", ngClick: "delete('credentials', \{\{ credential.id \}\}, '\{\{ credential.name \}\}', 'credentials')",
icon: 'icon-remove', icon: 'icon-trash',
"class": 'btn-danger', "class": 'btn-danger',
awToolTip: 'Delete the credential' awToolTip: 'Delete the credential'
} }
@@ -197,7 +197,7 @@ angular.module('UserFormDefinition', [])
"delete": { "delete": {
label: 'Delete', label: 'Delete',
ngClick: "delete('permissions', \{\{ permission.id \}\}, '\{\{ permission.name \}\}', 'permissions')", ngClick: "delete('permissions', \{\{ permission.id \}\}, '\{\{ permission.name \}\}', 'permissions')",
icon: 'icon-remove', icon: 'icon-trash',
"class": 'btn-danger', "class": 'btn-danger',
awToolTip: 'Delete the permission' awToolTip: 'Delete the permission'
} }

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

@@ -65,7 +65,7 @@ angular.module('CredentialsListDefinition', [])
"delete": { "delete": {
ngClick: "deleteCredential(\{\{ credential.id \}\},'\{\{ credential.name \}\}')", ngClick: "deleteCredential(\{\{ credential.id \}\},'\{\{ credential.name \}\}')",
icon: 'icon-remove', icon: 'icon-trash',
label: 'Delete', label: 'Delete',
"class": 'btn-small btn-danger', "class": 'btn-small btn-danger',
awToolTip: 'Delete credential' awToolTip: 'Delete credential'

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

@@ -64,7 +64,7 @@ angular.module('GroupListDefinition', [])
"delete": { "delete": {
label: 'Delete', label: 'Delete',
ngClick: "deleteGroup(\{\{ group.id \}\},'\{\{ group.name \}\}')", ngClick: "deleteGroup(\{\{ group.id \}\},'\{\{ group.name \}\}')",
icon: 'icon-remove', icon: 'icon-trash',
"class": 'btn-small btn-danger', "class": 'btn-small btn-danger',
awToolTip: 'Delete group' awToolTip: 'Delete group'
} }

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

@@ -55,7 +55,7 @@ angular.module('HostListDefinition', [])
"delete": { "delete": {
label: 'Delete', label: 'Delete',
ngClick: "deleteHost(\{\{ host.id \}\},'\{\{ host.name \}\}')", ngClick: "deleteHost(\{\{ host.id \}\},'\{\{ host.name \}\}')",
icon: 'icon-remove', icon: 'icon-trash',
"class": 'btn-small btn-danger', "class": 'btn-small btn-danger',
awToolTip: 'Delete host' awToolTip: 'Delete host'
} }

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

@@ -70,7 +70,7 @@ angular.module('InventoriesListDefinition', [])
"delete": { "delete": {
label: 'Delete', label: 'Delete',
ngClick: "deleteInventory(\{\{ inventory.id \}\},'\{\{ inventory.name \}\}')", ngClick: "deleteInventory(\{\{ inventory.id \}\},'\{\{ inventory.name \}\}')",
icon: 'icon-remove', icon: 'icon-trash',
"class": 'btn-small btn-danger', "class": 'btn-small btn-danger',
awToolTip: 'Delete inventory' awToolTip: 'Delete inventory'
} }

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

@@ -59,7 +59,7 @@ angular.module('JobTemplatesListDefinition', [])
"delete": { "delete": {
label: 'Delete', label: 'Delete',
ngClick: "deleteJobTemplate(\{\{ job_template.id \}\},'\{\{ job_template.name \}\}')", ngClick: "deleteJobTemplate(\{\{ job_template.id \}\},'\{\{ job_template.name \}\}')",
icon: 'icon-remove', icon: 'icon-trash',
"class": 'btn-danger btn-small', "class": 'btn-danger btn-small',
awToolTip: 'Delete template' awToolTip: 'Delete template'
} }

10
awx/ui/static/js/lists/Jobs.js
View File

@@ -103,7 +103,15 @@ angular.module('JobsListDefinition', [])
ngClick: 'deleteJob(\{\{ job.id \}\})', ngClick: 'deleteJob(\{\{ job.id \}\})',
"class": 'btn-danger btn-small', "class": 'btn-danger btn-small',
awToolTip: 'Cancel job', awToolTip: 'Cancel job',
ngDisabled: "job.status != 'new' && job.status != 'pending' && job.status != 'running'" ngShow: "job.status == 'pending' || job.status == 'running'"
},
"delete": {
icon: 'icon-trash',
mode: 'all',
ngClick: 'deleteJob(\{\{ job.id \}\})',
"class": 'btn-danger btn-small',
awToolTip: 'Delete this job',
ngShow: "job.status != 'pending' && job.status != 'running'"
} }
} }
}); });

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

@@ -50,7 +50,7 @@ angular.module('OrganizationListDefinition', [])
"delete": { "delete": {
label: 'Delete', label: 'Delete',
ngClick: "deleteOrganization(\{\{ organization.id \}\},'\{\{ organization.name \}\}')", ngClick: "deleteOrganization(\{\{ organization.id \}\},'\{\{ organization.name \}\}')",
icon: 'icon-remove', icon: 'icon-trash',
"class": 'btn-small btn-danger', "class": 'btn-small btn-danger',
awToolTip: 'Delete organization' awToolTip: 'Delete organization'
} }

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

@@ -64,7 +64,7 @@ angular.module('PermissionListDefinition', [])
"delete": { "delete": {
label: 'Delete', label: 'Delete',
ngClick: "deletePermission(\{\{ permission.id \}\},'\{\{ permission.name \}\}')", ngClick: "deletePermission(\{\{ permission.id \}\},'\{\{ permission.name \}\}')",
icon: 'icon-remove', icon: 'icon-trash',
"class": 'btn-small btn-danger', "class": 'btn-small btn-danger',
awToolTip: 'Delete permission' awToolTip: 'Delete permission'
} }

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

@@ -52,7 +52,7 @@ angular.module('ProjectsListDefinition', [])
"delete": { "delete": {
label: 'Delete', label: 'Delete',
ngClick: "deleteProject(\{\{ project.id \}\},'\{\{ project.name \}\}')", ngClick: "deleteProject(\{\{ project.id \}\},'\{\{ project.name \}\}')",
icon: 'icon-remove', icon: 'icon-trash',
"class": 'btn-small btn-danger', "class": 'btn-small btn-danger',
awToolTip: 'Delete project' awToolTip: 'Delete project'
} }

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

@@ -57,7 +57,7 @@ angular.module('TeamsListDefinition', [])
"delete": { "delete": {
label: 'Delete', label: 'Delete',
ngClick: "deleteTeam(\{\{ team.id \}\},'\{\{ team.name \}\}')", ngClick: "deleteTeam(\{\{ team.id \}\},'\{\{ team.name \}\}')",
icon: 'icon-remove', icon: 'icon-trash',
"class": 'btn-small btn-danger', "class": 'btn-small btn-danger',
awToolTip: 'Delete team' awToolTip: 'Delete team'
} }

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

@@ -57,7 +57,7 @@ angular.module('UserListDefinition', [])
"delete": { "delete": {
label: 'Delete', label: 'Delete',
ngClick: "deleteUser(\{\{ user.id \}\},'\{\{ user.username \}\}')", ngClick: "deleteUser(\{\{ user.id \}\},'\{\{ user.username \}\}')",
icon: 'icon-remove', icon: 'icon-trash',
"class": 'btn-small btn-danger', "class": 'btn-small btn-danger',
awToolTip: 'Delete user' awToolTip: 'Delete user'
} }

2
awx/ui/static/lib/ansible/list-generator.js
View File

@@ -45,6 +45,8 @@ angular.module('ListGenerator', ['GeneratorHelpers'])
html += (btn.dataPlacement) ? this.attr(btn, 'dataPlacement') : ""; html += (btn.dataPlacement) ? this.attr(btn, 'dataPlacement') : "";
html += (btn.dataContainer) ? this.attr(btn, 'dataContainer') : ""; html += (btn.dataContainer) ? this.attr(btn, 'dataContainer') : "";
html += (btn.dataTitle) ? this.attr(btn, 'dataTitle') : ""; html += (btn.dataTitle) ? this.attr(btn, 'dataTitle') : "";
html += (btn.ngShow) ? this.attr(btn, 'ngShow') : "";
html += (btn.ngHide) ? this.attr(btn, 'ngHide') : "";
html += " >" + this.attr(btn,'icon'); html += " >" + this.attr(btn,'icon');
html += (btn.label) ? " " + btn.label : ""; html += (btn.label) ? " " + btn.label : "";
html += "</button> "; html += "</button> ";