Merge branch 'dev'

[kivitendo-erp.git] / SL / Layout / None.pm

diff --git a/SL/Layout/None.pm b/SL/Layout/None.pm
index 25ea916..0a2f6ca 100644 (file)
--- a/SL/Layout/None.pm
+++ b/SL/Layout/None.pm
@@ -3,9 +3,24 @@ 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)  = @_;
+
+  my $datefmt = apply {
+    s/d+/dd/gi;
+    s/m+/mm/gi;
+    s/y+/yy/gi;
+  } $::myconfig{dateformat};
+
+  return $self->render(
+    'layout/javascript_setup',
+    { type => 'js', output => 0, },
+    datefmt      => $datefmt,
+    focus        => $::request->layout->focus,
+    ajax_spinner => 1,
+  );
 }
 
 sub use_javascript {
@@ -27,18 +42,4 @@ sub use_stylesheet {
   $self->SUPER::use_stylesheet(@_);
 }
 
-sub _setup_formats {
-  $::form->parse_html_template('layout/javascript_setup')
-}
-
-sub _setup_focus {
-  if ($::request->{layout}->focus) {
-    return $::form->parse_html_template('layout/focus_setup', {
-      focus => $::request->{layout}->focus,
-    })
-  } else {
-    return ();
-  }
-}
-
 1;