From 106023e5304ebf77cf932c1bc67617be011efc93 Mon Sep 17 00:00:00 2001 From: chouseknecht Date: Tue, 10 Sep 2013 03:11:29 -0400 Subject: [PATCH] Inventory cleanup. Added tooltip to host status indicators. Did same for project status indicator. Fixed inventory host create button color. --- awx/ui/static/js/forms/InventoryHosts.js | 4 +++- awx/ui/static/js/helpers/Hosts.js | 6 ++++-- awx/ui/static/js/lists/Inventories.js | 2 +- awx/ui/static/js/lists/Projects.js | 4 +++- 4 files changed, 11 insertions(+), 5 deletions(-) diff --git a/awx/ui/static/js/forms/InventoryHosts.js b/awx/ui/static/js/forms/InventoryHosts.js index eea53a202f..3e4051ba2e 100644 --- a/awx/ui/static/js/forms/InventoryHosts.js +++ b/awx/ui/static/js/forms/InventoryHosts.js @@ -21,7 +21,9 @@ angular.module('InventoryHostsFormDefinition', []) label: 'Host Name', ngClick: "editHost(\{\{ host.id \}\}, '\{\{ host.name \}\}')", badgeIcon: "\{\{ 'icon-failures-' + host.has_active_failures \}\}", + badgeToolTip: 'Indicates if host has active failures', badgePlacement: 'left', + badgeTipPlacement: 'bottom', columnClass: 'col-lg-3' }, groups: { @@ -59,7 +61,7 @@ angular.module('InventoryHostsFormDefinition', []) ngHide: "hostAddHide", awToolTip: "Copy an existing host to the selected group", dataPlacement: 'bottom', - 'class': 'btn-sm btn-primary', + 'class': 'btn-sm btn-success', icon: 'icon-check' }, create: { diff --git a/awx/ui/static/js/helpers/Hosts.js b/awx/ui/static/js/helpers/Hosts.js index 12013cba0a..d9add44391 100644 --- a/awx/ui/static/js/helpers/Hosts.js +++ b/awx/ui/static/js/helpers/Hosts.js @@ -479,7 +479,8 @@ angular.module('HostsHelper', [ 'RestServices', 'Utilities', 'ListGenerator', 'H "data-name=\"" + sorted[i].name + "\" " + "data-group-id=\"" + sorted[i].id + "\" " + "> " + - " " + + " " + "" + sorted[i].name + " "; if (sorted[i].children.length > 0) { buildHTML(sorted[i].children); @@ -649,7 +650,8 @@ angular.module('HostsHelper', [ 'RestServices', 'Utilities', 'ListGenerator', 'H "data-groups=\"" + data.related.groups + "\" " + "data-name=\"" + data.name + "\" " + "> " + - " " + + " " + "" + data.name + ""; scope.$emit('buildAllGroups', data.name, data.related.tree, data.related.groups); scope.$emit('refreshHost', null, 'All Hosts'); diff --git a/awx/ui/static/js/lists/Inventories.js b/awx/ui/static/js/lists/Inventories.js index 76fcd645ac..f55812f71c 100644 --- a/awx/ui/static/js/lists/Inventories.js +++ b/awx/ui/static/js/lists/Inventories.js @@ -24,7 +24,7 @@ angular.module('InventoriesListDefinition', []) label: 'Name', badgeIcon: "\{\{ 'icon-failures-' + inventory.has_active_failures \}\}", badgePlacement: 'left', - badgeToolTip: 'Inventory contains hosts with active failures', + badgeToolTip: 'Indicates if inventory contains hosts with active failures', badgeTipPlacement: 'bottom' }, description: { diff --git a/awx/ui/static/js/lists/Projects.js b/awx/ui/static/js/lists/Projects.js index 4cd74b1bd2..d6629ebfac 100644 --- a/awx/ui/static/js/lists/Projects.js +++ b/awx/ui/static/js/lists/Projects.js @@ -24,7 +24,9 @@ angular.module('ProjectsListDefinition', []) key: true, label: 'Name', badgeIcon: "\{\{ 'icon-failures-' + project.badge \}\}", - badgePlacement: 'left' + badgePlacement: 'left', + badgeToolTip: "Indicates the project\'s health based on its status", + badgeTipPlacement: 'bottom' }, description: { label: 'Description'