diff --git a/awx/ui/static/js/controllers/Home.js b/awx/ui/static/js/controllers/Home.js index 92cba59584..cf39c25814 100644 --- a/awx/ui/static/js/controllers/Home.js +++ b/awx/ui/static/js/controllers/Home.js @@ -179,7 +179,7 @@ function HomeGroups($log, $scope, $filter, $compile, $location, $routeParams, Lo // close any lingering tool tipss $(this).hide(); }); - elem.attr({ "aw-pop-over": html, "data-title": title, "data-placement": "right" }); + elem.attr({ "aw-pop-over": html, "data-popover-title": title, "data-placement": "right" }); $compile(elem)(scope); elem.on('shown.bs.popover', function() { $('.popover').each(function() { @@ -428,27 +428,26 @@ function HomeGroups($log, $scope, $filter, $compile, $location, $routeParams, Lo scope.removeHostSummaryReady(); } scope.removeHostSummaryReady = scope.$on('HostSummaryReady', function(e, event, data) { - var html, title = "Recent Jobs", url = GetBasePath('jobs'); + var html, title = "Recent Jobs"; Wait('stop'); if (data.length > 0) { html = "\n"; html += "\n"; html += ""; html += ""; - html += ""; + html += ""; html += ""; html += "\n"; html += "\n"; html += "\n"; data.forEach(function(row) { html += "\n"; - html += "\n"; - //html += ""; - html += ""; - html += ""; + html += ""; + html += ""; html += "\n"; }); html += "\n"; @@ -536,7 +535,8 @@ function HomeGroups($log, $scope, $filter, $compile, $location, $routeParams, Lo jobs.push({ id: host.last_job, status: host.summary_fields.last_job.status, - name: host.summary_fields.last_job.name + name: host.summary_fields.last_job.name, + finished: host.summary_fields.last_job.finished }); } }); diff --git a/awx/ui/static/js/controllers/Inventories.js b/awx/ui/static/js/controllers/Inventories.js index 4b44585f8f..e358e0567f 100644 --- a/awx/ui/static/js/controllers/Inventories.js +++ b/awx/ui/static/js/controllers/Inventories.js @@ -46,7 +46,7 @@ function InventoriesList($scope, $rootScope, $location, $log, $routeParams, $com // close any lingering tool tipss $(this).hide(); }); - elem.attr({ "aw-pop-over": html, "data-title": title, "data-placement": "right" }); + elem.attr({ "aw-pop-over": html, "data-popover-title": title, "data-placement": "right" }); $compile(elem)($scope); elem.on('shown.bs.popover', function() { $('.popover').each(function() { @@ -185,7 +185,6 @@ function InventoriesList($scope, $rootScope, $location, $log, $routeParams, $com html += ""; html += ""; html += ""; - html += ""; html += ""; html += "\n"; html += "\n"; @@ -193,13 +192,11 @@ function InventoriesList($scope, $rootScope, $location, $log, $routeParams, $com data.results.forEach(function(row) { html += "\n"; - html += "\n"; + html += "\n"; html += ""; - html += ""; - html += ""; + html += ""; html += "\n"; }); html += "\n"; diff --git a/awx/ui/static/js/helpers/Hosts.js b/awx/ui/static/js/helpers/Hosts.js index 4cb953d165..70752aedb5 100644 --- a/awx/ui/static/js/helpers/Hosts.js +++ b/awx/ui/static/js/helpers/Hosts.js @@ -56,7 +56,7 @@ angular.module('HostsHelper', [ 'RestServices', 'Utilities', 'ListGenerator', 'H }; }]) -.factory('SetStatus', ['SetEnabledMsg', 'Empty', function(SetEnabledMsg, Empty) { +.factory('SetStatus', ['$filter', 'SetEnabledMsg', 'Empty', function($filter, SetEnabledMsg, Empty) { return function(params) { var scope = params.scope, @@ -100,7 +100,7 @@ angular.module('HostsHelper', [ 'RestServices', 'Utilities', 'ListGenerator', 'H html += "\n"; html += "\n"; html += "\n"; - html += "\n"; + html += "\n"; html += "\n"; html += "\n"; html += "\n"; @@ -108,13 +108,18 @@ angular.module('HostsHelper', [ 'RestServices', 'Utilities', 'ListGenerator', 'H for (j=0; j < jobs.length; j++) { job = jobs[j]; html += "\n"; - html += "\n"; - html += "\n"; - html += "\n"; + + html += "\n"; + + html += "\n"; + html += "\n"; } html += "\n"; diff --git a/awx/ui/static/js/lists/HomeHosts.js b/awx/ui/static/js/lists/HomeHosts.js index f71eb05321..8ccbdbeb63 100644 --- a/awx/ui/static/js/lists/HomeHosts.js +++ b/awx/ui/static/js/lists/HomeHosts.js @@ -27,10 +27,10 @@ angular.module('HomeHostListDefinition', []) iconOnly: true, icon: "{{ 'icon-job-' + host.active_failures }}", awToolTip: "{{ host.badgeToolTip }}", - dataTitle: "{{ host.job_status_title }}", awTipPlacement: "top", dataPlacement: "right", awPopOver: "{{ host.job_status_html }}", + dataTitle: "{{ host.job_status_title }}", ngClick:"bob", columnClass: "col-md-1 col-sm-2 col-xs-3", searchable: false, diff --git a/awx/ui/static/lib/ansible/generator-helpers.js b/awx/ui/static/lib/ansible/generator-helpers.js index adf28fe41e..26f5fcec9d 100644 --- a/awx/ui/static/lib/ansible/generator-helpers.js +++ b/awx/ui/static/lib/ansible/generator-helpers.js @@ -499,6 +499,7 @@ angular.module('GeneratorHelpers', []) if (field.awPopOver) { html += "aw-pop-over=\"" + field.awPopOver + "\" "; html += (field.dataPlacement) ? "data-placement=\"" + field.dataPlacement + "\" " : ""; + html += (field.dataTitle) ? "data-title=\"" + field.dataTitle + "\" " : ""; } html += (field.ngClass) ? Attr(field, 'ngClass') : ''; html += (field.ngEllipsis) ? "data-ng-bind=\"" + list.iterator + "." + fld + "\" data-ellipsis " : "";
StatusViewFinishedName
" + ($filter('date')(row.finished,'MM/dd HH:mm:ss')).replace(/ /,'
') + "
Events
" + - "Hosts
" + ellipsis(row.name) + "" + ($filter('date')(row.finished,'MM/dd HH:mm:ss')).replace(/ /,'
') + "
" + ellipsis(row.name) + "
StatusFinishedViewName
" + ($filter('date')(row.finished,'MM/dd HH:mm:ss')).replace(/ /,'
') + "
Events
" + - "Hosts
" + ellipsis(row.name) + "" + ellipsis(row.name) + "
StatusViewFinishedName
Events
" + - "Hosts
" + ellipsis(job.name) + "" + ($filter('date')(job.finished,'MM/dd HH:mm:ss')).replace(/ /,'
') + "
" + ellipsis(job.name) + "