From 322c77482351e182e70bc645b9c009565c6e5cf2 Mon Sep 17 00:00:00 2001 From: Chris Meyers Date: Tue, 17 Jan 2017 09:51:48 -0500 Subject: [PATCH 1/5] download standard out tooltip related to #4342 --- awx/ui/client/src/job-results/job-results.controller.js | 4 ++++ awx/ui/client/src/job-results/job-results.partial.html | 3 ++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/awx/ui/client/src/job-results/job-results.controller.js b/awx/ui/client/src/job-results/job-results.controller.js index 30da9d4ea9..0e4a6d74eb 100644 --- a/awx/ui/client/src/job-results/job-results.controller.js +++ b/awx/ui/client/src/job-results/job-results.controller.js @@ -3,6 +3,9 @@ function(jobData, jobDataOptions, jobLabels, jobFinished, count, $scope, ParseTy var toDestroy = []; var cancelRequests = false; + // download stdout tooltip text + $scope.standardOutTooltip = "Download Output"; + // this allows you to manage the timing of rest-call based events as // filters are updated. see processPage for more info var currentContext = 1; @@ -449,6 +452,7 @@ function(jobData, jobDataOptions, jobLabels, jobFinished, count, $scope, ParseTy $(".header_task").hide(); $(".header_play").hide(); $scope.tooManyEvents = true; + $scope.standardOutTooltip = 'The output is too large to display. Please download. '; } else { $(".header_task").show(); $(".header_play").show(); 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 4788a036c4..ee2c079af1 100644 --- a/awx/ui/client/src/job-results/job-results.partial.html +++ b/awx/ui/client/src/job-results/job-results.partial.html @@ -488,7 +488,8 @@ job.status === 'canceled'" href="/api/v1/jobs/{{ job.id }}/stdout?format=txt_download&token={{ token }}"> From 6729717f1384376557717e821c263985b2e37b96 Mon Sep 17 00:00:00 2001 From: Chris Meyers Date: Tue, 17 Jan 2017 15:24:52 -0500 Subject: [PATCH 2/5] add translations --- awx/ui/client/src/job-results/job-results.controller.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/awx/ui/client/src/job-results/job-results.controller.js b/awx/ui/client/src/job-results/job-results.controller.js index 0e4a6d74eb..3bdb916c40 100644 --- a/awx/ui/client/src/job-results/job-results.controller.js +++ b/awx/ui/client/src/job-results/job-results.controller.js @@ -1,10 +1,10 @@ -export default ['jobData', 'jobDataOptions', 'jobLabels', 'jobFinished', 'count', '$scope', 'ParseTypeChange', 'ParseVariableString', 'jobResultsService', 'eventQueue', '$compile', '$log', 'Dataset', '$q', 'Rest', '$state', 'QuerySet', '$rootScope', 'moment', -function(jobData, jobDataOptions, jobLabels, jobFinished, count, $scope, ParseTypeChange, ParseVariableString, jobResultsService, eventQueue, $compile, $log, Dataset, $q, Rest, $state, QuerySet, $rootScope, moment) { +export default ['jobData', 'jobDataOptions', 'jobLabels', 'jobFinished', 'count', '$scope', 'ParseTypeChange', 'ParseVariableString', 'jobResultsService', 'eventQueue', '$compile', '$log', 'Dataset', '$q', 'Rest', '$state', 'QuerySet', '$rootScope', 'moment', 'i18n', +function(jobData, jobDataOptions, jobLabels, jobFinished, count, $scope, ParseTypeChange, ParseVariableString, jobResultsService, eventQueue, $compile, $log, Dataset, $q, Rest, $state, QuerySet, $rootScope, moment, i18n) { var toDestroy = []; var cancelRequests = false; // download stdout tooltip text - $scope.standardOutTooltip = "Download Output"; + $scope.standardOutTooltip = i18n._('Download Output'); // this allows you to manage the timing of rest-call based events as // filters are updated. see processPage for more info @@ -452,7 +452,7 @@ function(jobData, jobDataOptions, jobLabels, jobFinished, count, $scope, ParseTy $(".header_task").hide(); $(".header_play").hide(); $scope.tooManyEvents = true; - $scope.standardOutTooltip = 'The output is too large to display. Please download. '; + $scope.standardOutTooltip = i18n._('The output is too large to display. Please download. '); } else { $(".header_task").show(); $(".header_play").show(); From 49c283803620f04fb3615e33e04a3a940f2c7c7c Mon Sep 17 00:00:00 2001 From: Chris Meyers Date: Tue, 17 Jan 2017 16:39:56 -0500 Subject: [PATCH 3/5] tooltip a bit better * update tests for i18n --- awx/ui/client/legacy-styles/ansible-ui.less | 2 ++ awx/ui/client/src/job-results/job-results.controller.js | 2 +- .../spec/job-results/job-results.controller-test.js | 9 ++++++++- 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/awx/ui/client/legacy-styles/ansible-ui.less b/awx/ui/client/legacy-styles/ansible-ui.less index 9be4a91061..8ba4f8f669 100644 --- a/awx/ui/client/legacy-styles/ansible-ui.less +++ b/awx/ui/client/legacy-styles/ansible-ui.less @@ -1104,6 +1104,7 @@ input[type="checkbox"].checkbox-no-label { .icon-job-stopped:before, .icon-job-error:before, .icon-job-canceled:before, + .icon-job-stdout-download-tooltip:before, .icon-job-unreachable:before { content: "\f06a"; } @@ -1141,6 +1142,7 @@ input[type="checkbox"].checkbox-no-label { .icon-job-stopped, .icon-job-error, .icon-job-failed, + .icon-job-stdout-download-tooltip, .icon-job-canceled { color: @red; } diff --git a/awx/ui/client/src/job-results/job-results.controller.js b/awx/ui/client/src/job-results/job-results.controller.js index 3bdb916c40..52db481671 100644 --- a/awx/ui/client/src/job-results/job-results.controller.js +++ b/awx/ui/client/src/job-results/job-results.controller.js @@ -452,7 +452,7 @@ function(jobData, jobDataOptions, jobLabels, jobFinished, count, $scope, ParseTy $(".header_task").hide(); $(".header_play").hide(); $scope.tooManyEvents = true; - $scope.standardOutTooltip = i18n._('The output is too large to display. Please download. '); + $scope.standardOutTooltip = i18n._('The output is too large to display. Please download.'); } else { $(".header_task").show(); $(".header_play").show(); diff --git a/awx/ui/tests/spec/job-results/job-results.controller-test.js b/awx/ui/tests/spec/job-results/job-results.controller-test.js index aec74d8edc..f3ef4f822d 100644 --- a/awx/ui/tests/spec/job-results/job-results.controller-test.js +++ b/awx/ui/tests/spec/job-results/job-results.controller-test.js @@ -4,7 +4,7 @@ describe('Controller: jobResultsController', () => { // Setup let jobResultsController; - let jobData, jobDataOptions, jobLabels, jobFinished, count, $scope, ParseTypeChange, ParseVariableString, jobResultsService, eventQueue, $compile, eventResolve, populateResolve, $rScope, q, $log, Dataset, Rest, $state, QuerySet; + let jobData, jobDataOptions, jobLabels, jobFinished, count, $scope, ParseTypeChange, ParseVariableString, jobResultsService, eventQueue, $compile, eventResolve, populateResolve, $rScope, q, $log, Dataset, Rest, $state, QuerySet, i18n; jobData = { related: {} @@ -58,6 +58,12 @@ describe('Controller: jobResultsController', () => { 'encodeQueryset' ]); + i18n = { + _: function(txt) { + return txt; + } + }; + $provide.value('jobData', jobData); $provide.value('jobDataOptions', jobDataOptions); $provide.value('jobLabels', jobLabels); @@ -71,6 +77,7 @@ describe('Controller: jobResultsController', () => { $provide.value('Rest', Rest); $provide.value('$state', $state); $provide.value('QuerySet', QuerySet); + $provide.value('i18n', i18n); }); }; From a13d2ca4bbf91db387a410addaa916c6bc037445 Mon Sep 17 00:00:00 2001 From: Michael Abashian Date: Thu, 19 Jan 2017 18:49:43 -0500 Subject: [PATCH 4/5] Fixed alignment issue with the download standard out tooltip when the output is too big. --- awx/ui/client/src/job-results/job-results.block.less | 10 ++++++++++ .../client/src/job-results/job-results.controller.js | 2 +- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/awx/ui/client/src/job-results/job-results.block.less b/awx/ui/client/src/job-results/job-results.block.less index 55d9446c82..be8e330693 100644 --- a/awx/ui/client/src/job-results/job-results.block.less +++ b/awx/ui/client/src/job-results/job-results.block.less @@ -201,3 +201,13 @@ job-results-standard-out { .JobResults .CodeMirror-cursors { display: none; } + +.JobResults-downloadTooLarge { + display: flex; +} + +.JobResults-downloadTooLarge--icon { + display: flex; + align-items: center; + justify-content: center; +} diff --git a/awx/ui/client/src/job-results/job-results.controller.js b/awx/ui/client/src/job-results/job-results.controller.js index 52db481671..8e327e5354 100644 --- a/awx/ui/client/src/job-results/job-results.controller.js +++ b/awx/ui/client/src/job-results/job-results.controller.js @@ -452,7 +452,7 @@ function(jobData, jobDataOptions, jobLabels, jobFinished, count, $scope, ParseTy $(".header_task").hide(); $(".header_play").hide(); $scope.tooManyEvents = true; - $scope.standardOutTooltip = i18n._('The output is too large to display. Please download.'); + $scope.standardOutTooltip = i18n._('
The output is too large to display. Please download.
'); } else { $(".header_task").show(); $(".header_play").show(); From e2a13495c8aeaab11c55e83b47cabe423b7e35d6 Mon Sep 17 00:00:00 2001 From: Chris Meyers Date: Fri, 20 Jan 2017 09:45:28 -0500 Subject: [PATCH 5/5] formatting and i18n fixes --- .../client/src/job-results/job-results.controller.js | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/awx/ui/client/src/job-results/job-results.controller.js b/awx/ui/client/src/job-results/job-results.controller.js index 8e327e5354..92d311a204 100644 --- a/awx/ui/client/src/job-results/job-results.controller.js +++ b/awx/ui/client/src/job-results/job-results.controller.js @@ -452,7 +452,16 @@ function(jobData, jobDataOptions, jobLabels, jobFinished, count, $scope, ParseTy $(".header_task").hide(); $(".header_play").hide(); $scope.tooManyEvents = true; - $scope.standardOutTooltip = i18n._('
The output is too large to display. Please download.
'); + $scope.standardOutTooltip = '
' + + i18n._('The output is too large to display. Please download.') + + '
' + + '
' + + '' + + '' + + '' + + '' + + '
' + + '
'; } else { $(".header_task").show(); $(".header_play").show();