From 8f5a197cd9420c2d2dc15f7aa83b32d665c8bef3 Mon Sep 17 00:00:00 2001 From: John Mitchell Date: Fri, 9 Oct 2015 14:33:47 -0400 Subject: [PATCH] made standard out container fixed height on standard out views --- awx/ui/client/src/controllers/JobStdout.js | 2 + awx/ui/client/src/partials/job_stdout.html | 63 ++-- .../client/src/partials/job_stdout_adhoc.html | 338 +++++++++--------- 3 files changed, 198 insertions(+), 205 deletions(-) diff --git a/awx/ui/client/src/controllers/JobStdout.js b/awx/ui/client/src/controllers/JobStdout.js index dee0dc1cce..3e1857be44 100644 --- a/awx/ui/client/src/controllers/JobStdout.js +++ b/awx/ui/client/src/controllers/JobStdout.js @@ -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 var jobType = $location.path().replace(/^\//, '').split('/')[0]; Rest.setUrl(GetBasePath(jobType) + job_id + '/'); diff --git a/awx/ui/client/src/partials/job_stdout.html b/awx/ui/client/src/partials/job_stdout.html index 9ec92b6706..7175cc8608 100644 --- a/awx/ui/client/src/partials/job_stdout.html +++ b/awx/ui/client/src/partials/job_stdout.html @@ -1,47 +1,42 @@
-
- -
-
+
+
+ + +
+
+
{{ job.status }}
+
-
-
-
{{ job.status }}
-
-
-
-
-
+
+

Standard Output Download

-
-
-
-
- -
-
-
-
-
-
- -
+
+
+
+
+
+
diff --git a/awx/ui/client/src/partials/job_stdout_adhoc.html b/awx/ui/client/src/partials/job_stdout_adhoc.html index 52b51565d7..f4e48648f8 100644 --- a/awx/ui/client/src/partials/job_stdout_adhoc.html +++ b/awx/ui/client/src/partials/job_stdout_adhoc.html @@ -1,187 +1,183 @@
- -
-