X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FLayout%2FNone.pm;h=4a02d652a81ff3c609c887e564e4b6b88c76eb93;hb=13b7b660f564981597f58ba4e6d0b4cc5b7c6d1a;hp=cb3bdb91ab0ba22ddd350a3efaf98c4447f63016;hpb=87e65e6c1cc64bfb2d73b6914ed2ef136861dd42;p=kivitendo-erp.git

diff --git a/SL/Layout/None.pm b/SL/Layout/None.pm
index cb3bdb91a..4a02d652a 100644
--- a/SL/Layout/None.pm
+++ b/SL/Layout/None.pm
@@ -6,8 +6,21 @@ use parent qw(SL::Layout::Base);
 use List::MoreUtils qw(apply);
 
 sub javascripts_inline {
-  _setup_formats(),
-  _setup_focus(),
+  my ($self)  = @_;
+
+  my $datefmt = apply {
+    s/d+/dd/gi;
+    s/m+/mm/gi;
+    s/y+/yy/gi;
+  } $::myconfig{dateformat};
+
+  return $self->presenter->render(
+    'layout/javascript_setup',
+    { type => 'js' },
+    datefmt      => $datefmt,
+    focus        => $::request->layout->focus,
+    ajax_spinner => 1,
+  );
 }
 
 sub use_javascript {
@@ -16,7 +29,9 @@ sub use_javascript {
     js/jquery.js
     js/common.js
     js/namespace.js
+    js/kivi.js
   ),
+  'js/locale/'. $::myconfig{countrycode} .'.js',
   $self->SUPER::use_javascript(@_);
 }
 
@@ -29,24 +44,4 @@ sub use_stylesheet {
   $self->SUPER::use_stylesheet(@_);
 }
 
-sub _setup_formats {
-  my $datefmt = apply {
-    s/d+/dd/gi;
-    s/m+/mm/gi;
-    s/y+/yy/gi;
-  } $::myconfig{dateformat};
-
-  $::form->parse_html_template('layout/javascript_setup', { datefmt => $datefmt });
-}
-
-sub _setup_focus {
-  if ($::request->{layout}->focus) {
-    return $::form->parse_html_template('layout/focus_setup', {
-      focus => $::request->{layout}->focus,
-    })
-  } else {
-    return ();
-  }
-}
-
 1;