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

styled stdout of jobs and adhoc commands

Browse Source
This commit is contained in:
John Mitchell
2015-06-02 16:19:54 -04:00
parent 540308a9b4
commit 7847417315
4 changed files with 57 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
awx/ui/static/js/controllers/JobStdout.js
View File

@@ -15,7 +15,7 @@ export function JobStdoutController ($location, $log, $rootScope, $scope, $compi
ClearScope(); ClearScope();
var available_height, job_id = $routeParams.id, var job_id = $routeParams.id,
api_complete = false, api_complete = false,
stdout_url, stdout_url,
current_range, current_range,
@@ -137,17 +137,6 @@ export function JobStdoutController ($location, $log, $rootScope, $scope, $compi
return direction; return direction;
} }
function resizeToFit() {
available_height = $(window).height() - $('#main-menu-container .navbar').outerHeight() - $('#job-status').outerHeight() -
$('#breadcrumb-container').outerHeight() - 60;
$('#pre-container').height(available_height);
}
resizeToFit();
$(window).resize(_.debounce(function() {
resizeToFit();
}, 500));
$('#pre-container').bind('scroll', function() { $('#pre-container').bind('scroll', function() {
if (detectDirection() === "up") { if (detectDirection() === "up") {
should_apply_live_events = false; should_apply_live_events = false;
@@ -264,7 +253,7 @@ export function JobStdoutController ($location, $log, $rootScope, $scope, $compi
Rest.setUrl(url); Rest.setUrl(url);
Rest.get() Rest.get()
.success( function(data) { .success( function(data) {
if ($('#pre-container-content').html() === "stdout capture pending") { if ($('#pre-container-content').html() === "Waiting for results...") {
$('#pre-container-content').html(data.content); $('#pre-container-content').html(data.content);
} else { } else {
$('#pre-container-content').append(data.content); $('#pre-container-content').append(data.content);

8
awx/ui/static/less/ansible-ui.less
View File

@@ -1976,3 +1976,11 @@ tr td button i {
.nvd3 g.nv-groups path.nv-line { .nvd3 g.nv-groups path.nv-line {
stroke-width: 3px; stroke-width: 3px;
} }
.stdout-panel-body {
background-color: #e9e9e9;
}
.job-stdout-panel {
margin: 0 15px;
}

32
awx/ui/static/partials/job_stdout.html
View File

@@ -13,17 +13,33 @@
<button type="button" class="btn btn-xs btn-primary ng-hide" ng-click="refresh()" id="refresh_btn" aw-tool-tip="Refresh the page" data-placement="top" ng-show="socketStatus == 'error'" data-original-title="" title=""><i class="fa fa-refresh fa-lg"></i> </button></div> <button type="button" class="btn btn-xs btn-primary ng-hide" ng-click="refresh()" id="refresh_btn" aw-tool-tip="Refresh the page" data-placement="top" ng-show="socketStatus == 'error'" data-original-title="" title=""><i class="fa fa-refresh fa-lg"></i> </button></div>
</div> </div>
</div> </div>
<div class="row"> <div class="row">
<div class="col-md-12"> <div class="col-md-12">
<div id="job-status"><label>Job Status</label> <i class="fa icon-job-{{ job.status }}"></i> {{ job.status }}</div> <div id="job-status"><label>Job Status</label> <i class="fa icon-job-{{ job.status }}"></i> {{ job.status }}</div>
<div class="scroll-spinner" id="stdoutMoreRowsTop"><i class="fa fa-cog fa-spin"></i></div>
<div id="pre-container" class="body_background body_foreground pre mono-space" lr-infinite-scroll="stdOutScrollToTop"
scroll-threshold="300" data-direction="up" time-threshold="500">
<div id="pre-container-content"></div>
</div>
</div> </div>
<div class="scroll-spinner" id="stdoutMoreRowsBottom"><i class="fa fa-cog fa-spin"></i></div> <div class="panel panel-default job-stdout-panel">
<div class="panel-heading">
<h3 class="panel-title">{{ job.name }} standard out</h3>
</div>
<div class="panel-body stdout-panel-body">
<div class="row">
<div class="col-md-12">
<div class="scroll-spinner" id="stdoutMoreRowsTop">
<i class="fa fa-cog fa-spin"></i>
</div>
<div id="pre-container" class="body_background
body_foreground pre mono-space"
lr-infinite-scroll="stdOutScrollToTop"
scroll-threshold="300" data-direction="up" time-threshold="500">
<div id="pre-container-content"></div>
</div>
</div>
<div class="scroll-spinner" id="stdoutMoreRowsBottom">
<i class="fa fa-cog fa-spin"></i>
</div>
</div>
</div>
</div>
</div> </div>
</div> </div>
</div> </div>

39
awx/ui/static/partials/job_stdout_adhoc.html
View File

@@ -8,7 +8,7 @@
<li><a href="/#/jobs">Jobs</a></li> <li><a href="/#/jobs">Jobs</a></li>
<li class="active"> <li class="active">
<a href="/#/ad_hoc_commands/{{ job.id }}"> <a href="/#/ad_hoc_commands/{{ job.id }}">
{{ job.id }} - {{ job.name }} standard out {{ job.id }} - {{ job.name }}
</a> </a>
</li> </li>
</ul> </ul>
@@ -144,21 +144,28 @@
</div> </div>
</div> </div>
<div class="row"> <div class="panel panel-default">
<div class="col-md-12"> <div class="panel-heading">
<div class="scroll-spinner" id="stdoutMoreRowsTop"> <h3 class="panel-title">{{ job.name }} standard out</h3>
<i class="fa fa-cog fa-spin"></i> </div>
</div> <div class="panel-body stdout-panel-body">
<div id="pre-container" class="body_background <div class="row">
body_foreground pre mono-space" <div class="col-md-12">
lr-infinite-scroll="stdOutScrollToTop" <div class="scroll-spinner" id="stdoutMoreRowsTop">
scroll-threshold="300" data-direction="up" time-threshold="500"> <i class="fa fa-cog fa-spin"></i>
<div id="pre-container-content"></div> </div>
</div> <div id="pre-container" class="body_background
</div> body_foreground mono-space"
<div class="scroll-spinner" id="stdoutMoreRowsBottom"> lr-infinite-scroll="stdOutScrollToTop"
<i class="fa fa-cog fa-spin"></i> scroll-threshold="300" data-direction="up" time-threshold="500">
</div> <div id="pre-container-content"></div>
</div>
</div>
<div class="scroll-spinner" id="stdoutMoreRowsBottom">
<i class="fa fa-cog fa-spin"></i>
</div>
</div>
</div>
</div> </div>
</div> </div>