Pulled in angular-scheduler changes.

This commit is contained in:
Chris Houseknecht
2014-04-01 10:03:23 -04:00
parent 2e6457b887
commit 7d168e9fd1
9 changed files with 39 additions and 22 deletions
+3 -3
View File
@@ -23,8 +23,6 @@ angular.module('CompletedJobsDefinition', [])
id: {
label: 'Job ID',
ngClick:"viewJobLog(completed_job.id)",
key: true,
desc: true,
searchType: 'int',
columnClass: 'col-md-1 col-sm-2 col-xs-2'
},
@@ -57,7 +55,9 @@ angular.module('CompletedJobsDefinition', [])
link: false,
searchable: false,
filter: "date:'MM/dd/yy HH:mm:ss'",
columnClass: "col-md-2 hidden-xs"
columnClass: "col-md-2 hidden-xs",
key: true,
desc: true
},
type: {
label: 'Type',
+2 -1
View File
@@ -27,7 +27,8 @@ angular.module('ScheduledJobsDefinition', [])
awTipPlacement: "top",
icon: 'icon-job-{{ schedule.status }}',
iconOnly: true,
ngClick: "toggleSchedule($event, schedule.id)"
ngClick: "toggleSchedule($event, schedule.id)",
searchable: false
},
next_run: {
label: 'Next Run',
+12 -7
View File
@@ -26,20 +26,20 @@ angular.module('SchedulesListDefinition', [])
ngClick: "editSchedule(schedule.id)",
columnClass: "col-md-3 col-sm-3 col-xs-3"
},
dtstart: {
label: 'First Run',
filter: "date:'MM/dd/yy HH:mm:ss'",
searchable: false,
columnClass: "col-md-2 col-sm-3 hidden-xs"
},
next_run: {
label: 'Next Run',
filter: "date:'MM/dd/yy HH:mm:ss'",
searchable: false,
columnClass: "col-md-2 col-sm-3 col-xs-3"
},
dtstart: {
label: 'Start',
filter: "date:'MM/dd/yy HH:mm:ss'",
searchable: false,
columnClass: "col-md-2 col-sm-3 hidden-xs"
},
dtend: {
label: 'End',
label: 'Final Run',
filter: "date:'MM/dd/yy HH:mm:ss'",
searchable: false,
columnClass: "col-md-2 col-sm-3 hidden-xs"
@@ -52,6 +52,11 @@ angular.module('SchedulesListDefinition', [])
ngClick: 'addSchedule()',
awToolTip: 'Add a new schedule'
},
refresh: {
mode: 'all',
awToolTip: "Refresh the page",
ngClick: "refreshJobs()"
},
stream: {
ngClick: "showActivity()",
awToolTip: "View Activity Stream",