From e6c342d9ad3a53ca94575b2ab4d04737ceafb6ca Mon Sep 17 00:00:00 2001 From: jaredevantabor Date: Tue, 18 Oct 2016 16:04:03 -0700 Subject: [PATCH] Adding initial files for job results standard out panel with some very rough dummy text in there for now --- .../job-results-stdout.block.less | 24 ++++++++++++ .../job-results-stdout.directive.js | 19 +++++++++ .../job-results-stdout.partial.html | 39 +++++++++++++++++++ .../job-results/job-results-stdout/main.js | 11 ++++++ .../src/job-results/job-results.partial.html | 2 + awx/ui/client/src/job-results/main.js | 3 +- 6 files changed, 97 insertions(+), 1 deletion(-) create mode 100644 awx/ui/client/src/job-results/job-results-stdout/job-results-stdout.block.less create mode 100644 awx/ui/client/src/job-results/job-results-stdout/job-results-stdout.directive.js create mode 100644 awx/ui/client/src/job-results/job-results-stdout/job-results-stdout.partial.html create mode 100644 awx/ui/client/src/job-results/job-results-stdout/main.js 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 new file mode 100644 index 0000000000..70923cf45b --- /dev/null +++ b/awx/ui/client/src/job-results/job-results-stdout/job-results-stdout.block.less @@ -0,0 +1,24 @@ +@import '../../shared/branding/colors.default.less'; + +.JobResultsStdOut{ + height: 100%; + margin-top: 15px; +} + +.JobResultsStdOut-aLineOfStdOut{ + display: flex; +} + +.JobResultsStdOut-lineNumberColumn{ + flex: 1 0 auto; + background-color: @d7grey; + text-align: right; + padding-right: 10px; + color: @default-icon; +} + +.JobResultsStdOut-stdoutColumn{ + background-color: @default-secondary-bg; + flex: 6 0 auto; + +} diff --git a/awx/ui/client/src/job-results/job-results-stdout/job-results-stdout.directive.js b/awx/ui/client/src/job-results/job-results-stdout/job-results-stdout.directive.js new file mode 100644 index 0000000000..e6bdefe91d --- /dev/null +++ b/awx/ui/client/src/job-results/job-results-stdout/job-results-stdout.directive.js @@ -0,0 +1,19 @@ +/************************************************* + * Copyright (c) 2016 Ansible, Inc. + * + * All Rights Reserved + *************************************************/ + +// import hostStatusBarController from './host-status-bar.controller'; +export default [ 'templateUrl', + function(templateUrl) { + return { + scope: true, + templateUrl: templateUrl('job-results/job-results-stdout/job-results-stdout'), + restrict: 'E', + // controller: jobResultsStdOutController, + link: function(scope) { + + } + }; +}]; diff --git a/awx/ui/client/src/job-results/job-results-stdout/job-results-stdout.partial.html b/awx/ui/client/src/job-results/job-results-stdout/job-results-stdout.partial.html new file mode 100644 index 0000000000..82f1198966 --- /dev/null +++ b/awx/ui/client/src/job-results/job-results-stdout/job-results-stdout.partial.html @@ -0,0 +1,39 @@ +
+ +
+
+ 1 +
+
+ this is some lines of stdout +
+
+ +
+
+ 2 +
+
+ this is some lines of stdout +
+
+ +
+
+ 3 +
+
+ this is some lines of stdout +
+
+ +
+
+ 4 +
+
+ this is some lines of stdout +
+
+ +
diff --git a/awx/ui/client/src/job-results/job-results-stdout/main.js b/awx/ui/client/src/job-results/job-results-stdout/main.js new file mode 100644 index 0000000000..5fc583b9b1 --- /dev/null +++ b/awx/ui/client/src/job-results/job-results-stdout/main.js @@ -0,0 +1,11 @@ +/************************************************* + * Copyright (c) 2015 Ansible, Inc. + * + * All Rights Reserved + *************************************************/ + +import jobResultsStdOut from './job-results-stdout.directive'; + +export default + angular.module('jobResultStdOutDirective', []) + .directive('jobResultsStandardOut', jobResultsStdOut); diff --git a/awx/ui/client/src/job-results/job-results.partial.html b/awx/ui/client/src/job-results/job-results.partial.html index 2b98b73592..3aba846bd0 100644 --- a/awx/ui/client/src/job-results/job-results.partial.html +++ b/awx/ui/client/src/job-results/job-results.partial.html @@ -514,8 +514,10 @@ + + diff --git a/awx/ui/client/src/job-results/main.js b/awx/ui/client/src/job-results/main.js index 71f08b09be..defad66828 100644 --- a/awx/ui/client/src/job-results/main.js +++ b/awx/ui/client/src/job-results/main.js @@ -5,6 +5,7 @@ *************************************************/ import hostStatusBar from './host-status-bar/main'; +import jobResultsStdOut from './job-results-stdout/main'; import route from './job-results.route.js'; @@ -14,7 +15,7 @@ import eventQueueService from './event-queue.service'; import durationFilter from './duration.filter'; export default - angular.module('jobResults', [hostStatusBar.name]) + angular.module('jobResults', [hostStatusBar.name, jobResultsStdOut.name]) .run(['$stateExtender', function($stateExtender) { $stateExtender.addState(route); }])