X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FLayout%2FNone.pm;h=72d3e75be426734226cf6cda95a6305f564a8392;hb=ed83f90c4d4cd38c50a563c4f7d7075d0254b045;hp=0e65e8acda1481b43b606b26ec63481ad6f19b16;hpb=b18b770e26a958e8d2c29ce48efe6fcbdd78cd17;p=kivitendo-erp.git

diff --git a/SL/Layout/None.pm b/SL/Layout/None.pm
index 0e65e8acd..72d3e75be 100644
--- a/SL/Layout/None.pm
+++ b/SL/Layout/None.pm
@@ -3,32 +3,45 @@ package SL::Layout::None;
 use strict;
 use parent qw(SL::Layout::Base);
 
+use List::MoreUtils qw(apply);
+
 sub javascripts_inline {
-  _setup_formats(),
-  _setup_focus(),
-}
+  my ($self)  = @_;
 
-sub use_javascript {
-  'js/common.js'
-}
+  my $datefmt = apply {
+    s/d+/dd/gi;
+    s/m+/mm/gi;
+    s/y+/yy/gi;
+  } $::myconfig{dateformat};
 
-sub use_stylesheet {
-  'main.css'
+  return $self->presenter->render(
+    'layout/javascript_setup',
+    { type => 'js' },
+    datefmt      => $datefmt,
+    focus        => $::request->layout->focus,
+    ajax_spinner => 1,
+  );
 }
 
-sub _setup_formats {
-  $::form->parse_html_template('layout/javascript_setup')
+sub use_javascript {
+  my $self = shift;
+  qw(
+    jquery.js
+    common.js
+    namespace.js
+    kivi.js
+  ),
+  'locale/'. $::myconfig{countrycode} .'.js',
+  $self->SUPER::use_javascript(@_);
 }
 
-sub _setup_focus {
-  if ($::request->{layout}->focus || $::form->{fokus}) {
-    return $::form->parse_html_template('layout/focus_setup', {
-      focus => $::request->{layout}->focus,
-      fokus => $::form->{fokus},
-    })
-  } else {
-    return ();
-  }
+sub use_stylesheet {
+  my $self = shift;
+  qw(
+    main.css
+    menu.css
+  ),
+  $self->SUPER::use_stylesheet(@_);
 }
 
 1;