shaba/awx
1
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2024-11-02 01:21:21 +03:00
Code Releases Activity

fixed alignment of download standard out button in modals

Browse Source
This commit is contained in:
John Mitchell 2015-08-10 15:21:10 -04:00
parent 43d873acab
commit ee41ec78ab
4 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
awx/ui/client/src/helpers/LogViewer.js
View File

@ -366,8 +366,10 @@ export default
html = ""; html = "";
if (params.standardOut) { if (params.standardOut) {
html += '<a href="' + params.jobUrl + 'stdout?format=txt_download" class="btn btn-primary btn-xs DownloadStandardOut DownloadStandardOut--onModal" id="download-stdout-button" type="button" aw-tool-tip="Download standard out as a .txt file" data-placement="top" ng-show="status === \'cancelled\' || status === \'failed\' || status === \'error\' || status === \'successful\'"><i class="fa fa-download DownloadStandardOut-icon DownloadStandardOut-icon--withText"></i>Download</a>'; html += '<a href="' + params.jobUrl + 'stdout?format=txt_download" class="btn btn-primary btn-xs DownloadStandardOut DownloadStandardOut--onModal" id="download-stdout-button" type="button" aw-tool-tip="Download standard out as a .txt file" data-placement="top" ng-show="status === \'cancelled\' || status === \'failed\' || status === \'error\' || status === \'successful\'"><i class="fa fa-download DownloadStandardOut-icon DownloadStandardOut-icon--withText"></i>Download</a>';
html += "<pre class='DownloadStandardOut-pre' ng-non-bindable>" + val + "</pre>\n";
} else {
html += "<pre ng-non-bindable>" + val + "</pre>\n";
} }
html += "<pre ng-non-bindable>" + val + "</pre>\n";
$('#' + id).empty().html(html); $('#' + id).empty().html(html);
}; };
}]) }])

4
awx/ui/client/src/partials/eventviewer.html
View File

@ -1,4 +1,4 @@
<div id="eventviewer-modal-dialog" title="Log View" style="display: none;"> <div id="eventviewer-modal-dialog" style="display: none;">
<ul id="eventview-tabs" class="nav nav-tabs"> <ul id="eventview-tabs" class="nav nav-tabs">
<li class="active"><a href="#status" id="status-link" data-toggle="tab" ng-click="toggleTab($event, 'status-link', 'eventview-tabs')">Event</a></li> <li class="active"><a href="#status" id="status-link" data-toggle="tab" ng-click="toggleTab($event, 'status-link', 'eventview-tabs')">Event</a></li>
<li><a href="#results" id="results-link" data-toggle="tab" ng-click="toggleTab($event, 'results-link', 'eventview-tabs')">Results</a></li> <li><a href="#results" id="results-link" data-toggle="tab" ng-click="toggleTab($event, 'results-link', 'eventview-tabs')">Results</a></li>
@ -31,4 +31,4 @@
<div id="json-form-container"></div> <div id="json-form-container"></div>
</div> </div>
</div> </div>
</div> </div>

4
awx/ui/client/src/partials/logviewer.html
View File

@ -1,5 +1,5 @@
<div id="logviewer-modal-dialog" title="Log View" style="display: none;"> <div id="logviewer-modal-dialog" style="display: none;">
<ul id="logview-tabs" class="nav nav-tabs"> <ul id="logview-tabs" class="nav nav-tabs">
<li class="active"><a href="#status" id="status-link" data-toggle="tab" ng-click="toggleTab($event, 'status-link', 'logview-tabs')">Status</a></li> <li class="active"><a href="#status" id="status-link" data-toggle="tab" ng-click="toggleTab($event, 'status-link', 'logview-tabs')">Status</a></li>
<li><a href="#stdout" id="stdout-link" data-toggle="tab" ng-click="toggleTab($event, 'stdout-link', 'logview-tabs')">Standard Out</a></li> <li><a href="#stdout" id="stdout-link" data-toggle="tab" ng-click="toggleTab($event, 'stdout-link', 'logview-tabs')">Standard Out</a></li>
@ -28,4 +28,4 @@
<div id="source-container"></div> <div id="source-container"></div>
</div> </div>
</div> </div>
</div> </div>

5
awx/ui/client/src/shared/download-standard-out.block.less
View File

@ -12,6 +12,7 @@
.DownloadStandardOut--onModal { .DownloadStandardOut--onModal {
margin-bottom: 10px; margin-bottom: 10px;
float: right;
} }
.DownloadStandardOut-icon { .DownloadStandardOut-icon {
@ -21,3 +22,7 @@
.DownloadStandardOut-icon--withText { .DownloadStandardOut-icon--withText {
margin-right: 5px; margin-right: 5px;
} }
.DownloadStandardOut-pre {
width: 100%;
}