X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=templates%2Fwebpages%2Flayout%2Fjavascript_setup.js;h=2b03f4a2d8ab29f6260edd77788607d2c59c0018;hb=9a14696176033f03c97244f420d93f9c15efed61;hp=40424452b5485d2cb7f2f68bcae21f2733229645;hpb=f8ec31c6cf80a50a5b9ee29bd5847c47d5114bbf;p=kivitendo-erp.git

diff --git a/templates/webpages/layout/javascript_setup.js b/templates/webpages/layout/javascript_setup.js
index 40424452b..2b03f4a2d 100644
--- a/templates/webpages/layout/javascript_setup.js
+++ b/templates/webpages/layout/javascript_setup.js
@@ -1,13 +1,11 @@
-[%- USE T8 %]
+[%- USE LxERP %]
 [%- USE JavaScript %]
+[%- USE JSON %]
+kivi.myconfig = [% JSON.json(MYCONFIG) %];
 $(function() {
-[% IF datefmt %]
-  setupPoints('[% JavaScript.escape(MYCONFIG.numberformat) %]', '[% 'wrongformat' | $T8 %]');
-  setupDateFormat('[% JavaScript.escape(MYCONFIG.dateformat) %]', '[% 'Falsches Datumsformat!' | $T8 %]');
-
   $.datepicker.setDefaults(
-    $.extend({}, $.datepicker.regional['[% JavaScript.escape(MYCONFIG.countrycode) %]'], {
-      dateFormat: '[% JavaScript.escape(datefmt) %]',
+    $.extend({}, $.datepicker.regional[kivi.myconfig.countrycode], {
+      dateFormat: kivi.myconfig.dateformat.replace(/d+/gi, 'dd').replace(/m+/gi, 'mm').replace(/y+/gi, 'yy'),
       showOn: "button",
       showButtonPanel: true,
       changeMonth: true,
@@ -17,14 +15,14 @@ $(function() {
   }));
 
   kivi.setup_formats({
-    numbers: '[% JavaScript.escape(MYCONFIG.numberformat) %]',
-    dates:   '[% JavaScript.escape(MYCONFIG.dateformat) %]'
+    numbers: kivi.myconfig.numberformat,
+    dates:   kivi.myconfig.dateformat,
+    times:   kivi.myconfig.timeformat
   });
 
   kivi.reinit_widgets();
-[% END %]
 
-[% IF ajax_spinner %]
+[%- IF ajax_spinner %]
   $(document).ajaxSend(function() {
     $('#ajax-spinner').show();
   }).ajaxStop(function() {