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

finished styling for explanation/traceback on the details page

Browse Source
This commit is contained in:
John Mitchell 2015-01-23 14:45:18 -05:00
parent 7a668c9089
commit ef331d37bb
2 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
awx/ui/static/js/controllers/JobDetail.js
View File

@ -672,7 +672,7 @@ function JobDetailController ($location, $rootScope, $scope, $compile, $routePar
scope.job_status.status_class = ((data.status === 'error' || data.status === 'failed') && data.job_explanation) ? "alert alert-danger" : "";
scope.job_status.explanation = data.job_explanation;
if(data.result_traceback) {
scope.job_status.traceback = data.result_traceback;
scope.job_status.traceback = data.result_traceback.trim().split('\n').join('<br />');
}
if (data.status === 'successful' || data.status === 'failed' || data.status === 'error' || data.status === 'canceled') {
scope.job_status.finished = data.finished;

10
awx/ui/static/partials/job_detail.html
View File

@ -14,7 +14,10 @@
<div id="job-detail-container">
<div class="job_well">
<div class="row">
<div class="col-md-12 text-right">
<label class="col-lg-2 col-md-2 col-sm-2 col-xs-2">Status</label>
<div class="col-lg-6 col-md-6 col-sm-6 col-xs-6 job_status"><i class="fa icon-job-{{ job_status.status }}"></i> {{ job_status.status }}</div>
<div class="col-lg-4 text-right">
<a href="" id="play-help" aw-pop-over="Live event processing is now paused. Click here to resume." id="play-button-help" data-placement="left" ng-show="pauseLiveEvents" ><i class="fa fa-question"></i></a>
<a href="" ng-click="togglePlayButton()" id="play-button" class="btn btn-primary btn-xs" aw-tool-tip="Resume viewing live events" data-placement="top" ng-show="pauseLiveEvents" style="margin-right:25px;"><i class="fa fa-play"></i></a>
<a href="/#/jobs/{{ job_id }}/stdout" id="view-stdout-button" target="_blank" type="button" class="btn btn-primary btn-xs" aw-tool-tip="View standard out. Opens in new tab or window." data-placement="top"><i class="fa fa-external-link"></i></a>
@ -29,11 +32,6 @@
<div class="form-horizontal" role="form" id="job-status-form">
<div class="form-group">
<label class="col-lg-2 col-md-2 col-sm-2 col-xs-12 control-label">Status</label>
<div class="col-lg-10 col-md-10 col-sm-12 col-xs-12 job_status"><i class="fa icon-job-{{ job_status.status }}"></i> {{ job_status.status }}</div>
</div>
<div class="form-group" ng-show="job_status.explanation">
<label class="col-lg-2 col-md-12 col-sm-12 col-xs-12">Explanation</label>
<div class="col-lg-10 col-md-12 col-sm-12 col-xs-12 job_status_explanation" ng-bind-html="job_status.explanation"></div>