diff --git a/awx/ui/static/js/controllers/Home.js b/awx/ui/static/js/controllers/Home.js index 761a3d3f3c..d7201daa72 100644 --- a/awx/ui/static/js/controllers/Home.js +++ b/awx/ui/static/js/controllers/Home.js @@ -72,6 +72,13 @@ function Home($scope, $compile, $routeParams, $rootScope, $location, Wait, Dashb $scope.removeDashboardReady(); } $scope.removeDashboardReady = $scope.$on('dashboardReady', function (e, data) { + nv.dev=false; + + var winHeight = $(window).height(), + available_height = winHeight - $('#main-menu-container .navbar').outerHeight() - $('#count-container').outerHeight() - 93; + $('.graph-container').height(available_height/2); + // chart.update(); + DashboardCounts({ scope: $scope, target: 'dash-counts', diff --git a/awx/ui/static/js/widgets/HostGraph.js b/awx/ui/static/js/widgets/HostGraph.js index cd85f2a151..4bc2cf0f60 100644 --- a/awx/ui/static/js/widgets/HostGraph.js +++ b/awx/ui/static/js/widgets/HostGraph.js @@ -19,14 +19,14 @@ angular.module('HostGraphWidget', ['RestServices', 'Utilities']) html, element, url, license; - html = "
\n"; - html +="
\n"; + // html = "
\n"; + html ="
\n"; html += "
Host Count
\n"; html += "
\n"; html +="
\n"; html += "
\n"; - html += "
\n"; + // html += "
\n"; diff --git a/awx/ui/static/js/widgets/HostPieChart.js b/awx/ui/static/js/widgets/HostPieChart.js index 016551f4db..edb8f5460c 100644 --- a/awx/ui/static/js/widgets/HostPieChart.js +++ b/awx/ui/static/js/widgets/HostPieChart.js @@ -22,9 +22,9 @@ angular.module('HostPieChartWidget', ['RestServices', 'Utilities']) html, element, data, canvas, context, winHeight, available_height; - html = "
\n"; + // html = "
\n"; - html +="
\n"; + html ="
\n"; html += "
Host Status
\n"; html += "
\n"; @@ -32,7 +32,7 @@ angular.module('HostPieChartWidget', ['RestServices', 'Utilities']) html += "
\n"; html += "
\n"; - html += "
\n"; + // html += "
\n"; @@ -56,7 +56,7 @@ angular.module('HostPieChartWidget', ['RestServices', 'Utilities']) nv.addGraph(function() { var width = $('.graph-container').width(), // nv.utils.windowSize().width/3, - height = $('.graph-container').height(), //nv.utils.windowSize().height/5, + height = $('.graph-container').height()*0.8, //nv.utils.windowSize().height/5, chart = nv.models.pieChart() .margin({top: 5, right: 75, bottom: 40, left: 85}) .x(function(d) { return d.label; }) diff --git a/awx/ui/static/js/widgets/JobStatusGraph.js b/awx/ui/static/js/widgets/JobStatusGraph.js index 9161adfec3..607d5e8cd4 100644 --- a/awx/ui/static/js/widgets/JobStatusGraph.js +++ b/awx/ui/static/js/widgets/JobStatusGraph.js @@ -21,9 +21,9 @@ angular.module('JobStatusGraphWidget', ['RestServices', 'Utilities']) period="month", job_type="all"; - html = "
\n"; + // html = "
\n"; - html +="
\n"; + html = "
\n"; html += "
Job Status
\n"; // for All Jobs, Past Month html += "
\n"; @@ -62,7 +62,7 @@ angular.module('JobStatusGraphWidget', ['RestServices', 'Utilities']) html += "
\n"; html += "
\n"; - html += "
\n"; + // html += "
\n"; function createGraph(){ diff --git a/awx/ui/static/partials/home.html b/awx/ui/static/partials/home.html index a45520c960..4a1d407f62 100644 --- a/awx/ui/static/partials/home.html +++ b/awx/ui/static/partials/home.html @@ -12,12 +12,12 @@
-
-
+
+
-
+