External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-05-10 19:07:36 -02:30
Code Issues Packages Projects Releases Wiki Activity

removed borders that show up on dashboard screen before user logs in

Browse Source
This commit is contained in:
Jared Tabor
2014-07-18 14:38:31 -04:00
parent 48afe188b2
commit dde42b04f2
5 changed files with 16 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
awx/ui/static/js/controllers/Home.js
View File

@@ -15,7 +15,7 @@ function Home($scope, $compile, $routeParams, $rootScope, $location, Wait, Dashb
ClearScope('home'); ClearScope('home');
var buttons, html, e, waitCount, loadedCount; var buttons, html, e, waitCount, loadedCount,borderStyles;
// Add buttons to the top of the Home page. We're using lib/ansible/generator_helpers.js-> Buttons() // Add buttons to the top of the Home page. We're using lib/ansible/generator_helpers.js-> Buttons()
// to build buttons dynamically and insure all styling and icons match the rest of the application. // to build buttons dynamically and insure all styling and icons match the rest of the application.
@@ -75,10 +75,17 @@ function Home($scope, $compile, $routeParams, $rootScope, $location, Wait, Dashb
$scope.removeDashboardReady = $scope.$on('dashboardReady', function (e, data) { $scope.removeDashboardReady = $scope.$on('dashboardReady', function (e, data) {
nv.dev=false; nv.dev=false;
borderStyles = {"border": "1px solid #A9A9A9",
"border-radius": "4px",
"padding": "5px",
"margin-bottom": "15px"};
$('.graph-container').css(borderStyles);
var winHeight = $(window).height(), var winHeight = $(window).height(),
available_height = winHeight - $('#main-menu-container .navbar').outerHeight() - $('#count-container').outerHeight() - 93; available_height = winHeight - $('#main-menu-container .navbar').outerHeight() - $('#count-container').outerHeight() - 120;
$('.graph-container').height(available_height/2); $('.graph-container').height(available_height/2);
// chart.update(); // // chart.update();
DashboardCounts({ DashboardCounts({
scope: $scope, scope: $scope,

2
awx/ui/static/js/widgets/DashboardJobs.js
View File

@@ -122,7 +122,7 @@ angular.module('DashboardJobsWidget', ['RestServices', 'Utilities'])
var docw = $(window).width(), var docw = $(window).width(),
box_height, available_height, search_row, page_row, height, header, row_height; box_height, available_height, search_row, page_row, height, header, row_height;
available_height = Math.floor(($(window).height() - $('#main-menu-container .navbar').outerHeight() - $('#count-container').outerHeight() - 93)/2); available_height = Math.floor(($(window).height() - $('#main-menu-container .navbar').outerHeight() - $('#count-container').outerHeight() - 120)/2);
$('.dashboard-jobs-list-container').height(available_height); $('.dashboard-jobs-list-container').height(available_height);
search_row = Math.max($('.search-row:eq(0)').outerHeight(), 50); search_row = Math.max($('.search-row:eq(0)').outerHeight(), 50);
page_row = Math.max($('.page-row:eq(0)').outerHeight(), 33); page_row = Math.max($('.page-row:eq(0)').outerHeight(), 33);

4
awx/ui/static/js/widgets/HostPieChart.js
View File

@@ -34,8 +34,6 @@ angular.module('HostPieChartWidget', ['RestServices', 'Utilities'])
// html += "</div>\n"; // html += "</div>\n";
element = angular.element(document.getElementById(target)); element = angular.element(document.getElementById(target));
element.html(html); element.html(html);
$compile(element)(scope); $compile(element)(scope);
@@ -89,7 +87,7 @@ angular.module('HostPieChartWidget', ['RestServices', 'Utilities'])
} }
else{ else{
winHeight = $(window).height(); winHeight = $(window).height();
available_height = winHeight - $('#main-menu-container .navbar').outerHeight() - $('#count-container').outerHeight() - 93; available_height = winHeight - $('#main-menu-container .navbar').outerHeight() - $('#count-container').outerHeight() - 120;
$('.graph-container:eq(1)').height(available_height/2); $('.graph-container:eq(1)').height(available_height/2);
$('.host-pie-chart svg').replaceWith('<canvas id="circlecanvas" width="100" height="100"></canvas>'); $('.host-pie-chart svg').replaceWith('<canvas id="circlecanvas" width="100" height="100"></canvas>');

2
awx/ui/static/js/widgets/JobStatusGraph.js
View File

@@ -176,7 +176,7 @@ angular.module('JobStatusGraphWidget', ['RestServices', 'Utilities'])
} }
else{ else{
var winHeight = $(window).height(), var winHeight = $(window).height(),
available_height = winHeight - $('#main-menu-container .navbar').outerHeight() - $('#count-container').outerHeight() - 93; available_height = winHeight - $('#main-menu-container .navbar').outerHeight() - $('#count-container').outerHeight() - 120;
$('.graph-container').height(available_height/2); $('.graph-container').height(available_height/2);
chart.update(); chart.update();
} }

4
awx/ui/static/less/new-dashboard.less
View File

@@ -30,15 +30,17 @@
border: 1px solid @grey; border: 1px solid @grey;
border-radius: 4px; border-radius: 4px;
padding: 5px; padding: 5px;
} }
/*
.graph-container{ .graph-container{
border: 1px solid @grey; border: 1px solid @grey;
border-radius: 4px; border-radius: 4px;
padding: 5px; padding: 5px;
margin-bottom: 15px; margin-bottom: 15px;
} }
due to the login screen showing on top of the dashboard, we're hiding the borders until after the user logs in*/
.count-container{ .count-container{
border: 1px solid @grey; border: 1px solid @grey;
border-radius: 4px; border-radius: 4px;