Merge branch 'master' into 'master'

Marius Cramer

2015-06-22 5b3c29178704c047d4020df2ae445ff01c6e1f3a

 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 });
   },