Merge pull request #717 from mabashian/reorder-list-columns

Changed column order on a few tables to match up with spec

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: {
+            finished: {
-                label: 'Name',
+                label: 'Finished',
-                columnClass: 'col-lg-3 col-md-3 col-sm-3 col-xs-3',
+                noLink: true,
-                ngClick: "viewJobLog(all_job.id, all_job.nameHref)",
+                searchable: false,
-                defaultSearchField: true,
+                filter: "longDate",
-                awToolTip: "{{ all_job.name | sanitize }}",
+                columnClass: "col-lg-2 col-md-2 col-sm-2 hidden-xs",
-                dataPlacement: 'top'
+                key: true,
+                desc: true
             },
             failed: {
                 label: 'Job failed?',

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',
+              label: 'Activity',
-              columnClass: 'List-tableCell col-lg-3 col-md-2 col-sm-3 col-xs-3',
+              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'",

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'
             }
         },
 

awx/ui/client/src/lists/ScheduledJobs.js

@@ -28,13 +28,15 @@ export default
                 searchable: false,
                 nosort: true
             },
-            next_run: {
+            name: {
-                label: 'Next Run',
+                label: 'Name',
-                noLink: true,
+                columnClass: 'col-lg-3 col-md-3 col-sm-3 col-xs-5',
-                searchable: false,
+                sourceModel: 'unified_job_template',
-                columnClass: "col-lg-3 col-md-2 col-sm-3 hidden-xs",
+                sourceField: 'name',
-                filter: "longDate",
+                ngClick: "editSchedule(schedule.id)",
-                key: true
+                awToolTip: "{{ schedule.nameTip | sanitize}}",
+                dataPlacement: "top",
+                defaultSearchField: true
             },
             type: {
                 label: 'Type',
@@ -53,16 +55,14 @@ export default
                     { value: 'project', name: 'SCM Update' }
                 ]
             },
-            name: {
+            next_run: {
-                label: 'Name',
+                label: 'Next Run',
-                columnClass: 'col-lg-3 col-md-3 col-sm-3 col-xs-5',
+                noLink: true,
-                sourceModel: 'unified_job_template',
+                searchable: false,
-                sourceField: 'name',
+                columnClass: "col-lg-3 col-md-2 col-sm-3 hidden-xs",
-                ngClick: "editSchedule(schedule.id)",
+                filter: "longDate",
-                awToolTip: "{{ schedule.nameTip | sanitize}}",
+                key: true
-                dataPlacement: "top",
+            },
-                defaultSearchField: true
-            }
         },
 
         actions: { },