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

Fixed inventory host status to work with pop-over changes.

Browse Source
This commit is contained in:
Chris Houseknecht
2014-03-22 21:17:24 -04:00
parent f4efad714f
commit 65aae82827
5 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -113,10 +113,12 @@ angular.module('HostsHelper', [ 'RestServices', 'Utilities', 'ListGenerator', 'H
} }
html += "</tbody>\n"; html += "</tbody>\n";
html += "</table>\n"; html += "</table>\n";
html += "<div class=\"popover-footer\"><span class=\"key\">esc</span> or click to close</div>\n";
} }
else { else {
title = 'No job data'; title = 'No job data';
html = '<p>No recent job data available for this host.</p>'; 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) { else if (host.has_active_failures === false && host.last_job === null) {

3
awx/ui/static/js/lists/InventoryHosts.js
View File

@@ -63,7 +63,8 @@ angular.module('InventoryHostsDefinition', [])
awToolTip: "{{ host.badgeToolTip }}", awToolTip: "{{ host.badgeToolTip }}",
awTipPlacement: 'top', awTipPlacement: 'top',
dataPlacement: 'left', dataPlacement: 'left',
iconClass: "{{ 'fa icon-failures-' + host.has_active_failures }}" iconClass: "{{ 'fa icon-failures-' + host.has_active_failures }}",
id: 'active-failutes-action'
}, },
edit: { edit: {
//label: 'Edit', //label: 'Edit',

6
awx/ui/static/less/ansible-ui.less
View File

@@ -213,7 +213,7 @@ textarea {
h3.popover-title, .popover-content, .popover-content blockquote { h3.popover-title, .popover-content, .popover-content blockquote {
font-size: 12px; 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; font-size: 12px;
} }
.popover-title { .popover-title {
@@ -226,9 +226,9 @@ textarea {
} }
.popover-footer { .popover-footer {
font-size: 12px; font-size: 12px;
margin-top: 5px; margin-top: 10px;
margin-bottom: 5px;
text-align: right; text-align: right;
color: @grey;
.key { .key {
color: @white; color: @white;
background-color: @grey; background-color: @grey;

1
awx/ui/static/lib/ansible/directives.js
View File

@@ -316,7 +316,6 @@ angular.module('AWDirectives', ['RestServices', 'Utilities', 'AuthService', 'Job
$('.popover-content, .popover-title').click(function() { $('.popover-content, .popover-title').click(function() {
$('#' + self).popover('hide'); $('#' + self).popover('hide');
}); });
}); });
$(document).bind('keydown', function(e) { $(document).bind('keydown', function(e) {

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

@@ -377,7 +377,9 @@ angular.module('ListGenerator', ['GeneratorHelpers'])
}); });
} else { } else {
fAction = list.fieldActions[field_action]; 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.href) ? "href=\"" + fAction.href + "\" " : "";
html += (fAction.ngHref) ? "ng-href=\"" + fAction.ngHref + "\" " : ""; html += (fAction.ngHref) ? "ng-href=\"" + fAction.ngHref + "\" " : "";
html += (field_action === 'cancel') ? "class=\"cancel red-txt\" " : ""; html += (field_action === 'cancel') ? "class=\"cancel red-txt\" " : "";