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

AC-967 Fixed job name in the host status fly-out. Text now wraps rather than extending beyond boundaries of pop-over. Removed status label- just show red/green dot. Clicking on ID or red/green dot shows the status dialog. When dialog closes the window.resize() watcher is restored.

Browse Source
This commit is contained in:
Chris Houseknecht
2014-01-29 13:47:24 -05:00
committed by Matthew Jones
parent 93a0f39932
commit d4febaf02f
3 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -82,7 +82,7 @@ angular.module('HostsHelper', [ 'RestServices', 'Utilities', 'ListGenerator', 'H
html += "<tr>\n"; html += "<tr>\n";
html += "<th>ID</td>\n"; html += "<th>ID</td>\n";
html += "<th class=\"text-center\">Status</td>\n"; html += "<th class=\"text-center\">Status</td>\n";
html += "<th style=\"width: 50%;\">Name</td>\n"; html += "<th>Name</td>\n";
html += "</tr>\n"; html += "</tr>\n";
html += "</thead>\n"; html += "</thead>\n";
html += "<tbody>\n"; html += "<tbody>\n";
@@ -90,8 +90,8 @@ angular.module('HostsHelper', [ 'RestServices', 'Utilities', 'ListGenerator', 'H
var job = jobs[j]; var job = jobs[j];
html += "<tr>\n"; html += "<tr>\n";
html += "<td><a ng-click=\"showJobSummary(" + job.id + ")\">" + job.id + "</a></td>\n"; html += "<td><a ng-click=\"showJobSummary(" + job.id + ")\">" + job.id + "</a></td>\n";
html += "<td><a ng-click=\"showJobSummary(" + job.id + ")\"><i class=\"fa icon-job-" + job.status + "\"></i></a></td>\n"; html += "<td class=\"text-center\"><a ng-click=\"showJobSummary(" + job.id + ")\"><i class=\"fa icon-job-" + job.status + "\"></i></a></td>\n";
html += "<td class=\"ellipsis\">" + job.name + "</td>\n"; html += "<td>" + job.name + "</td>\n";
html += "</tr>\n"; html += "</tr>\n";
} }
html += "</tbody>\n"; html += "</tbody>\n";

6
awx/ui/static/js/helpers/Jobs.js
View File

@@ -7,7 +7,7 @@
* *
*/ */
angular.module('JobsHelper', ['Utilities', 'FormGenerator', 'JobSummaryDefinition']) angular.module('JobsHelper', ['Utilities', 'FormGenerator', 'JobSummaryDefinition', 'InventoryHelper'])
.factory('JobStatusToolTip', [ function() { .factory('JobStatusToolTip', [ function() {
return function(status) { return function(status) {
@@ -41,7 +41,8 @@ angular.module('JobsHelper', ['Utilities', 'FormGenerator', 'JobSummaryDefinitio
}]) }])
.factory('ShowJobSummary', ['Rest', 'Wait', 'GetBasePath', 'FormatDate', 'ProcessErrors', 'GenerateForm', 'JobSummary', .factory('ShowJobSummary', ['Rest', 'Wait', 'GetBasePath', 'FormatDate', 'ProcessErrors', 'GenerateForm', 'JobSummary',
function(Rest, Wait, GetBasePath, FormatDate, ProcessErrors, GenerateForm, JobSummary) { 'WatchInventoryWindowResize',
function(Rest, Wait, GetBasePath, FormatDate, ProcessErrors, GenerateForm, JobSummary, WatchInventoryWindowResize) {
return function(params) { return function(params) {
// Display status info in a modal dialog- called from inventory edit page // Display status info in a modal dialog- called from inventory edit page
@@ -109,6 +110,7 @@ angular.module('JobsHelper', ['Utilities', 'FormGenerator', 'JobSummaryDefinitio
}); });
$('#status-modal-dialog').dialog('destroy'); $('#status-modal-dialog').dialog('destroy');
$('#inventory-modal-container').empty(); $('#inventory-modal-container').empty();
WatchInventoryWindowResize();
}, },
open: function(e, ui) { open: function(e, ui) {
Wait('stop'); Wait('stop');

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

@@ -379,7 +379,7 @@ dd {
.navbar>.container .navbar-brand { .navbar>.container .navbar-brand {
margin-left: 0; margin-left: 0;
margin-top: 10px; margin-top: 11px;
} }
/* Using inline-block rather than block keeps /* Using inline-block rather than block keeps