From 3e2940203fd4f27c62638dbf58d2ac77ae542813 Mon Sep 17 00:00:00 2001 From: jaredevantabor Date: Mon, 31 Oct 2016 17:11:14 -0700 Subject: [PATCH] more stdout styling --- .../job-results-stdout/job-results-stdout.block.less | 5 +++++ awx/ui/client/src/job-results/parse-stdout.service.js | 11 ++++++++++- 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/awx/ui/client/src/job-results/job-results-stdout/job-results-stdout.block.less b/awx/ui/client/src/job-results/job-results-stdout/job-results-stdout.block.less index cb730f24c1..0f15dcb384 100644 --- a/awx/ui/client/src/job-results/job-results-stdout/job-results-stdout.block.less +++ b/awx/ui/client/src/job-results/job-results-stdout/job-results-stdout.block.less @@ -16,6 +16,7 @@ padding: 10px 10px 10px; color: @b7grey; width: 75px; + white-space: pre-line; } .JobResultsStdOut-lineNumberColumn--first{ @@ -26,6 +27,10 @@ .JobResultsStdOut-stdoutColumn{ padding: 10px 20px 10px 20px; color: @default-interface-txt; + display: inline-block; + white-space: pre-wrap; + word-wrap: normal; + width:100%; } .JobResultsStdOut-stdoutColumn--first{ diff --git a/awx/ui/client/src/job-results/parse-stdout.service.js b/awx/ui/client/src/job-results/parse-stdout.service.js index 482aa33812..b73301bb70 100644 --- a/awx/ui/client/src/job-results/parse-stdout.service.js +++ b/awx/ui/client/src/job-results/parse-stdout.service.js @@ -11,11 +11,20 @@ export default [function(){ // that i'm currently seeing on this branch on the beginning // and end of each event string. In the future it could be // used to add styling classes to the actual lines of stdout - line = line.replace(/rn/g, '\r\n'); + line = line.replace(/rn/g, ''); line = line.replace(/u001b/g, ''); + + // ok line = line.replace(/\[0;32m/g, ''); + + //unreachable + line = line.replace(/\[1;31m/g, ''); + line = line.replace(/\[0;31m/g, ''); + line = line.replace(/\[0;32m=/g, ''); line = line.replace(/\[0;32m1/g, ''); + + //end span line = line.replace(/\[0m/g, ''); return line; },