From 92eb56e1d3559d0d794d7d1908eb3b838384d949 Mon Sep 17 00:00:00 2001 From: chouseknecht Date: Wed, 7 May 2014 15:01:14 -0400 Subject: [PATCH] Changed host summary section on job detail page to use badges. --- awx/ui/static/js/helpers/JobDetail.js | 10 +++++-- awx/ui/static/less/job-details.less | 37 +++++------------------- awx/ui/static/partials/job_detail.html | 39 ++++++++++++++++---------- 3 files changed, 39 insertions(+), 47 deletions(-) diff --git a/awx/ui/static/js/helpers/JobDetail.js b/awx/ui/static/js/helpers/JobDetail.js index a64411f023..e89392f480 100644 --- a/awx/ui/static/js/helpers/JobDetail.js +++ b/awx/ui/static/js/helpers/JobDetail.js @@ -216,7 +216,7 @@ function(UpdatePlayStatus, UpdateHostStatus, UpdatePlayChild, AddHostResult, Sel start: scope.job_status.started, end: scope.job_status.finished }); - scope.job_status.status = (event.failed) ? 'error' : 'successful'; + scope.job_status.status = (event.failed) ? 'failed' : 'successful'; scope.job_status.status_class = ""; } }); @@ -740,7 +740,13 @@ function(UpdatePlayStatus, UpdateHostStatus, UpdatePlayChild, AddHostResult, Sel }]) .factory('DrawGraph', [ function() { - + /*var salesData=[ + {label:"OK", color:"#9ED89E"}, + {label:"Changed", color:"#DC3912"}, + {label:"Failed", color:"#DA4D49;"}, + {label:"Skipped", color:"#D4D4D4"}, + {label:"Unreachable", color:""} + ];*/ }]); diff --git a/awx/ui/static/less/job-details.less b/awx/ui/static/less/job-details.less index 56bb73f904..77831ffcbc 100644 --- a/awx/ui/static/less/job-details.less +++ b/awx/ui/static/less/job-details.less @@ -13,32 +13,6 @@ } } -.inline-block { - display: inline-block; - vertical-align: top; -} - -#job-status { - -} - -.job-detail-table { - - tbody>tr>td { - border-top-color: @well; - padding-top: 0; - padding-bottom: 0; - } - thead>tr>th { - padding-top: 0; - padding-bottom: 0; - font-size: 14px; - } - tbody>tr.active, tbody>tr.active>td { - background-color: #EDF2F2; - } -} - .job_summary { .table { margin-bottom: 0; @@ -86,6 +60,9 @@ .skipped-hosts, .no-matching-hosts { background-color: #D4D4D4; } +.unreachable-hosts { + background-color: @black; +} .job_well { padding: 8px; @@ -96,9 +73,6 @@ box-shadow: inset 0 1px 1px rgba(0, 0, 0, .05); } - - - #summary-button { position: absolute; top: 5px; @@ -147,7 +121,7 @@ } #breadcrumb-container { - padding-right: 10px; + padding-right: 15px; } #job-detail-container { @@ -275,6 +249,9 @@ .name { word-break: break-all; } + .badge { + font-size: 12px; + } } .mCSB_container { diff --git a/awx/ui/static/partials/job_detail.html b/awx/ui/static/partials/job_detail.html index 29efa0e42d..d21248d26a 100644 --- a/awx/ui/static/partials/job_detail.html +++ b/awx/ui/static/partials/job_detail.html @@ -6,7 +6,7 @@ @@ -35,9 +35,9 @@
Project
- +
Inventory
- +
@@ -74,7 +74,7 @@
-
+
+
+
No tasks found for selected play
+
+
@@ -141,22 +146,22 @@
-
Host
-
OK
-
Change
-
Dark
-
Fail
+
Host
+
Events
- -
{{ host.ok }}
-
{{ host.changed }}
-
{{ host.unreachable }}
-
{{ host.failed }}
+ +
@@ -165,6 +170,10 @@
+ +
+ +