diff --git a/awx/ui/client/src/lists/AllJobs.js b/awx/ui/client/src/lists/AllJobs.js index eb15a74991..eb33c23744 100644 --- a/awx/ui/client/src/lists/AllJobs.js +++ b/awx/ui/client/src/lists/AllJobs.js @@ -25,6 +25,14 @@ export default awToolTip: "{{ all_job.status_tip }}", dataPlacement: 'top' }, + name: { + label: 'Name', + columnClass: 'col-lg-3 col-md-3 col-sm-3 col-xs-3', + ngClick: "viewJobLog(all_job.id, all_job.nameHref)", + defaultSearchField: true, + awToolTip: "{{ all_job.name | sanitize }}", + dataPlacement: 'top' + }, status: { label: 'Status', columnClass: 'col-lg-2 col-md-2 col-sm-2 col-xs-3', @@ -45,15 +53,6 @@ export default { name: "Canceled", value: "canceled" } ] }, - finished: { - label: 'Finished', - noLink: true, - searchable: false, - filter: "longDate", - columnClass: "col-lg-2 col-md-2 col-sm-2 hidden-xs", - key: true, - desc: true - }, type: { label: 'Type', ngBind: 'all_job.type_label', @@ -64,13 +63,14 @@ export default searchType: 'select', searchOptions: [] // populated via GetChoices() in controller }, - name: { - label: 'Name', - columnClass: 'col-lg-3 col-md-3 col-sm-3 col-xs-3', - ngClick: "viewJobLog(all_job.id, all_job.nameHref)", - defaultSearchField: true, - awToolTip: "{{ all_job.name | sanitize }}", - dataPlacement: 'top' + finished: { + label: 'Finished', + noLink: true, + searchable: false, + filter: "longDate", + columnClass: "col-lg-2 col-md-2 col-sm-2 hidden-xs", + key: true, + desc: true }, failed: { label: 'Job failed?', diff --git a/awx/ui/client/src/lists/JobTemplates.js b/awx/ui/client/src/lists/JobTemplates.js index fb1245d83d..9f2117787c 100644 --- a/awx/ui/client/src/lists/JobTemplates.js +++ b/awx/ui/client/src/lists/JobTemplates.js @@ -23,15 +23,15 @@ export default name: { key: true, label: 'Name', - columnClass: 'col-lg-4 col-md-5 col-sm-6 col-xs-6' + columnClass: 'col-lg-3 col-md-3 col-sm-4 col-xs-4' }, description: { label: 'Description', columnClass: 'col-lg-3 col-md-3 hidden-sm hidden-xs' }, smart_status: { - label: 'Status', - columnClass: 'List-tableCell col-lg-3 col-md-2 col-sm-3 col-xs-3', + label: 'Activity', + columnClass: 'List-tableCell col-lg-4 col-md-4 col-sm-5 col-xs-5', searchable: false, nosort: true, ngInclude: "'/static/partials/job-template-smart-status.html'", diff --git a/awx/ui/client/src/lists/Projects.js b/awx/ui/client/src/lists/Projects.js index 15e3cb3adf..aeeb484fa5 100644 --- a/awx/ui/client/src/lists/Projects.js +++ b/awx/ui/client/src/lists/Projects.js @@ -40,6 +40,13 @@ export default columnClass: "col-lg-5 col-md-4 col-sm-6 col-xs-6", modalColumnClass: 'col-md-8' }, + scm_type: { + label: 'Type', + searchType: 'select', + searchOptions: [], // will be set by Options call to projects resource + excludeModal: true, + columnClass: 'col-lg-2 col-md-2 hidden-sm hidden-xs' + }, last_updated: { label: 'Last Updated', filter: "longDate", @@ -47,13 +54,6 @@ export default excludeModal: true, searchable: false, nosort: true - }, - scm_type: { - label: 'Type', - searchType: 'select', - searchOptions: [], // will be set by Options call to projects resource - excludeModal: true, - columnClass: 'col-lg-2 col-md-2 hidden-sm hidden-xs' } }, diff --git a/awx/ui/client/src/lists/ScheduledJobs.js b/awx/ui/client/src/lists/ScheduledJobs.js index 9b8b1c7c54..82ad8b558a 100644 --- a/awx/ui/client/src/lists/ScheduledJobs.js +++ b/awx/ui/client/src/lists/ScheduledJobs.js @@ -28,13 +28,15 @@ export default searchable: false, nosort: true }, - next_run: { - label: 'Next Run', - noLink: true, - searchable: false, - columnClass: "col-lg-3 col-md-2 col-sm-3 hidden-xs", - filter: "longDate", - key: true + name: { + label: 'Name', + columnClass: 'col-lg-3 col-md-3 col-sm-3 col-xs-5', + sourceModel: 'unified_job_template', + sourceField: 'name', + ngClick: "editSchedule(schedule.id)", + awToolTip: "{{ schedule.nameTip | sanitize}}", + dataPlacement: "top", + defaultSearchField: true }, type: { label: 'Type', @@ -53,16 +55,14 @@ export default { value: 'project', name: 'SCM Update' } ] }, - name: { - label: 'Name', - columnClass: 'col-lg-3 col-md-3 col-sm-3 col-xs-5', - sourceModel: 'unified_job_template', - sourceField: 'name', - ngClick: "editSchedule(schedule.id)", - awToolTip: "{{ schedule.nameTip | sanitize}}", - dataPlacement: "top", - defaultSearchField: true - } + next_run: { + label: 'Next Run', + noLink: true, + searchable: false, + columnClass: "col-lg-3 col-md-2 col-sm-3 hidden-xs", + filter: "longDate", + key: true + }, }, actions: { },