diff --git a/awx/ui/static/js/controllers/Jobs.js b/awx/ui/static/js/controllers/Jobs.js index 550b1ff168..7679037891 100644 --- a/awx/ui/static/js/controllers/Jobs.js +++ b/awx/ui/static/js/controllers/Jobs.js @@ -217,7 +217,13 @@ export function JobsListController ($rootScope, $log, $scope, $compile, $routePa page_row = Math.max($('.page-row:eq(0)').outerHeight(), 33); header = Math.max($('#completed_jobs_table thead').height(), 24); height = Math.floor(available_height / 2) - header - page_row - search_row - 30; - row_height = (docw < 1350) ? 47 : 44; + // row_height = (docw < 1350) ? 47 : 44; + if(docw < 1424){ + row_height = 55; + } + else { + row_height = 44; + } max_rows = Math.floor(height / row_height); max_rows = (max_rows < 5) ? 5 : max_rows; } diff --git a/awx/ui/static/js/controllers/Portal.js b/awx/ui/static/js/controllers/Portal.js index 3af4a2234d..ecf4e0f38a 100644 --- a/awx/ui/static/js/controllers/Portal.js +++ b/awx/ui/static/js/controllers/Portal.js @@ -117,7 +117,7 @@ export function PortalController($scope, $compile, $routeParams, $rootScope, $lo row_height = 47; } else { - row_height = 35; + row_height = 44; } max_rows = Math.floor(height / row_height); if (max_rows < 5){ diff --git a/awx/ui/static/js/lists/CompletedJobs.js b/awx/ui/static/js/lists/CompletedJobs.js index dc7fc5e3a0..266656dc0d 100644 --- a/awx/ui/static/js/lists/CompletedJobs.js +++ b/awx/ui/static/js/lists/CompletedJobs.js @@ -100,12 +100,12 @@ export default awToolTip: 'Delete the job', dataPlacement: 'top' }, - job_details: { - mode: 'all', - ngClick: "viewJobLog(completed_job.id)", - awToolTip: 'View job details', - dataPlacement: 'top' - }, + // job_details: { + // mode: 'all', + // ngClick: "viewJobLog(completed_job.id)", + // awToolTip: 'View job details', + // dataPlacement: 'top' + // }, stdout: { mode: 'all', href: '/#/jobs/{{ completed_job.id }}/stdout', diff --git a/awx/ui/static/js/lists/CustomInventory.js b/awx/ui/static/js/lists/CustomInventory.js index bba175035a..03c993c646 100644 --- a/awx/ui/static/js/lists/CustomInventory.js +++ b/awx/ui/static/js/lists/CustomInventory.js @@ -40,7 +40,7 @@ export default sourceModel: 'organization', sourceField: 'name', excludeModal: true, - columnClass: 'col-md-4 hidden-sm hidden-xs' + columnClass: 'col-md-3 hidden-sm hidden-xs' } }, @@ -61,7 +61,6 @@ export default awToolTip: 'Edit credential', dataPlacement: 'top' }, - "delete": { ngClick: "deleteCustomInv(source_script.id, source_script.name)", icon: 'fa-trash', diff --git a/awx/ui/static/js/lists/Jobs.js b/awx/ui/static/js/lists/Jobs.js index 2ab9b557ed..f2a7ca1631 100644 --- a/awx/ui/static/js/lists/Jobs.js +++ b/awx/ui/static/js/lists/Jobs.js @@ -102,12 +102,12 @@ export default dataPlacement: 'top', ngShow: "job.status != 'running'" }, - job_details: { - mode: 'all', - ngClick: "viewJobLog(job.id)", - awToolTip: 'View job details', - dataPlacement: 'top' - }, + // job_details: { + // mode: 'all', + // ngClick: "viewJobLog(job.id)", + // awToolTip: 'View job details', + // dataPlacement: 'top' + // }, stdout: { mode: 'all', href: '/#/jobs/{{ job.id }}/stdout', diff --git a/awx/ui/static/js/lists/QueuedJobs.js b/awx/ui/static/js/lists/QueuedJobs.js index c47d12f393..91e0cf99e5 100644 --- a/awx/ui/static/js/lists/QueuedJobs.js +++ b/awx/ui/static/js/lists/QueuedJobs.js @@ -84,12 +84,12 @@ export default awToolTip: 'Cancel the job', dataPlacement: 'top' }, - job_details: { - mode: 'all', - ngClick: "viewJobLog(queued_job.id)", - awToolTip: 'View job details', - dataPlacement: 'top', - ngShow: "queued_job.type == 'job'" - } + // job_details: { + // mode: 'all', + // ngClick: "viewJobLog(queued_job.id)", + // awToolTip: 'View job details', + // dataPlacement: 'top', + // ngShow: "queued_job.type == 'job'" + // } } }); diff --git a/awx/ui/static/js/lists/RunningJobs.js b/awx/ui/static/js/lists/RunningJobs.js index 81951cb114..d5dd3c4c73 100644 --- a/awx/ui/static/js/lists/RunningJobs.js +++ b/awx/ui/static/js/lists/RunningJobs.js @@ -85,12 +85,12 @@ export default awToolTip: 'Cancel the job', dataPlacement: 'top' }, - job_details: { - mode: 'all', - ngClick: "viewJobLog(running_job.id)", - awToolTip: 'View job details', - dataPlacement: 'top' - }, + // job_details: { + // mode: 'all', + // ngClick: "viewJobLog(running_job.id)", + // awToolTip: 'View job details', + // dataPlacement: 'top' + // }, stdout: { mode: 'all', href: '/#/jobs/{{ running_job.id }}/stdout', diff --git a/awx/ui/static/js/widgets/DashboardJobs.js b/awx/ui/static/js/widgets/DashboardJobs.js index ac6621a0e9..6f3a90ebf6 100644 --- a/awx/ui/static/js/widgets/DashboardJobs.js +++ b/awx/ui/static/js/widgets/DashboardJobs.js @@ -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){ diff --git a/awx/ui/static/js/widgets/PortalJobs.js b/awx/ui/static/js/widgets/PortalJobs.js index b51a388a7d..0fc0277f2e 100644 --- a/awx/ui/static/js/widgets/PortalJobs.js +++ b/awx/ui/static/js/widgets/PortalJobs.js @@ -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){ diff --git a/awx/ui/static/partials/home.html b/awx/ui/static/partials/home.html index 421c2c2b6d..bdf99f1476 100644 --- a/awx/ui/static/partials/home.html +++ b/awx/ui/static/partials/home.html @@ -30,20 +30,20 @@
-
+
-
+
-
-
+
+