X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FLayout%2FNone.pm;h=1504f97112277205c055d31327745825187ef7fe;hb=53593baa211863fbf66540cf1bcc36c8fb37257f;hp=60b8512fee35df34b4983627b8c801fd5953d922;hpb=56f7991d4910ae12c7d16aab025a2ab242ca5eeb;p=kivitendo-erp.git

diff --git a/SL/Layout/None.pm b/SL/Layout/None.pm
index 60b8512fe..1504f9711 100644
--- a/SL/Layout/None.pm
+++ b/SL/Layout/None.pm
@@ -6,46 +6,39 @@ 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 {
-  my $self = shift;
+sub static_javascripts {
   qw(
-    js/jquery.js
-    js/common.js
+    jquery.js
+    common.js
+    namespace.js
+    jquery-ui.js
+    kivi.js
   ),
-  $self->SUPER::use_javascript(@_);
+  'locale/'. $::myconfig{countrycode} .'.js',
 }
 
-sub use_stylesheet {
-  my $self = shift;
+sub static_stylesheets {
   qw(
     main.css
     menu.css
   ),
-  $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;