From 8f1c88e35d44b42460cd9b941fbbcb65412d355e Mon Sep 17 00:00:00 2001 From: Jared Tabor Date: Thu, 18 Feb 2016 12:26:19 -0800 Subject: [PATCH 1/4] adding less file --- awx/ui/client/src/job-detail/job-detail.block.less | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 awx/ui/client/src/job-detail/job-detail.block.less diff --git a/awx/ui/client/src/job-detail/job-detail.block.less b/awx/ui/client/src/job-detail/job-detail.block.less new file mode 100644 index 0000000000..0e7ca9f79d --- /dev/null +++ b/awx/ui/client/src/job-detail/job-detail.block.less @@ -0,0 +1,8 @@ +/** @define SetupItem */ + +@import '../shared/branding/colors.less'; +@import '../shared/branding/colors.default.less'; + +.JobDetail-results{ + background-color: #848992; +} From 95467a6b974a399960cf2bd80b523cca63b0b593 Mon Sep 17 00:00:00 2001 From: Jared Tabor Date: Thu, 18 Feb 2016 19:38:49 -0800 Subject: [PATCH 2/4] Restyling of job detail results panel --- .../src/job-detail/job-detail.block.less | 56 +++++++- .../src/job-detail/job-detail.controller.js | 4 +- .../src/job-detail/job-detail.partial.html | 133 +++++++++--------- 3 files changed, 120 insertions(+), 73 deletions(-) diff --git a/awx/ui/client/src/job-detail/job-detail.block.less b/awx/ui/client/src/job-detail/job-detail.block.less index 0e7ca9f79d..e4aa02d308 100644 --- a/awx/ui/client/src/job-detail/job-detail.block.less +++ b/awx/ui/client/src/job-detail/job-detail.block.less @@ -3,6 +3,58 @@ @import '../shared/branding/colors.less'; @import '../shared/branding/colors.default.less'; -.JobDetail-results{ - background-color: #848992; +.JobDetail-panelHeader{ + height: 50px; + display: flex; +} + +.JobDetail-panelHeaderText{ + color: #848992; + flex: 1 0 auto; + font-size: 14px; + font-weight: bold; + margin-right: 10px; + text-transform: uppercase; +} + +.JobDetail-panelHeaderText:hover{ + color: #848992; + font-size: 14px; + font-weight: bold; + margin-right: 10px; + text-transform: uppercase; +} + +.JobDetail-expandArrow{ + color: #848992; + font-size: 14px; + font-weight: bold; + margin-right: 10px; + text-transform: uppercase; + margin-left: 5px; +} + +.JobDetail-resultsDetails{ + display: flex; + flex-wrap: wrap; + flex-direction: row; +} + +.JobDetail-resultRow{ + flex: 1 0 auto; + width: 50%; + display: flex; +} + +.JobDetail-resultRow label{ + color: #848992; + font-size: 14px; + font-weight: normal!important; + // width: 40%; + flex: 1 0 auto; +} + +.JobDetail-resultRowText{ + width: 40%; + flex: 1 0 auto; } diff --git a/awx/ui/client/src/job-detail/job-detail.controller.js b/awx/ui/client/src/job-detail/job-detail.controller.js index 604179d622..6432e68849 100644 --- a/awx/ui/client/src/job-detail/job-detail.controller.js +++ b/awx/ui/client/src/job-detail/job-detail.controller.js @@ -200,7 +200,7 @@ export default scope.haltEventQueue = false; scope.processing = false; - scope.lessStatus = true; + scope.lessStatus = false; scope.host_summary = {}; scope.host_summary.ok = 0; @@ -854,7 +854,7 @@ export default $('#job-summary-container').show(); } - scope.lessStatus = true; // close the view more status option + scope.lessStatus = false; // close the view more status option // Detail table height adjusting. First, put page height back to 'normal'. $('#plays-table-detail').height(80); diff --git a/awx/ui/client/src/job-detail/job-detail.partial.html b/awx/ui/client/src/job-detail/job-detail.partial.html index e4aba4ec3b..fc174f182b 100644 --- a/awx/ui/client/src/job-detail/job-detail.partial.html +++ b/awx/ui/client/src/job-detail/job-detail.partial.html @@ -1,29 +1,25 @@
-
-
-
- -
{{ job_status.status_label }}
- -
- - - - - - - - -
+
+ -
- -
+
+
+ +
{{ job_status.status_label }}
+
+
@@ -44,117 +40,116 @@
-
+
-
+
-
- -
-
Started  {{ job_status.started | date:'MM/dd/yy HH:mm:ss' }}
-
Finished  {{ job_status.finished | date:'MM/dd/yy HH:mm:ss' }}
-
Elapsed  {{ job_status.elapsed }}
-
+
+ +
{{ job_status.started | date:'MM/dd/yy HH:mm:ss' }}
-