External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-01-27 08:31:28 -03:30
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4754 from chrismeyersfsu/fix-4342

Browse Source 
download standard out tooltip
This commit is contained in:
Chris Meyers 2017-01-20 10:06:36 -05:00 committed by GitHub
commit 5afa2ab264
5 changed files with 37 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1092,6 +1092,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";
}
@ -1129,6 +1130,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;
}

10
awx/ui/client/src/job-results/job-results.block.less
View File

@ -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;
}

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

@ -1,8 +1,11 @@
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 = i18n._('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,16 @@ function(jobData, jobDataOptions, jobLabels, jobFinished, count, $scope, ParseTy
$(".header_task").hide();
$(".header_play").hide();
$scope.tooManyEvents = true;
$scope.standardOutTooltip = '<div class="JobResults-downloadTooLarge"><div>' +
i18n._('The output is too large to display. Please download.') +
'</div>' +
'<div class="JobResults-downloadTooLarge--icon">' +
'<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>' +
'</div>' +
'</div>';
} else {
$(".header_task").show();
$(".header_play").show();

3
awx/ui/client/src/job-results/job-results.partial.html
View File

@ -488,7 +488,8 @@
job.status === 'canceled'"
href="/api/v1/jobs/{{ job.id }}/stdout?format=txt_download">
<button class="StandardOut-actionButton"
aw-tool-tip="Download Output"
aw-tool-tip="{{ standardOutTooltip }}"
data-tip-watch="standardOutTooltip"
data-placement="top">
<i class="fa fa-download"></i>
</button>

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

@ -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);
});
};