From e3893f15242fc63a3aefad5024d7ff1b20694be8 Mon Sep 17 00:00:00 2001 From: chouseknecht Date: Wed, 17 Jul 2013 17:23:35 -0400 Subject: [PATCH] Button clean-up all Edit/View buttons now match and have a black on grey color --- awx/ui/static/js/forms/Inventories.js | 1 - awx/ui/static/js/forms/Organizations.js | 2 -- awx/ui/static/js/forms/Teams.js | 4 ---- awx/ui/static/js/forms/Users.js | 2 -- awx/ui/static/js/lists/Credentials.js | 2 +- awx/ui/static/js/lists/Groups.js | 2 +- awx/ui/static/js/lists/Hosts.js | 2 +- awx/ui/static/js/lists/Inventories.js | 2 +- awx/ui/static/js/lists/JobTemplates.js | 2 +- awx/ui/static/js/lists/Organizations.js | 2 +- awx/ui/static/js/lists/Permissions.js | 4 ++-- awx/ui/static/js/lists/Projects.js | 2 +- awx/ui/static/js/lists/Teams.js | 2 +- awx/ui/static/js/lists/Users.js | 2 +- 14 files changed, 11 insertions(+), 20 deletions(-) diff --git a/awx/ui/static/js/forms/Inventories.js b/awx/ui/static/js/forms/Inventories.js index d141aecb92..1512ac4ef3 100644 --- a/awx/ui/static/js/forms/Inventories.js +++ b/awx/ui/static/js/forms/Inventories.js @@ -152,7 +152,6 @@ angular.module('InventoryFormDefinition', []) ngClick: "editHost(\{\{ host.id \}\}, '\{\{ host.name \}\}')", icon: 'icon-edit', label: 'Edit', - "class": 'btn-success', awToolTip: 'Edit host' }, "delete": { diff --git a/awx/ui/static/js/forms/Organizations.js b/awx/ui/static/js/forms/Organizations.js index 857cb91c76..eed21b1721 100644 --- a/awx/ui/static/js/forms/Organizations.js +++ b/awx/ui/static/js/forms/Organizations.js @@ -82,7 +82,6 @@ angular.module('OrganizationFormDefinition', []) label: 'Edit', ngClick: "edit('users', \{\{ user.id \}\}, '\{\{ user.username \}\}')", icon: 'icon-edit', - "class": 'btn-success', awToolTip: 'Edit user' }, "delete": { @@ -126,7 +125,6 @@ angular.module('OrganizationFormDefinition', []) label: 'Edit', ngClick: "edit('users', \{\{ admin.id \}\}, '\{\{ admin.username \}\}')", icon: 'icon-edit', - "class": 'btn-success', awToolTip: 'Edit administrator' }, "delete": { diff --git a/awx/ui/static/js/forms/Teams.js b/awx/ui/static/js/forms/Teams.js index 11ab407005..13b4b98e7f 100644 --- a/awx/ui/static/js/forms/Teams.js +++ b/awx/ui/static/js/forms/Teams.js @@ -92,7 +92,6 @@ angular.module('TeamFormDefinition', []) label: 'Edit', ngClick: "edit('credentials', \{\{ credential.id \}\}, '\{\{ credential.name \}\}')", icon: 'icon-edit', - "class": 'btn-success', awToolTip: 'Modify the credential' }, "delete": { @@ -148,7 +147,6 @@ angular.module('TeamFormDefinition', []) label: 'Edit', ngClick: "edit('permissions', \{\{ permission.id \}\}, '\{\{ permission.name \}\}')", icon: 'icon-edit', - "class": 'btn-success', awToolTip: 'Edit the permission' }, @@ -192,7 +190,6 @@ angular.module('TeamFormDefinition', []) label: 'Edit', ngClick: "edit('projects', \{\{ project.id \}\}, '\{\{ project.name \}\}')", icon: 'icon-edit', - "class": 'btn-success', awToolTip: 'Modify the project' }, "delete": { @@ -238,7 +235,6 @@ angular.module('TeamFormDefinition', []) label: 'Edit', ngClick: "edit('users', \{\{ user.id \}\}, '\{\{ user.username \}\}')", icon: 'icon-edit', - "class": 'btn-success', awToolTip: 'Edit user' }, "delete": { diff --git a/awx/ui/static/js/forms/Users.js b/awx/ui/static/js/forms/Users.js index 5e3623d155..f391794a45 100644 --- a/awx/ui/static/js/forms/Users.js +++ b/awx/ui/static/js/forms/Users.js @@ -133,7 +133,6 @@ angular.module('UserFormDefinition', []) label: 'Edit', ngClick: "edit('credentials', \{\{ credential.id \}\}, '\{\{ credential.name \}\}')", icon: 'icon-edit', - "class": 'btn-success', awToolTip: 'Edit the credential' }, "delete": { @@ -190,7 +189,6 @@ angular.module('UserFormDefinition', []) label: 'Edit', ngClick: "edit('permissions', \{\{ permission.id \}\}, '\{\{ permission.name \}\}')", icon: 'icon-edit', - "class": 'btn-success', awToolTip: 'Edit the permission' }, diff --git a/awx/ui/static/js/lists/Credentials.js b/awx/ui/static/js/lists/Credentials.js index da75f83e7d..672fc30abc 100644 --- a/awx/ui/static/js/lists/Credentials.js +++ b/awx/ui/static/js/lists/Credentials.js @@ -59,7 +59,7 @@ angular.module('CredentialsListDefinition', []) ngClick: "editCredential(\{\{ credential.id \}\})", icon: 'icon-edit', label: 'Edit', - "class": 'btn-small btn-success', + "class": 'btn-small', awToolTip: 'View/Edit credential' }, diff --git a/awx/ui/static/js/lists/Groups.js b/awx/ui/static/js/lists/Groups.js index 457cbb741b..cd7ab19686 100644 --- a/awx/ui/static/js/lists/Groups.js +++ b/awx/ui/static/js/lists/Groups.js @@ -55,7 +55,7 @@ angular.module('GroupListDefinition', []) label: 'Edit', ngClick: "editGroup(\{\{ group.id \}\})", icon: 'icon-edit', - "class": 'btn-small btn-success', + "class": 'btn-small', awToolTip: 'View/Edit group' }, diff --git a/awx/ui/static/js/lists/Hosts.js b/awx/ui/static/js/lists/Hosts.js index 9dba2d971d..a35586fb48 100644 --- a/awx/ui/static/js/lists/Hosts.js +++ b/awx/ui/static/js/lists/Hosts.js @@ -47,7 +47,7 @@ angular.module('HostListDefinition', []) label: 'Edit', ngClick: "editHost(\{\{ host.id \}\})", icon: 'icon-edit', - "class": 'btn-small btn-success', + "class": 'btn-small', awToolTip: 'View/Edit host' }, diff --git a/awx/ui/static/js/lists/Inventories.js b/awx/ui/static/js/lists/Inventories.js index ff99139ded..ae3314813f 100644 --- a/awx/ui/static/js/lists/Inventories.js +++ b/awx/ui/static/js/lists/Inventories.js @@ -63,7 +63,7 @@ angular.module('InventoriesListDefinition', []) label: 'Edit', ngClick: "editInventory(\{\{ inventory.id \}\})", icon: 'icon-edit', - "class": 'btn-small btn-success', + "class": 'btn-small', awToolTip: 'View/Edit inventory' }, diff --git a/awx/ui/static/js/lists/JobTemplates.js b/awx/ui/static/js/lists/JobTemplates.js index 88f98e59b9..f462d241c3 100644 --- a/awx/ui/static/js/lists/JobTemplates.js +++ b/awx/ui/static/js/lists/JobTemplates.js @@ -46,7 +46,7 @@ angular.module('JobTemplatesListDefinition', []) ngClick: "editJobTemplate(\{\{ job_template.id \}\})", icon: 'icon-edit', awToolTip: 'Edit template', - "class": 'btn-small btn-success' + "class": 'btn-small' }, submit: { label: 'Launch', diff --git a/awx/ui/static/js/lists/Organizations.js b/awx/ui/static/js/lists/Organizations.js index 7eebafdfa2..48db53229d 100644 --- a/awx/ui/static/js/lists/Organizations.js +++ b/awx/ui/static/js/lists/Organizations.js @@ -43,7 +43,7 @@ angular.module('OrganizationListDefinition', []) label: 'Edit', ngClick: "editOrganization(\{\{ organization.id \}\})", icon: 'icon-edit', - "class": 'btn-small btn-success', + "class": 'btn-small', awToolTip: 'View/Edit organization' }, diff --git a/awx/ui/static/js/lists/Permissions.js b/awx/ui/static/js/lists/Permissions.js index 4fd6513d83..77e6a48a89 100644 --- a/awx/ui/static/js/lists/Permissions.js +++ b/awx/ui/static/js/lists/Permissions.js @@ -44,7 +44,7 @@ angular.module('PermissionListDefinition', []) actions: { add: { icon: 'icon-plus', - label: 'Add', + label: 'Create New', mode: 'all', // One of: edit, select, all ngClick: 'addPermission()', "class": 'btn-success btn-small', @@ -57,7 +57,7 @@ angular.module('PermissionListDefinition', []) label: 'Edit', ngClick: "editPermission(\{\{ permission.id \}\})", icon: 'icon-edit', - "class": 'btn-small btn-success', + "class": 'btn-small', awToolTip: 'View/Edit permission' }, diff --git a/awx/ui/static/js/lists/Projects.js b/awx/ui/static/js/lists/Projects.js index 4ebd1ac6b5..f2d0cbf6f2 100644 --- a/awx/ui/static/js/lists/Projects.js +++ b/awx/ui/static/js/lists/Projects.js @@ -45,7 +45,7 @@ angular.module('ProjectsListDefinition', []) label: 'Edit', ngClick: "editProject(\{\{ project.id \}\})", icon: 'icon-edit', - "class": 'btn-small btn-success', + "class": 'btn-small', awToolTip: 'View/edit project' }, diff --git a/awx/ui/static/js/lists/Teams.js b/awx/ui/static/js/lists/Teams.js index 1aaab0f3df..3f71f18e9c 100644 --- a/awx/ui/static/js/lists/Teams.js +++ b/awx/ui/static/js/lists/Teams.js @@ -40,7 +40,7 @@ angular.module('TeamsListDefinition', []) icon: 'icon-plus', mode: 'all', // One of: edit, select, all ngClick: 'addTeam()', - "class": 'btn-success btn-small', + "class": 'btn-small', awToolTip: 'Create a new team' } }, diff --git a/awx/ui/static/js/lists/Users.js b/awx/ui/static/js/lists/Users.js index f02c08a074..fcdcebc1cb 100644 --- a/awx/ui/static/js/lists/Users.js +++ b/awx/ui/static/js/lists/Users.js @@ -50,7 +50,7 @@ angular.module('UserListDefinition', []) label: 'Edit', ngClick: "editUser(\{\{ user.id \}\})", icon: 'icon-edit', - "class": 'btn-small btn-success', + "class": 'btn-small', awToolTip: 'View/Edit user' },