From 65aae82827edddbc7cd36f6d841a3d39761c5d49 Mon Sep 17 00:00:00 2001
From: Chris Houseknecht <chouse@ansible.com>
Date: Sat, 22 Mar 2014 21:17:24 -0400
Subject: [PATCH] Fixed inventory host status to work with pop-over changes.

---
 awx/ui/static/js/helpers/Hosts.js           | 2 ++
 awx/ui/static/js/lists/InventoryHosts.js    | 3 ++-
 awx/ui/static/less/ansible-ui.less          | 8 ++++----
 awx/ui/static/lib/ansible/directives.js     | 1 -
 awx/ui/static/lib/ansible/list-generator.js | 4 +++-
 5 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/awx/ui/static/js/helpers/Hosts.js b/awx/ui/static/js/helpers/Hosts.js
index dfe508b2e7..93efd6f655 100644
--- a/awx/ui/static/js/helpers/Hosts.js
+++ b/awx/ui/static/js/helpers/Hosts.js
@@ -113,10 +113,12 @@ angular.module('HostsHelper', [ 'RestServices', 'Utilities', 'ListGenerator', 'H
                     }
                     html += "</tbody>\n";
                     html += "</table>\n";
+                    html += "<div class=\"popover-footer\"><span class=\"key\">esc</span> or click to close</div>\n";
                 }
                 else {
                     title = 'No job data';
                     html = '<p>No recent job data available for this host.</p>';
+                    html += "<div class=\"popover-footer\"><span class=\"key\">esc</span> or click to close</div>\n";
                 }
             }
             else if (host.has_active_failures === false && host.last_job === null) {
diff --git a/awx/ui/static/js/lists/InventoryHosts.js b/awx/ui/static/js/lists/InventoryHosts.js
index 644fc47be2..2b4ef82413 100644
--- a/awx/ui/static/js/lists/InventoryHosts.js
+++ b/awx/ui/static/js/lists/InventoryHosts.js
@@ -63,7 +63,8 @@ angular.module('InventoryHostsDefinition', [])
                 awToolTip: "{{ host.badgeToolTip }}",
                 awTipPlacement: 'top',
                 dataPlacement: 'left',
-                iconClass: "{{ 'fa icon-failures-' + host.has_active_failures }}"
+                iconClass: "{{ 'fa icon-failures-' + host.has_active_failures }}",
+                id: 'active-failutes-action'
             },
             edit: {
                 //label: 'Edit',
diff --git a/awx/ui/static/less/ansible-ui.less b/awx/ui/static/less/ansible-ui.less
index a4c33424fa..050b44b438 100644
--- a/awx/ui/static/less/ansible-ui.less
+++ b/awx/ui/static/less/ansible-ui.less
@@ -213,7 +213,7 @@ textarea {
   h3.popover-title, .popover-content, .popover-content blockquote {
       font-size: 12px;
   }
-  .flyout thead> tr> th, .flyout tbody> tr> td {
+  .flyout thead> tr> th, .flyout tbody> tr> td, .flyout tbody> tr> td> a {
       font-size: 12px; 
   }
   .popover-title {
@@ -226,9 +226,9 @@ textarea {
   }
   .popover-footer {
       font-size: 12px;
-      margin-top: 5px;
-      margin-bottom: 5px;
-      text-align: right; 
+      margin-top: 10px;
+      text-align: right;
+      color: @grey;
       .key {
           color: @white;
           background-color: @grey;
diff --git a/awx/ui/static/lib/ansible/directives.js b/awx/ui/static/lib/ansible/directives.js
index f474259068..b29ab26b55 100644
--- a/awx/ui/static/lib/ansible/directives.js
+++ b/awx/ui/static/lib/ansible/directives.js
@@ -316,7 +316,6 @@ angular.module('AWDirectives', ['RestServices', 'Utilities', 'AuthService', 'Job
                 $('.popover-content, .popover-title').click(function() {
                     $('#' + self).popover('hide');
                 });
-
             });
             
             $(document).bind('keydown', function(e) {
diff --git a/awx/ui/static/lib/ansible/list-generator.js b/awx/ui/static/lib/ansible/list-generator.js
index c61cc7644d..9679b5701d 100644
--- a/awx/ui/static/lib/ansible/list-generator.js
+++ b/awx/ui/static/lib/ansible/list-generator.js
@@ -377,7 +377,9 @@ angular.module('ListGenerator', ['GeneratorHelpers'])
                                     });
                                 } else {
                                     fAction = list.fieldActions[field_action];
-                                    html += "<a ";
+                                    html += "<a id=\"";
+                                    html += (fAction.id) ? fAction.id : field_action + "-action";
+                                    html += "\" ";
                                     html += (fAction.href) ? "href=\"" + fAction.href + "\" " : "";
                                     html += (fAction.ngHref) ? "ng-href=\"" + fAction.ngHref + "\" " : "";
                                     html += (field_action === 'cancel') ? "class=\"cancel red-txt\" " : "";