diff --git a/awx/ui/static/js/helpers/Schedules.js b/awx/ui/static/js/helpers/Schedules.js index 6dccddf634..2db4176832 100644 --- a/awx/ui/static/js/helpers/Schedules.js +++ b/awx/ui/static/js/helpers/Schedules.js @@ -11,11 +11,11 @@ angular.module('SchedulesHelper', [ 'Utilities', 'RestServices', 'SchedulesHelper', 'SearchHelper', 'PaginationHelpers', 'ListGenerator', 'ModalDialog', 'GeneratorHelpers']) - + .factory('ShowSchedulerModal', ['Wait', 'CreateDialog', function(Wait, CreateDialog) { return function(params) { // Set modal dimensions based on viewport width - + var buttons, scope = params.scope, callback = params.callback; @@ -73,7 +73,7 @@ angular.module('SchedulesHelper', [ 'Utilities', 'RestServices', 'SchedulesHelpe callback = params.callback, schedule, scheduler, url = GetBasePath('schedules') + id + '/'; - + if (scope.removeDialogReady) { scope.removeDialogReady(); } @@ -230,7 +230,7 @@ angular.module('SchedulesHelper', [ 'Utilities', 'RestServices', 'SchedulesHelpe schedule = (params.schedule) ? params.schedule : {}, callback = params.callback, newSchedule, rrule; - + if (scheduler.isValid()) { Wait('start'); newSchedule = scheduler.getValue(); @@ -277,17 +277,17 @@ angular.module('SchedulesHelper', [ 'Utilities', 'RestServices', 'SchedulesHelpe }]) /** - * Inject the scheduler_dialog.html wherever needed + * Inject the scheduler_dialog.html wherever needed */ .factory('LoadDialogPartial', ['Rest', '$compile', 'ProcessErrors', function(Rest, $compile, ProcessErrors) { return function(params) { - + var scope = params.scope, element_id = params.element_id, callback = params.callback, url; - // Add the schedule_dialog.html partial + // Add the schedule_dialog.html partial url = '/static/partials/schedule_dialog.html'; Rest.setUrl(url); Rest.get() @@ -320,7 +320,7 @@ angular.module('SchedulesHelper', [ 'Utilities', 'RestServices', 'SchedulesHelpe id = params.id, callback = params.callback, url = GetBasePath('schedules') + id +'/'; - + // Perform the update if (scope.removeScheduleFound) { scope.removeScheduleFound(); @@ -538,7 +538,7 @@ angular.module('SchedulesHelper', [ 'Utilities', 'RestServices', 'SchedulesHelpe }]) /** - * + * * Called from a controller to setup the scope for a schedules list * */ @@ -578,7 +578,7 @@ angular.module('SchedulesHelper', [ 'Utilities', 'RestServices', 'SchedulesHelpe id: id, breadCrumbs: false, scope: scope, - searchSize: 'col-lg-4 col-md-6 col-sm-12 col-xs-12', + searchSize: 'col-lg-6 col-md-6 col-sm-6 col-xs-12', showSearch: true }); } diff --git a/awx/ui/static/js/widgets/DashboardJobs.js b/awx/ui/static/js/widgets/DashboardJobs.js index c346de1c3a..49d057bbfc 100644 --- a/awx/ui/static/js/widgets/DashboardJobs.js +++ b/awx/ui/static/js/widgets/DashboardJobs.js @@ -33,7 +33,7 @@ angular.module('DashboardJobsWidget', ['RestServices', 'Utilities']) html += "
\n"; html += "
\n"; html += "
\n"; - html += "
\n"; + html += "
\n"; html += "
\n"; //row html += "
\n"; html += "
\n"; diff --git a/awx/ui/static/less/jobs.less b/awx/ui/static/less/jobs.less index 5e9d1799c8..5938937161 100644 --- a/awx/ui/static/less/jobs.less +++ b/awx/ui/static/less/jobs.less @@ -51,7 +51,7 @@ #schedules_table .name-column, #running_jobs_table .name-column, #queued_jobs_table .name-column, - { + { white-space: nowrap; overflow: hidden; text-overflow: ellipsis; diff --git a/awx/ui/static/less/new-dashboard.less b/awx/ui/static/less/new-dashboard.less index a063ad36e6..aa0421ce9a 100644 --- a/awx/ui/static/less/new-dashboard.less +++ b/awx/ui/static/less/new-dashboard.less @@ -51,6 +51,19 @@ background-image: none } +.dashboard-jobs-list-container { + #jobs_table, + #schedules_table { + table-layout:fixed; + } + #jobs_table .name-column, + #schedules_table .name-column { + white-space: nowrap; + overflow: hidden; + text-overflow: ellipsis; + } +} + @media (min-width: 1024px) { .left-side { padding-right: 7px;