External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-05-10 19:07:36 -02:30
Code Issues Packages Projects Releases Wiki Activity

tooltip a bit better

Browse Source 
* update tests for i18n
This commit is contained in:
Chris Meyers
2017-01-17 16:39:56 -05:00
parent 6729717f13
commit 49c2838036
3 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
awx/ui/client/legacy-styles/ansible-ui.less
View File

@@ -1104,6 +1104,7 @@ input[type="checkbox"].checkbox-no-label {
.icon-job-stopped:before, .icon-job-stopped:before,
.icon-job-error:before, .icon-job-error:before,
.icon-job-canceled:before, .icon-job-canceled:before,
.icon-job-stdout-download-tooltip:before,
.icon-job-unreachable:before { .icon-job-unreachable:before {
content: "\f06a"; content: "\f06a";
} }
@@ -1141,6 +1142,7 @@ input[type="checkbox"].checkbox-no-label {
.icon-job-stopped, .icon-job-stopped,
.icon-job-error, .icon-job-error,
.icon-job-failed, .icon-job-failed,
.icon-job-stdout-download-tooltip,
.icon-job-canceled { .icon-job-canceled {
color: @red; color: @red;
} }

2
awx/ui/client/src/job-results/job-results.controller.js
View File

@@ -452,7 +452,7 @@ function(jobData, jobDataOptions, jobLabels, jobFinished, count, $scope, ParseTy
$(".header_task").hide(); $(".header_task").hide();
$(".header_play").hide(); $(".header_play").hide();
$scope.tooManyEvents = true; $scope.tooManyEvents = true;
$scope.standardOutTooltip = i18n._('The output is too large to display. Please download. <i class="fa icon-job-stdout-download-tooltip"></i>'); $scope.standardOutTooltip = i18n._('The output is too large to display. Please download.<span class="fa-stack fa-lg"><i class="fa fa-circle fa-stack-1x"></i><i class="fa fa-stack-1x icon-job-stdout-download-tooltip"></i></span>');
} else { } else {
$(".header_task").show(); $(".header_task").show();
$(".header_play").show(); $(".header_play").show();

9
awx/ui/tests/spec/job-results/job-results.controller-test.js
View File

@@ -4,7 +4,7 @@ describe('Controller: jobResultsController', () => {
// Setup // Setup
let jobResultsController; 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 = { jobData = {
related: {} related: {}
@@ -58,6 +58,12 @@ describe('Controller: jobResultsController', () => {
'encodeQueryset' 'encodeQueryset'
]); ]);
i18n = {
_: function(txt) {
return txt;
}
};
$provide.value('jobData', jobData); $provide.value('jobData', jobData);
$provide.value('jobDataOptions', jobDataOptions); $provide.value('jobDataOptions', jobDataOptions);
$provide.value('jobLabels', jobLabels); $provide.value('jobLabels', jobLabels);
@@ -71,6 +77,7 @@ describe('Controller: jobResultsController', () => {
$provide.value('Rest', Rest); $provide.value('Rest', Rest);
$provide.value('$state', $state); $provide.value('$state', $state);
$provide.value('QuerySet', QuerySet); $provide.value('QuerySet', QuerySet);
$provide.value('i18n', i18n);
}); });
}; };