From 04f0ea409ba2cb77eb3c917efae08e3a42beb80c Mon Sep 17 00:00:00 2001 From: Chris Houseknecht Date: Wed, 25 Jun 2014 11:58:49 -0400 Subject: [PATCH] Job detail page refactor Fixed auto-resize. The page now differentiates between plays, tasks and host results when allocating space. The play list gets the least amount of space. Tasks receives slightly less than it used to but more than plays. Host results gets the most space at nearly 2x what it received previously. --- awx/ui/static/js/controllers/JobDetail.js | 13 +++++++------ awx/ui/static/less/job-details.less | 1 + 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/awx/ui/static/js/controllers/JobDetail.js b/awx/ui/static/js/controllers/JobDetail.js index 6263de97df..ca8ac56398 100644 --- a/awx/ui/static/js/controllers/JobDetail.js +++ b/awx/ui/static/js/controllers/JobDetail.js @@ -524,20 +524,21 @@ function JobDetailController ($rootScope, $scope, $compile, $routeParams, $log, $('#job-summary-container').show(); } // Detail table height adjusting. First, put page height back to 'normal'. - $('#plays-table-detail').height(150); + $('#plays-table-detail').height(80); $('#plays-table-detail').mCustomScrollbar("update"); - $('#tasks-table-detail').height(150); + $('#tasks-table-detail').height(120); $('#tasks-table-detail').mCustomScrollbar("update"); $('#hosts-table-detail').height(150); $('#hosts-table-detail').mCustomScrollbar("update"); - height = $(window).height() - $('#main-menu-container .navbar').outerHeight(); + height = $(window).height() - $('#main-menu-container .navbar').outerHeight() - $('#breadcrumb-container').outerHeight() - + $('#job-detail-container').outerHeight() - 20; if (height > 15) { // there's a bunch of white space at the bottom, let's use it - $('#plays-table-detail').height(150 + (height / 3)); + $('#plays-table-detail').height(80 + (height * 0.10)); $('#plays-table-detail').mCustomScrollbar("update"); - $('#tasks-table-detail').height(150 + (height / 3)); + $('#tasks-table-detail').height(120 + (height * 0.20)); $('#tasks-table-detail').mCustomScrollbar("update"); - $('#hosts-table-detail').height(150 + (height / 3)); + $('#hosts-table-detail').height(150 + (height * 0.70)); $('#hosts-table-detail').mCustomScrollbar("update"); } // Summary table height adjusting. diff --git a/awx/ui/static/less/job-details.less b/awx/ui/static/less/job-details.less index 6a1a8eb572..d30f37fef6 100644 --- a/awx/ui/static/less/job-details.less +++ b/awx/ui/static/less/job-details.less @@ -86,6 +86,7 @@ } #hide-summary-button { + text-align: right; margin-bottom: 15px; }