X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=templates%2Fwebpages%2Flayout%2Fjavascript_setup.js;h=8deb9e9453cc83162d35dd8649888217c4cd96a8;hb=c4409bf66a835166b3a50c0de9c5bdedbb5b5c69;hp=dc516348ce2e68d81778278634604ddaaccd8424;hpb=440ad8d3e9fada111bf174d11081c910c361acef;p=kivitendo-erp.git

diff --git a/templates/webpages/layout/javascript_setup.js b/templates/webpages/layout/javascript_setup.js
index dc516348c..8deb9e945 100644
--- a/templates/webpages/layout/javascript_setup.js
+++ b/templates/webpages/layout/javascript_setup.js
@@ -1,12 +1,14 @@
-[%- USE T8 %]
+[%- USE LxERP %]
+[%- USE JavaScript %]
+[%- USE JSON %]
+kivi.myconfig = [% JSON.json(MYCONFIG) %];
 $(function() {
-[% IF datefmt %]
-  setupPoints('[% MYCONFIG.numberformat %]', '[% 'wrongformat' | $T8 %]');
-  setupDateFormat('[% MYCONFIG.dateformat %]', '[% 'Falsches Datumsformat!' | $T8 %]');
+  setupPoints(kivi.myconfig.numberformat, '[% JavaScript.escape(LxERP.t8("wrongformat")) %]');
+  setupDateFormat(kivi.myconfig.dateformat, '[% JavaScript.escape(LxERP.t8("Falsches Datumsformat!")) %]');
 
   $.datepicker.setDefaults(
-    $.extend({}, $.datepicker.regional["[% MYCONFIG.countrycode %]"], {
-      dateFormat: "[% 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,
@@ -15,12 +17,14 @@ $(function() {
       buttonImageOnly: true
   }));
 
-  $('.datepicker').each(function() {
-    $(this).datepicker();
+  kivi.setup_formats({
+    numbers: kivi.myconfig.numberformat,
+    dates:   kivi.myconfig.dateformat
   });
-[% END %]
 
-[% IF ajax_spinner %]
+  kivi.reinit_widgets();
+
+[%- IF ajax_spinner %]
   $(document).ajaxSend(function() {
     $('#ajax-spinner').show();
   }).ajaxStop(function() {
@@ -29,8 +33,8 @@ $(function() {
 [% END %]
 });
 
-function fokus() {
 [%- IF focus -%]
+function fokus() {
   $('[% focus %]').focus();
-[%- END -%]
 }
+[%- END -%]