External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-03-26 21:35:01 -02:30
Code Issues Packages Projects Releases Wiki Activity

adjusted row heights on dashboard, jobs, and portal mode.

Browse Source 
adjusted row heights due to change to button font size.
This commit is contained in:
Jared Tabor
2015-04-06 15:33:08 -04:00
parent 96df8a6d37
commit ed3dab91bf
10 changed files with 60 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -135,23 +135,26 @@ angular.module('DashboardJobsWidget', ['RestServices', 'Utilities'])
page_row = Math.max($('.page-row:eq(0)').outerHeight(), 33);
header = Math.max($('#completed_jobs_table thead').height(), 41);
height = Math.floor(available_height) - header - page_row - search_row -30 ;
if (docw < 765 && docw >= 493) {
row_height = 27;
}
else if (docw < 493) {
row_height = 47;
}
else if (docw < 865) {
// if (docw < 765 && docw >= 493) {
// row_height = 27;
// }
if (docw < 480) {
row_height = 87;
}
else if (docw < 925) {
row_height = 67;
else if (docw < 767) {
row_height = 44;
}
else if (docw < 926) {
row_height = 87;
}
else if (docw < 1200) {
row_height = 44;
}
else if (docw < 1415) {
row_height = 47;
row_height = 55;
}
else {
row_height = 27;
row_height = 44;
}
max_rows = Math.floor(height / row_height);
if (max_rows < 5){

10
awx/ui/static/js/widgets/PortalJobs.js
View File

@@ -141,7 +141,7 @@ angular.module('PortalJobsWidget', ['RestServices', 'Utilities'])
$('.portal-container').height(available_height);
search_row = Math.max($('.search-row:eq(0)').outerHeight(), 50);
page_row = Math.max($('.page-row:eq(0)').outerHeight(), 33);
header = 0; //Math.max($('#completed_jobs_table thead').height(), 41);
header = 100; //Math.max($('#completed_jobs_table thead').height(), 41);
height = Math.floor(available_height) - header - page_row - search_row ;
if (docw < 765 && docw >= 493) {
row_height = 27;
@@ -149,17 +149,23 @@ angular.module('PortalJobsWidget', ['RestServices', 'Utilities'])
else if (docw < 493) {
row_height = 47;
}
else if (docw < 768) {
row_height = 44;
}
else if (docw < 865) {
row_height = 87;
}
else if (docw < 925) {
row_height = 67;
}
else if (docw < 992) {
row_height = 55;
}
else if (docw < 1415) {
row_height = 47;
}
else {
row_height = 35;
row_height = 44;
}
max_rows = Math.floor(height / row_height);
if (max_rows < 5){