zware/awx
1
0
Fork 0
mirror of https://github.com/ZwareBear/awx.git synced 2026-05-14 15:58:38 -05:00
Code Issues Packages Projects Releases Wiki Activity

Refactor of Project page- breaking status back out into its own column.

Browse Source
This commit is contained in:
Chris Houseknecht
2014-03-27 18:21:01 -04:00
parent 65bb42c2f2
commit 3adefc685f
11 changed files with 133 additions and 163 deletions
Download Patch File Download Diff File Expand all files Collapse all files
awx/ui/static/js/lists/CompletedJobs.js
-6
View File
@@ -40,12 +40,6 @@ angular.module('CompletedJobsDefinition', [])
filter: "date:'MM/dd/yy HH:mm:ss'",
columnClass: "col-md-2 hidden-xs"
},
next_job_run: {
label: 'Next Run',
searchable: false,
filter: "date:'MM/dd/yy HH:mm:ss'",
columnClass: "col-md-2 hidden-sm hidden-xs"
},
type: {
label: 'Type',
ngBind: 'completed_job.type_label',
awx/ui/static/js/lists/Organizations.js
+1 -1
View File
@@ -17,7 +17,7 @@ angular.module('OrganizationListDefinition', [])
selectTitle: 'Add Organizations',
editTitle: 'Organizations',
hover: true,
index: false,
index: true,
fields: {
name: {
awx/ui/static/js/lists/Projects.js
+20 -24
View File
@@ -22,39 +22,35 @@ angular.module('ProjectsListDefinition', [])
hover: true,
fields: {
status: {
label: 'Status',
iconOnly: true,
ngClick: 'showSCMStatus(project.id)',
awToolTip: '{{ project.statusTip }}',
dataPlacement: 'top',
icon: "icon-job-{{ project.statusIcon }}",
columnClass: "col-md-1 col-sm-2 col-xs-3",
nosort: true
},
name: {
key: true,
label: 'Name'
label: 'Name',
columnClass: "col-md-4 col-sm-3 col-xs-3"
},
description: {
label: 'Description',
last_updated: {
label: 'Last Updated',
filter: "date:'MM/dd/yy HH:mm:ss'",
columnClass: "col-md-2 hidden-sm hidden-xs",
excludeModal: true,
columnClass: 'hidden-sm hidden-xs'
searchable: false,
nosort: true
},
scm_type: {
label: 'Type',
searchType: 'select',
searchOptions: [], // will be set by Options call to projects resource
excludeModal: true,
columnClass: 'hidden-sm hidden-xs',
nosort: true
},
status: {
label: 'Status',
ngClick: 'showSCMStatus(project.id)',
awToolTip: 'View details of last SCM Update',
dataPlacement: 'top',
badgeIcon: "{{ 'fa icon-failures-' + project.badge }}",
badgePlacement: 'left',
searchType: 'select',
searchOptions: [], // will be set by Options call to projects resource
excludeModal: true
},
last_updated: {
label: 'Last Updated',
type: 'date',
excludeModal: true,
searchable: false
columnClass: 'col-md-2 hidden-sm hidden-xs'
}
},
@@ -93,7 +89,7 @@ angular.module('ProjectsListDefinition', [])
fieldActions: {
scm_update: {
ngClick: 'SCMUpdate(project.id)',
ngClick: 'SCMUpdate(project.id, $event)',
awToolTip: "{{ project.scm_update_tooltip }}",
ngClass: "project.scm_type_class",
dataPlacement: 'top'
awx/ui/static/js/lists/QueuedJobs.js
-6
View File
@@ -39,12 +39,6 @@ angular.module('QueuedJobsDefinition', [])
filter: "date:'MM/dd/yy HH:mm:ss'",
columnClass: 'col-md-2 hidden-xs'
},
next_job_run: {
label: 'Next Run',
searchable: false,
filter: "date:'MM/dd/yy HH:mm:ss'",
columnClass: "col-md-2 hidden-sm hidden-xs"
},
type: {
label: 'Type',
ngBind: 'queued_job.type_label',
awx/ui/static/js/lists/RunningJobs.js
-6
View File
@@ -39,12 +39,6 @@ angular.module('RunningJobsDefinition', [])
filter: "date:'MM/dd/yy HH:mm:ss'",
columnClass: "col-md-2 hidden-xs"
},
next_job_run: {
label: 'Next Run',
searchable: false,
filter: "date:'MM/dd/yy HH:mm:ss'",
columnClass: "col-md-2 hidden-sm hidden-xs"
},
type: {
label: 'Type',
ngBind: 'running_job.type_label',
awx/ui/static/js/lists/ScheduledJobs.js
+15 -14
View File
@@ -15,7 +15,7 @@ angular.module('ScheduledJobsDefinition', [])
iterator: 'scheduled_job',
editTitle: 'Scheduled Jobs',
'class': 'table-condensed',
index: false,
index: true,
hover: true,
well: false,
@@ -24,27 +24,28 @@ angular.module('ScheduledJobsDefinition', [])
label: 'Next Run',
link: false,
searchable: false,
columnClass: "col-md-2",
columnClass: "col-md-2 hidden-xs",
key: true,
desc: true
},
dtend: {
label: 'Ends On',
searchable: false,
filter: "date:'MM/dd/yy HH:mm:ss'",
columnClass: "col-md-2 hidden-xs"
},
template_name: {
label: 'Name',
columnClass: "col-md-4 col-xs-5",
sourceModel: "template",
sourceField: "name"
},
type: {
label: 'Type',
link: false,
columnClass: "col-md-2 hidden-sm hidden-xs"
},
template_name: {
label: 'Name',
columnClass: "col-md-3 col-xs-5",
sourceModel: "template",
sourceField: "name"
}
/*,
dtend: {
label: 'Ends On',
searchable: false,
filter: "date:'MM/dd/yy HH:mm:ss'",
columnClass: "col-md-2 hidden-xs"
}*/
},
actions: {