From e59fe36d9eb59c79cb0eba03569358f9257c13be Mon Sep 17 00:00:00 2001
From: Florian Schaal <florian@schaal-24.de>
Date: Thu, 07 May 2015 01:50:29 -0400
Subject: [PATCH] Merge branch 'master' of http://git.ispconfig.org/ispconfig/ispconfig3

---
 interface/web/themes/default/assets/javascripts/ispconfig.js |   18 ++++++++++++++++++
 1 files changed, 18 insertions(+), 0 deletions(-)

diff --git a/interface/web/themes/default/assets/javascripts/ispconfig.js b/interface/web/themes/default/assets/javascripts/ispconfig.js
index b68af57..2db94df 100644
--- a/interface/web/themes/default/assets/javascripts/ispconfig.js
+++ b/interface/web/themes/default/assets/javascripts/ispconfig.js
@@ -121,6 +121,24 @@
 			});
 		}
 		
+		$('input[data-input-element="date"]').datetimepicker({
+			'language': 'en', // TODO
+			'todayHighlight': true,
+			'todayBtn': 'linked',
+			'bootcssVer': 3,
+			'fontAwesome': true,
+			'autoclose': true,
+			'minView': 'month'
+		});
+		$('input[data-input-element="datetime"]').datetimepicker({
+			'language': 'en', // TODO
+			'todayHighlight': true,
+			'todayBtn': 'linked',
+			'bootcssVer': 3,
+			'fontAwesome': true,
+			'autoclose': true
+		});
+		
 		ISPConfig.callHook('onAfterContentLoad', {'url': url, 'data': data });
 	},
 

--
Gitblit v1.9.1