From 49c283803620f04fb3615e33e04a3a940f2c7c7c Mon Sep 17 00:00:00 2001 From: Chris Meyers Date: Tue, 17 Jan 2017 16:39:56 -0500 Subject: [PATCH] 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); }); };