External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-05-08 01:47:35 -02:30
Code Issues Packages Projects Releases Wiki Activity

made standard out container fixed height on standard out views

Browse Source
This commit is contained in:
John Mitchell
2015-10-09 14:33:47 -04:00
parent 9dd0c7ae1f
commit 8f5a197cd9
3 changed files with 198 additions and 205 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
awx/ui/client/src/controllers/JobStdout.js
View File

@@ -158,6 +158,8 @@ export function JobStdoutController ($location, $log, $rootScope, $scope, $compi
} }
}; };
$(".StandardOut").height($("body").height() - 60);
// Note: could be ad_hoc_commands or jobs // Note: could be ad_hoc_commands or jobs
var jobType = $location.path().replace(/^\//, '').split('/')[0]; var jobType = $location.path().replace(/^\//, '').split('/')[0];
Rest.setUrl(GetBasePath(jobType) + job_id + '/'); Rest.setUrl(GetBasePath(jobType) + job_id + '/');

27
awx/ui/client/src/partials/job_stdout.html
View File

@@ -1,7 +1,10 @@
<div class="tab-pane" id="jobs-stdout"> <div class="tab-pane" id="jobs-stdout">
<div ng-cloak id="htmlTemplate"> <div ng-cloak id="htmlTemplate">
<div class="row"> <div class="StandardOut">
<div class="StandardOut-heading">
<div class="row StandardOut-breadcrumbs">
<div id="breadcrumb-container" class="col-md-6" style="position: relative;"> <div id="breadcrumb-container" class="col-md-6" style="position: relative;">
<ul class="ansible-breadcrumb" id="breadcrumb-list"> <ul class="ansible-breadcrumb" id="breadcrumb-list">
<li><a href="/#/jobs">Jobs</a></li> <li><a href="/#/jobs">Jobs</a></li>
@@ -12,32 +15,25 @@
<div id="home-list-actions" class="list-actions pull-right col-md-6"> <div id="home-list-actions" class="list-actions pull-right col-md-6">
<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 class="row StandardOut-form">
<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> </div>
</div> </div>
<div class="row"> </div>
<div class="panel panel-default job-stdout-panel"> <div class="panel panel-default job-stdout-panel StandardOut-panel">
<div class="panel-heading"> <div class="panel-heading StandardOut-panelHeading">
<h3 class="panel-title">Standard Output <h3 class="panel-title">Standard Output
<a href="/api/v1/jobs/{{ job.id }}/stdout?format=txt_download&token={{ token }}" class="btn btn-primary btn-xs DownloadStandardOut DownloadStandardOut--onStandardOutPage" id="download-stdout-button" type="button" aw-tool-tip="Download standard out as a .txt file" data-placement="top" ng-show="job.status === 'cancelled' || job.status === 'failed' || job.status === 'error' || job.status === 'successful'"> <a href="/api/v1/jobs/{{ job.id }}/stdout?format=txt_download&token={{ token }}" class="btn btn-primary btn-xs DownloadStandardOut DownloadStandardOut--onStandardOutPage" id="download-stdout-button" type="button" aw-tool-tip="Download standard out as a .txt file" data-placement="top" ng-show="job.status === 'cancelled' || job.status === 'failed' || job.status === 'error' || job.status === 'successful'">
<i class="fa fa-download DownloadStandardOut-icon DownloadStandardOut-icon--withText"></i>Download <i class="fa fa-download DownloadStandardOut-icon DownloadStandardOut-icon--withText"></i>Download
</a> </a>
</div> </div>
<div class="panel-body stdout-panel-body"> <div class="panel-body stdout-panel-body StandardOut-panelBody">
<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 <div id="pre-container" class="body_background
body_foreground pre mono-space" body_foreground pre mono-space StandardOut-preContainer"
lr-infinite-scroll="stdOutScrollToTop" lr-infinite-scroll="stdOutScrollToTop"
scroll-threshold="300" data-direction="up" time-threshold="500"> scroll-threshold="300" data-direction="up" time-threshold="500">
<div id="pre-container-content"></div> <div id="pre-container-content" class="StandardOut-preContent"></div>
</div>
</div> </div>
<div class="scroll-spinner" id="stdoutMoreRowsBottom"> <div class="scroll-spinner" id="stdoutMoreRowsBottom">
<i class="fa fa-cog fa-spin"></i> <i class="fa fa-cog fa-spin"></i>
@@ -46,5 +42,4 @@
</div> </div>
</div> </div>
</div> </div>
</div>
</div> </div>

26
awx/ui/client/src/partials/job_stdout_adhoc.html
View File

@@ -1,7 +1,8 @@
<div class="tab-pane" id="jobs-stdout"> <div class="tab-pane" id="jobs-stdout">
<div ng-cloak id="htmlTemplate"> <div ng-cloak id="htmlTemplate">
<div class="StandardOut">
<div class="row"> <div class="row StandardOut-heading">
<div class="row StandardOut-breadcrumbs">
<div id="breadcrumb-container" class="col-md-6" <div id="breadcrumb-container" class="col-md-6"
style="position: relative;"> style="position: relative;">
<ul class="ansible-breadcrumb" id="breadcrumb-list"> <ul class="ansible-breadcrumb" id="breadcrumb-list">
@@ -25,7 +26,7 @@
</div> </div>
</div> </div>
<div class="form-horizontal StandardOutDetails" <div class="StandardOut-form form-horizontal StandardOutDetails"
role="form" id="job-status-form"> role="form" id="job-status-form">
<div class="form-group StandardOutDetails-detailRow"> <div class="form-group StandardOutDetails-detailRow">
<label class="col-lg-2 col-md-2 col-sm-2 col-xs-12 <label class="col-lg-2 col-md-2 col-sm-2 col-xs-12
@@ -156,32 +157,27 @@
</a> </a>
</div> </div>
</div> </div>
</div>
<div class="panel panel-default"> <div class="panel panel-default StandardOut-panel">
<div class="panel-heading"> <div class="panel-heading StandardOut-panelHeading">
<h3 class="panel-title">Standard Output <h3 class="panel-title">Standard Output
<a ng-href="/api/v1/ad_hoc_commands/{{ job.id }}/stdout?format=txt_download&token={{ token }}" class="btn btn-primary btn-xs DownloadStandardOut DownloadStandardOut--onStandardOutPage" id="download-stdout-button" type="button" aw-tool-tip="Download standard out as a .txt file" data-placement="top" ng-show="job.status === 'cancelled' || job.status === 'failed' || job.status === 'error' || job.status === 'successful'"><i class="fa fa-download DownloadStandardOut-icon DownloadStandardOut-icon--withText"></i>Download</a> <a ng-href="/api/v1/ad_hoc_commands/{{ job.id }}/stdout?format=txt_download&token={{ token }}" class="btn btn-primary btn-xs DownloadStandardOut DownloadStandardOut--onStandardOutPage" id="download-stdout-button" type="button" aw-tool-tip="Download standard out as a .txt file" data-placement="top" ng-show="job.status === 'cancelled' || job.status === 'failed' || job.status === 'error' || job.status === 'successful'"><i class="fa fa-download DownloadStandardOut-icon DownloadStandardOut-icon--withText"></i>Download</a>
</h3> </h3>
</div> </div>
<div class="panel-body stdout-panel-body"> <div class="panel-body stdout-panel-body StandardOut-panelBody">
<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 <div id="pre-container" class="body_background
body_foreground pre mono-space" body_foreground pre mono-space StandardOut-preContainer"
lr-infinite-scroll="stdOutScrollToTop" lr-infinite-scroll="stdOutScrollToTop"
scroll-threshold="300" data-direction="up" time-threshold="500"> scroll-threshold="300" data-direction="up" time-threshold="500">
<div id="pre-container-content"></div> <div id="pre-container-content" class="StandardOut-preContent"></div>
</div>
</div> </div>
<div class="scroll-spinner" id="stdoutMoreRowsBottom"> <div class="scroll-spinner" id="stdoutMoreRowsBottom">
<i class="fa fa-cog fa-spin"></i> <i class="fa fa-cog fa-spin"></i>
</div> </div>
</div> </div>
</div> </div>
</div>
</div> </div>
</div>
</div> </div>