diff --git a/awx/ui/static/js/controllers/JobStdout.js b/awx/ui/static/js/controllers/JobStdout.js index a61b578d2d..2fcbfad553 100644 --- a/awx/ui/static/js/controllers/JobStdout.js +++ b/awx/ui/static/js/controllers/JobStdout.js @@ -104,7 +104,7 @@ function JobStdoutController ($log, $rootScope, $scope, $compile, $routeParams, function resizeToFit() { available_height = $(window).height() - $('#main-menu-container .navbar').outerHeight() - $('#job-status').outerHeight() - - $('#breadcrumb-container').outerHeight() - 20; + $('#breadcrumb-container').outerHeight() - 30; $('#pre-container').height(available_height); $('#pre-container').mCustomScrollbar("update"); } diff --git a/awx/ui/static/js/controllers/Jobs.js b/awx/ui/static/js/controllers/Jobs.js index 7e10f69c85..20641fc181 100644 --- a/awx/ui/static/js/controllers/Jobs.js +++ b/awx/ui/static/js/controllers/Jobs.js @@ -15,8 +15,7 @@ function JobsListController ($scope, $compile, $routeParams, ClearScope, Breadcr ClearScope(); - var e, - completed_scope, running_scope, queued_scope, scheduled_scope, + var completed_scope, running_scope, queued_scope, scheduled_scope, choicesCount = 0, listCount = 0, api_complete = false, @@ -111,9 +110,9 @@ function JobsListController ($scope, $compile, $routeParams, ClearScope, Breadcr LoadBreadCrumbs(); // Add breadcrumbs - e = angular.element(document.getElementById('breadcrumbs')); - e.html(Breadcrumbs({ list: { editTitle: 'Jobs' } , mode: 'edit' })); - $compile(e)($scope); + //e = angular.element(document.getElementById('breadcrumbs')); + //e.html(Breadcrumbs({ list: { editTitle: 'Jobs' } , mode: 'edit' })); + //$compile(e)($scope); if ($scope.removeListLoaded) { $scope.removeListLoaded(); @@ -243,7 +242,8 @@ function JobsListController ($scope, $compile, $routeParams, ClearScope, Breadcr search_row, page_row, height, header, row_height; if (docw > 1240 && doch > 800) { // customize the container height and # of rows based on available viewport height - available_height = $(window).height() - $('.main-menu').outerHeight() - $('#main_tabs').outerHeight() - $('#breadcrumbs').outerHeight() - $('.site-footer').outerHeight() - 25; + available_height = $(window).height() - $('#main-menu-container .navbar').outerHeight() - $('#job-status').outerHeight() - + $('#breadcrumb-container').outerHeight() - 80; $('.jobs-list-container').each(function() { $(this).height(Math.floor(available_height / 2)); }); diff --git a/awx/ui/static/less/jobs.less b/awx/ui/static/less/jobs.less index 0db77e8f9a..44717e10a0 100644 --- a/awx/ui/static/less/jobs.less +++ b/awx/ui/static/less/jobs.less @@ -8,7 +8,9 @@ */ -#jobs { +#jobs-page { + + margin-top: 20px; .jobs-list-container { border: 1px solid @grey; @@ -38,7 +40,7 @@ #completed_jobs_table i[class*="icon-job-"] { font-size: 13px; } - + .title { font-weight: bold; margin-top: 5px; @@ -56,7 +58,7 @@ } @media (min-width: 1024px) { - #jobs { + #jobs-page { .left-side { padding-right: 7px; } @@ -72,7 +74,7 @@ } @media (max-width: 1023px) { - #jobs .jobs-list-container { + #jobs-page .jobs-list-container { margin-top: 15px; } #jobs .jobs-list-container.completed { diff --git a/awx/ui/static/lib/ansible/list-generator.js b/awx/ui/static/lib/ansible/list-generator.js index b2dab18e4a..631e880705 100644 --- a/awx/ui/static/lib/ansible/list-generator.js +++ b/awx/ui/static/lib/ansible/list-generator.js @@ -137,20 +137,21 @@ angular.module('ListGenerator', ['GeneratorHelpers']) // Breadcrumbs for activity stream widget // Make the links clickable using ng-click function so we can first remove the stream widget // before navigation - html += "
\n"; - html += "