%::myconfig dem Client javascript zur Verfügung stellen.

diff --git a/templates/webpages/layout/javascript_setup.js b/templates/webpages/layout/javascript_setup.js
index 40424452b5485d2cb7f2f68bcae21f2733229645..79cc654ac41729a38e2bb4b8f2dc69eb99a88910 100644 (file)
--- a/templates/webpages/layout/javascript_setup.js
+++ b/templates/webpages/layout/javascript_setup.js
@@ -1,13 +1,14 @@
 [%- USE T8 %]
 [%- USE JavaScript %]
 [%- USE T8 %]
 [%- USE JavaScript %]

+[%- USE JSON %]
+kivi.myconfig = [% JSON.json(MYCONFIG) %];

 $(function() {
 $(function() {

-[% IF datefmt %]
-  setupPoints('[% JavaScript.escape(MYCONFIG.numberformat) %]', '[% 'wrongformat' | $T8 %]');
-  setupDateFormat('[% JavaScript.escape(MYCONFIG.dateformat) %]', '[% 'Falsches Datumsformat!' | $T8 %]');
+  setupPoints(kivi.myconfig.numberformat, '[% 'wrongformat' | $T8 %]');
+  setupDateFormat(kivi.myconfig.dateformat, '[% 'Falsches Datumsformat!' | $T8 %]');

 
   $.datepicker.setDefaults(
 
   $.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,
       showOn: "button",
       showButtonPanel: true,
       changeMonth: true,


@@ -17,14 +18,13 @@ $(function() {
   }));
 
   kivi.setup_formats({
   }));
 
   kivi.setup_formats({

-    numbers: '[% JavaScript.escape(MYCONFIG.numberformat) %]',
-    dates:   '[% JavaScript.escape(MYCONFIG.dateformat) %]'
+    numbers: kivi.myconfig.numberformat,
+    dates:   kivi.myconfig.dateformat

   });
 
   kivi.reinit_widgets();
   });
 
   kivi.reinit_widgets();

-[% END %]

 
 

-[% IF ajax_spinner %]
+[%- IF ajax_spinner %]

   $(document).ajaxSend(function() {
     $('#ajax-spinner').show();
   }).ajaxStop(function() {
   $(document).ajaxSend(function() {
     $('#ajax-spinner').show();
   }).ajaxStop(function() {