diff --git a/awx/ui/static/js/widgets/DashboardCounts.js b/awx/ui/static/js/widgets/DashboardCounts.js index 4cc240562c..2b28bc85e3 100644 --- a/awx/ui/static/js/widgets/DashboardCounts.js +++ b/awx/ui/static/js/widgets/DashboardCounts.js @@ -19,53 +19,53 @@ angular.module('DashboardCountsWidget', ['RestServices', 'Utilities']) dashboard = params.dashboard, html, element; - html = "
\n"; - html += "\n"; - html += "\n"; - html += "\n"; - html += "\n"; - html += "\n"; - html += "\n"; - html += "\n"; - html += "\n"; - html += "\n"; - html += "\n"; + // html = "
\n"; + // html += "
" + dashboard.hosts.total+""+dashboard.hosts.failed+""+dashboard.inventories.total+""+dashboard.inventories.inventory_failed+""+dashboard.projects.total+""+dashboard.projects.failed+""+dashboard.users.total+"
\n"; + // html += "\n"; + // html += "\n"; + // html += "\n"; + // html += "\n"; + // html += "\n"; + // html += "\n"; + // html += "\n"; + // html += "\n"; + // html += "\n"; - html += "\n"; - html += "\n"; - html += "\n"; - html += "\n"; - html += "\n"; - html += "\n"; - html += "\n"; - html += "\n"; - html += "\n"; - html += "
" + dashboard.hosts.total+""+dashboard.hosts.failed+""+dashboard.inventories.total+""+dashboard.inventories.inventory_failed+""+dashboard.projects.total+""+dashboard.projects.failed+""+dashboard.users.total+"
HostsFailed HostsInventoriesInventory Sync FailuresProjectsProject Sync FailuresUsers
\n"; - html += "
\n"; + // html += "\n"; + // html += "Hosts\n"; + // html += "Failed Hosts\n"; + // html += "Inventories\n"; + // html += "Inventory Sync Failures\n"; + // html += "Projects\n"; + // html += "Project Sync Failures\n"; + // html += "Users\n"; + // html += "\n"; + // html += "\n"; + // html += "\n"; - // html = "
\n"; + html = "
\n"; - // html = "
\n"; - // html += "\n"; - // html += "\n"; - // html += "\n"; - // html += "\n"; - // html += "\n"; - // html += "\n"; - // html += "\n"; + html = "
\n"; + html += "\n"; + html += "\n"; + html += "\n"; + html += "\n"; + html += "\n"; + html += "
"+dashboard.projects.failed+"
Project Sync Failure
\n"; + // html += "\n"; + html += "
\n"; + + // html += "
\n"; + // html += "
Hosts
\n"; + // html += "
Failed Hosts
\n"; + // html += "
Inventories
\n"; + // html += "
Inventory Sync Failures
\n"; + // html += "
Projects
\n"; + // html += "
Project Sync Failures
\n"; + // // html += "
Users
\n"; // html += "
\n"; - - // html = "
\n"; - // html += "
Hosts
\n"; - // html += "
Failed Hosts
\n"; - // html += "
Inventories
\n"; - // html += "
Inventory Sync Failures
\n"; - // html += "
Projects
\n"; - // html += "
Project Sync Failures
\n"; - // html += "
Users
\n"; - // html += "
\n"; - // html += "
\n"; + html += "
\n"; // html = "
\n"; diff --git a/awx/ui/static/js/widgets/DashboardJobs.js b/awx/ui/static/js/widgets/DashboardJobs.js index eef3478ff0..c346de1c3a 100644 --- a/awx/ui/static/js/widgets/DashboardJobs.js +++ b/awx/ui/static/js/widgets/DashboardJobs.js @@ -19,7 +19,7 @@ angular.module('DashboardJobsWidget', ['RestServices', 'Utilities']) listCount = 0, jobs_scope = scope.$new(true), scheduled_scope = scope.$new(true), - max_rows, + max_rows=10, html, e; html = ''; diff --git a/awx/ui/static/js/widgets/JobStatusGraph.js b/awx/ui/static/js/widgets/JobStatusGraph.js index 313b62d0da..450ccf7c94 100644 --- a/awx/ui/static/js/widgets/JobStatusGraph.js +++ b/awx/ui/static/js/widgets/JobStatusGraph.js @@ -16,7 +16,7 @@ angular.module('JobStatusGraphWidget', ['RestServices', 'Utilities']) var scope = params.scope, target = params.target, - //dashboard = params.dashboard, + dashboard = params.dashboard, html, element; @@ -69,7 +69,7 @@ angular.module('JobStatusGraphWidget', ['RestServices', 'Utilities']) function makeJobStatusGraph(){ d3.json("static/js/jobstatusdata.json",function(error,data) { - + // d3.json(dashboard.graphs, function(error,data) { data.map(function(series) { series.values = series.values.map(function(d) { return {x: d[0], y: d[1] }; }); return series; diff --git a/awx/ui/static/less/new-dashboard.less b/awx/ui/static/less/new-dashboard.less index 9f26ffed9e..a063ad36e6 100644 --- a/awx/ui/static/less/new-dashboard.less +++ b/awx/ui/static/less/new-dashboard.less @@ -43,7 +43,8 @@ .count-container{ border: 1px solid @grey; border-radius: 4px; - padding: 5px; + margin-left: 0px; + margin-right: 0px; margin-bottom: 15px; } .carousel-control.left, .carousel-control.right { diff --git a/awx/ui/static/partials/home.html b/awx/ui/static/partials/home.html index ef1f4a7a65..7c115bab46 100644 --- a/awx/ui/static/partials/home.html +++ b/awx/ui/static/partials/home.html @@ -9,7 +9,7 @@ -->
-
+