diff --git a/awx/ui/client/src/standard-out/adhoc/standard-out-adhoc.partial.html b/awx/ui/client/src/standard-out/adhoc/standard-out-adhoc.partial.html index 9d6d6ad4ac..3b8b51fa97 100644 --- a/awx/ui/client/src/standard-out/adhoc/standard-out-adhoc.partial.html +++ b/awx/ui/client/src/standard-out/adhoc/standard-out-adhoc.partial.html @@ -17,7 +17,7 @@
STATUS
- {{ job.status }} + {{ job.status }}
diff --git a/awx/ui/client/src/standard-out/adhoc/standard-out-adhoc.route.js b/awx/ui/client/src/standard-out/adhoc/standard-out-adhoc.route.js index 180baa17fa..d9d121b443 100644 --- a/awx/ui/client/src/standard-out/adhoc/standard-out-adhoc.route.js +++ b/awx/ui/client/src/standard-out/adhoc/standard-out-adhoc.route.js @@ -8,7 +8,7 @@ import {templateUrl} from '../../shared/template-url/template-url.factory'; export default { name: 'adHocJobStdout', - route: '/ad_hoc_commands/:id/stdout', + route: '/ad_hoc_commands/:id', templateUrl: templateUrl('standard-out/adhoc/standard-out-adhoc'), controller: 'JobStdoutController', ncyBreadcrumb: { diff --git a/awx/ui/client/src/standard-out/inventory-sync/standard-out-inventory-sync.partial.html b/awx/ui/client/src/standard-out/inventory-sync/standard-out-inventory-sync.partial.html index 63835c3c80..cba201786e 100644 --- a/awx/ui/client/src/standard-out/inventory-sync/standard-out-inventory-sync.partial.html +++ b/awx/ui/client/src/standard-out/inventory-sync/standard-out-inventory-sync.partial.html @@ -21,13 +21,13 @@
STATUS
- {{ job.status }} + {{ job.status }}
LICENSE ERROR
-
+
{{ job.license_error }}
@@ -55,7 +55,7 @@
LAUNCH TYPE
-
+
{{ job.launch_type }}
@@ -94,14 +94,14 @@
OVERWRITE
-
+
{{ job.overwrite }}
OVERWRITE VARS
-
+
{{ job.overwrite_vars }}
diff --git a/awx/ui/client/src/standard-out/inventory-sync/standard-out-inventory-sync.route.js b/awx/ui/client/src/standard-out/inventory-sync/standard-out-inventory-sync.route.js index 85afb5e01f..a357f39afc 100644 --- a/awx/ui/client/src/standard-out/inventory-sync/standard-out-inventory-sync.route.js +++ b/awx/ui/client/src/standard-out/inventory-sync/standard-out-inventory-sync.route.js @@ -10,7 +10,7 @@ import {templateUrl} from '../../shared/template-url/template-url.factory'; export default { name: 'inventorySyncStdout', - route: '/inventory_sync/:id/stdout', + route: '/inventory_sync/:id', templateUrl: templateUrl('standard-out/inventory-sync/standard-out-inventory-sync'), controller: 'JobStdoutController', ncyBreadcrumb: { diff --git a/awx/ui/client/src/standard-out/management-jobs/standard-out-management-jobs.partial.html b/awx/ui/client/src/standard-out/management-jobs/standard-out-management-jobs.partial.html index f268e9569a..36a29fef55 100644 --- a/awx/ui/client/src/standard-out/management-jobs/standard-out-management-jobs.partial.html +++ b/awx/ui/client/src/standard-out/management-jobs/standard-out-management-jobs.partial.html @@ -17,7 +17,7 @@
STATUS
- {{ job.status }} + {{ job.status }}
@@ -44,7 +44,7 @@
LAUNCH TYPE
-
+
{{ job.launch_type }}
diff --git a/awx/ui/client/src/standard-out/management-jobs/standard-out-management-jobs.route.js b/awx/ui/client/src/standard-out/management-jobs/standard-out-management-jobs.route.js index c119ea215b..6eaa1aa184 100644 --- a/awx/ui/client/src/standard-out/management-jobs/standard-out-management-jobs.route.js +++ b/awx/ui/client/src/standard-out/management-jobs/standard-out-management-jobs.route.js @@ -8,7 +8,7 @@ import {templateUrl} from '../../shared/template-url/template-url.factory'; export default { name: 'managementJobStdout', - route: '/management_jobs/:id/stdout', + route: '/management_jobs/:id', templateUrl: templateUrl('standard-out/management-jobs/standard-out-management-jobs'), controller: 'JobStdoutController', ncyBreadcrumb: { diff --git a/awx/ui/client/src/standard-out/scm-update/standard-out-scm-update.partial.html b/awx/ui/client/src/standard-out/scm-update/standard-out-scm-update.partial.html index 883d382c20..ec1378cad7 100644 --- a/awx/ui/client/src/standard-out/scm-update/standard-out-scm-update.partial.html +++ b/awx/ui/client/src/standard-out/scm-update/standard-out-scm-update.partial.html @@ -21,7 +21,7 @@
STATUS
- {{ job.status }} + {{ job.status }}
@@ -48,7 +48,7 @@
LAUNCH TYPE
-
+
{{ job.launch_type }}
diff --git a/awx/ui/client/src/standard-out/scm-update/standard-out-scm-update.route.js b/awx/ui/client/src/standard-out/scm-update/standard-out-scm-update.route.js index 5f9a089231..294518cd7b 100644 --- a/awx/ui/client/src/standard-out/scm-update/standard-out-scm-update.route.js +++ b/awx/ui/client/src/standard-out/scm-update/standard-out-scm-update.route.js @@ -10,7 +10,7 @@ import {templateUrl} from '../../shared/template-url/template-url.factory'; export default { name: 'scmUpdateStdout', - route: '/scm_update/:id/stdout', + route: '/scm_update/:id', templateUrl: templateUrl('standard-out/scm-update/standard-out-scm-update'), controller: 'JobStdoutController', ncyBreadcrumb: { diff --git a/awx/ui/client/src/standard-out/standard-out.block.less b/awx/ui/client/src/standard-out/standard-out.block.less index 7fcd0aa9b6..654439b6ed 100644 --- a/awx/ui/client/src/standard-out/standard-out.block.less +++ b/awx/ui/client/src/standard-out/standard-out.block.less @@ -58,3 +58,18 @@ .StandardOut-statusText { 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; + } +} diff --git a/awx/ui/client/src/standard-out/standard-out.controller.js b/awx/ui/client/src/standard-out/standard-out.controller.js index f95eaab1fb..e0ac1362e4 100644 --- a/awx/ui/client/src/standard-out/standard-out.controller.js +++ b/awx/ui/client/src/standard-out/standard-out.controller.js @@ -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.get() .success(function(data) {