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

Made standard out details responsive. Removed the /stdout on the end of some of the standard out routes.

Browse Source
This commit is contained in:
Michael Abashian
2016-02-24 08:20:22 -05:00
parent cad54a43a1
commit 382368f8db
10 changed files with 29 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
awx/ui/client/src/standard-out/adhoc/standard-out-adhoc.partial.html
View File

@@ -17,7 +17,7 @@
<div class="StandardOut-detailsLabel">STATUS</div> <div class="StandardOut-detailsLabel">STATUS</div>
<div class="StandardOut-detailsContent"> <div class="StandardOut-detailsContent">
<i class="fa icon-job-{{ job.status }}"></i> <i class="fa icon-job-{{ job.status }}"></i>
<span class="StandardOut-statusText">{{ job.status }}</span> <span class="StandardOut-statusText StandardOut--capitalize">{{ job.status }}</span>
</div> </div>
</div> </div>

2
awx/ui/client/src/standard-out/adhoc/standard-out-adhoc.route.js
View File

@@ -8,7 +8,7 @@ import {templateUrl} from '../../shared/template-url/template-url.factory';
export default { export default {
name: 'adHocJobStdout', name: 'adHocJobStdout',
route: '/ad_hoc_commands/:id/stdout', route: '/ad_hoc_commands/:id',
templateUrl: templateUrl('standard-out/adhoc/standard-out-adhoc'), templateUrl: templateUrl('standard-out/adhoc/standard-out-adhoc'),
controller: 'JobStdoutController', controller: 'JobStdoutController',
ncyBreadcrumb: { ncyBreadcrumb: {

10
awx/ui/client/src/standard-out/inventory-sync/standard-out-inventory-sync.partial.html
View File

@@ -21,13 +21,13 @@
<div class="StandardOut-detailsLabel">STATUS</div> <div class="StandardOut-detailsLabel">STATUS</div>
<div class="StandardOut-detailsContent"> <div class="StandardOut-detailsContent">
<i class="fa icon-job-{{ job.status }}"></i> <i class="fa icon-job-{{ job.status }}"></i>
<span class="StandardOut-statusText">{{ job.status }}</span> <span class="StandardOut-statusText StandardOut--capitalize">{{ job.status }}</span>
</div> </div>
</div> </div>
<div class="StandardOut-detailsRow" ng-show="{{job.license_error !== null}}"> <div class="StandardOut-detailsRow" ng-show="{{job.license_error !== null}}">
<div class="StandardOut-detailsLabel">LICENSE ERROR</div> <div class="StandardOut-detailsLabel">LICENSE ERROR</div>
<div class="StandardOut-detailsContent"> <div class="StandardOut-detailsContent StandardOut--capitalize">
{{ job.license_error }} {{ job.license_error }}
</div> </div>
</div> </div>
@@ -55,7 +55,7 @@
<div class="StandardOut-detailsRow" ng-show="job.launch_type"> <div class="StandardOut-detailsRow" ng-show="job.launch_type">
<div class="StandardOut-detailsLabel">LAUNCH TYPE</div> <div class="StandardOut-detailsLabel">LAUNCH TYPE</div>
<div class="StandardOut-detailsContent"> <div class="StandardOut-detailsContent StandardOut--capitalize">
{{ job.launch_type }} {{ job.launch_type }}
</div> </div>
</div> </div>
@@ -94,14 +94,14 @@
<div class="StandardOut-detailsRow" ng-show="{{ job.overwrite !== null }}"> <div class="StandardOut-detailsRow" ng-show="{{ job.overwrite !== null }}">
<div class="StandardOut-detailsLabel">OVERWRITE</div> <div class="StandardOut-detailsLabel">OVERWRITE</div>
<div class="StandardOut-detailsContent"> <div class="StandardOut-detailsContent StandardOut--capitalize">
{{ job.overwrite }} {{ job.overwrite }}
</div> </div>
</div> </div>
<div class="StandardOut-detailsRow" ng-show="{{ job.overwrite_vars !== null }}"> <div class="StandardOut-detailsRow" ng-show="{{ job.overwrite_vars !== null }}">
<div class="StandardOut-detailsLabel">OVERWRITE VARS</div> <div class="StandardOut-detailsLabel">OVERWRITE VARS</div>
<div class="StandardOut-detailsContent"> <div class="StandardOut-detailsContent StandardOut--capitalize">
{{ job.overwrite_vars }} {{ job.overwrite_vars }}
</div> </div>
</div> </div>

2
awx/ui/client/src/standard-out/inventory-sync/standard-out-inventory-sync.route.js
View File

@@ -10,7 +10,7 @@ import {templateUrl} from '../../shared/template-url/template-url.factory';
export default { export default {
name: 'inventorySyncStdout', name: 'inventorySyncStdout',
route: '/inventory_sync/:id/stdout', route: '/inventory_sync/:id',
templateUrl: templateUrl('standard-out/inventory-sync/standard-out-inventory-sync'), templateUrl: templateUrl('standard-out/inventory-sync/standard-out-inventory-sync'),
controller: 'JobStdoutController', controller: 'JobStdoutController',
ncyBreadcrumb: { ncyBreadcrumb: {

4
awx/ui/client/src/standard-out/management-jobs/standard-out-management-jobs.partial.html
View File

@@ -17,7 +17,7 @@
<div class="StandardOut-detailsLabel">STATUS</div> <div class="StandardOut-detailsLabel">STATUS</div>
<div class="StandardOut-detailsContent"> <div class="StandardOut-detailsContent">
<i class="fa icon-job-{{ job.status }}"></i> <i class="fa icon-job-{{ job.status }}"></i>
<span class="StandardOut-statusText">{{ job.status }}</span> <span class="StandardOut-statusText StandardOut--capitalize">{{ job.status }}</span>
</div> </div>
</div> </div>
@@ -44,7 +44,7 @@
<div class="StandardOut-detailsRow" ng-show="job.launch_type"> <div class="StandardOut-detailsRow" ng-show="job.launch_type">
<div class="StandardOut-detailsLabel">LAUNCH TYPE</div> <div class="StandardOut-detailsLabel">LAUNCH TYPE</div>
<div class="StandardOut-detailsContent"> <div class="StandardOut-detailsContent StandardOut--capitalize">
{{ job.launch_type }} {{ job.launch_type }}
</div> </div>
</div> </div>

2
awx/ui/client/src/standard-out/management-jobs/standard-out-management-jobs.route.js
View File

@@ -8,7 +8,7 @@ import {templateUrl} from '../../shared/template-url/template-url.factory';
export default { export default {
name: 'managementJobStdout', name: 'managementJobStdout',
route: '/management_jobs/:id/stdout', route: '/management_jobs/:id',
templateUrl: templateUrl('standard-out/management-jobs/standard-out-management-jobs'), templateUrl: templateUrl('standard-out/management-jobs/standard-out-management-jobs'),
controller: 'JobStdoutController', controller: 'JobStdoutController',
ncyBreadcrumb: { ncyBreadcrumb: {

4
awx/ui/client/src/standard-out/scm-update/standard-out-scm-update.partial.html
View File

@@ -21,7 +21,7 @@
<div class="StandardOut-detailsLabel">STATUS</div> <div class="StandardOut-detailsLabel">STATUS</div>
<div class="StandardOut-detailsContent"> <div class="StandardOut-detailsContent">
<i class="fa icon-job-{{ job.status }}"></i> <i class="fa icon-job-{{ job.status }}"></i>
<span class="StandardOut-statusText">{{ job.status }}</span> <span class="StandardOut-statusText StandardOut--capitalize">{{ job.status }}</span>
</div> </div>
</div> </div>
@@ -48,7 +48,7 @@
<div class="StandardOut-detailsRow" ng-show="job.launch_type"> <div class="StandardOut-detailsRow" ng-show="job.launch_type">
<div class="StandardOut-detailsLabel">LAUNCH TYPE</div> <div class="StandardOut-detailsLabel">LAUNCH TYPE</div>
<div class="StandardOut-detailsContent"> <div class="StandardOut-detailsContent StandardOut--capitalize">
{{ job.launch_type }} {{ job.launch_type }}
</div> </div>
</div> </div>

2
awx/ui/client/src/standard-out/scm-update/standard-out-scm-update.route.js
View File

@@ -10,7 +10,7 @@ import {templateUrl} from '../../shared/template-url/template-url.factory';
export default { export default {
name: 'scmUpdateStdout', name: 'scmUpdateStdout',
route: '/scm_update/:id/stdout', route: '/scm_update/:id',
templateUrl: templateUrl('standard-out/scm-update/standard-out-scm-update'), templateUrl: templateUrl('standard-out/scm-update/standard-out-scm-update'),
controller: 'JobStdoutController', controller: 'JobStdoutController',
ncyBreadcrumb: { ncyBreadcrumb: {

15
awx/ui/client/src/standard-out/standard-out.block.less
View File

@@ -58,3 +58,18 @@
.StandardOut-statusText { .StandardOut-statusText {
margin-left: 6px; margin-left: 6px;
} }
.StandardOut--capitalize {
text-transform: capitalize;
}
@standardout-breakpoint: 900px;
@media screen and (max-width: @standardout-breakpoint) {
.StandardOut {
flex-direction: column;
}
.StandardOut-rightPanel {
margin-left: 0px;
}
}

2
awx/ui/client/src/standard-out/standard-out.controller.js
View File

@@ -158,8 +158,6 @@ export function JobStdoutController ($location, $log, $rootScope, $scope, $compi
} }
}; };
$(".StandardOut").height($("body").height() - 60);
Rest.setUrl(GetBasePath('base') + jobType + '/' + job_id + '/'); Rest.setUrl(GetBasePath('base') + jobType + '/' + job_id + '/');
Rest.get() Rest.get()
.success(function(data) { .success(function(data) {