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

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

Browse Source
This commit is contained in:
Michael Abashian 2016-01-26 14:11:03 -05:00
parent 2312c8dff8
commit 7684354bac
4 changed files with 43 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
awx/ui/client/src/lists/AllJobs.js
View File

@ -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?',

6
awx/ui/client/src/lists/JobTemplates.js
View File

@ -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'",

14
awx/ui/client/src/lists/Projects.js
View File

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

34
awx/ui/client/src/lists/ScheduledJobs.js
View File

@ -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: { },