azkaban-developers
Details
azkaban-webserver/build.gradle 6(+6 -0)
diff --git a/azkaban-webserver/build.gradle b/azkaban-webserver/build.gradle
index 3b984fc..186751f 100644
--- a/azkaban-webserver/build.gradle
+++ b/azkaban-webserver/build.gradle
@@ -114,6 +114,11 @@ task copyDust(type: Copy, dependsOn: ['dustjs', 'copyWeb']) {
into('build/package/web/js')
}
+task copyJSLibs(type: Copy, dependsOn: ['dustjs', 'copyWeb']) {
+ from('../bower/')
+ into('build/package/web/js')
+}
+
task copyDeps(type: Copy, dependsOn: 'build') {
from(project(':azkaban-common').configurations.compile)
from(configurations.compile)
@@ -136,6 +141,7 @@ task copy(dependsOn: [
'copyLess',
'copyDust',
'copyDeps',
+ 'copyJSLibs',
'copyLibs',
'copyPackage']) {
}
diff --git a/azkaban-webserver/src/web/js/azkaban/view/schedule-panel.js b/azkaban-webserver/src/web/js/azkaban/view/schedule-panel.js
index 13da163..249f1e4 100644
--- a/azkaban-webserver/src/web/js/azkaban/view/schedule-panel.js
+++ b/azkaban-webserver/src/web/js/azkaban/view/schedule-panel.js
@@ -23,8 +23,8 @@ azkaban.SchedulePanelView = Backbone.View.extend({
},
initialize: function(settings) {
- $("#timepicker").datetimepicker({pickDate: false});
- $("#datepicker").datetimepicker({pickTime: false});
+ $("#timepicker").datetimepicker({format: 'LT'});
+ $("#datepicker").datetimepicker({format: 'L'});
},
render: function() {
diff --git a/azkaban-webserver/src/web/js/azkaban/view/schedule-sla.js b/azkaban-webserver/src/web/js/azkaban/view/schedule-sla.js
index cffffca..891e76a 100644
--- a/azkaban-webserver/src/web/js/azkaban/view/schedule-sla.js
+++ b/azkaban-webserver/src/web/js/azkaban/view/schedule-sla.js
@@ -141,14 +141,12 @@ azkaban.ChangeSlaView = Backbone.View.extend({
}
cKill.appendChild(killCheck);
$('.durationpick').datetimepicker({
- pickDate: false,
- use24hours: true
+ format: 'HH:mm'
});
}
}
$('.durationpick').datetimepicker({
- pickDate: false,
- use24hours: true
+ format: 'HH:mm'
});
};
@@ -255,8 +253,7 @@ azkaban.ChangeSlaView = Backbone.View.extend({
cKill.appendChild(killCheck);
$('.durationpick').datetimepicker({
- pickDate: false,
- use24hours: true
+ format: 'HH:mm'
});
return rFlowRule;
},
build.gradle 23(+22 -1)
diff --git a/build.gradle b/build.gradle
index d798528..136421c 100644
--- a/build.gradle
+++ b/build.gradle
@@ -13,6 +13,27 @@ buildscript {
}
}
+plugins {
+ id 'com.craigburke.bower-installer' version '2.5.1'
+}
+
+bower {
+ installBase = 'bower' // <1>
+
+ 'moment'('2.14.1'){
+ source 'min/moment.min.js' >> '/'
+ }
+
+ 'moment-timezone'('0.5.5') {
+ source 'builds/moment-timezone-with-data-2010-2020.min.js' >> '/'
+ }
+
+ 'eonasdan-bootstrap-datetimepicker'('4.0.0') {
+ source 'build/js/*.min.js' >> '/'
+ excludes 'jquery'
+ }
+}
+
apply plugin: 'com.cinnober.gradle.semver-git'
apply plugin: 'idea'
apply plugin: 'distribution'
@@ -145,7 +166,7 @@ migrationDistTar.compression = Compression.GZIP
migrationDistTar.extension = 'tar.gz'
migrationDistZip.dependsOn ':azkaban-common:build', ':azkaban-migration:copy'
-webserverDistTar.dependsOn ':azkaban-common:build', ':azkaban-webserver:copy'
+webserverDistTar.dependsOn ':azkaban-common:build', 'bowerInstall', ':azkaban-webserver:copy'
webserverDistTar.compression = Compression.GZIP
webserverDistTar.extension = 'tar.gz'
webserverDistZip.dependsOn ':azkaban-common:build', ':azkaban-webserver:copy'