Merge branch 'b-3.6.1' of ../kivitendo-erp_20220811

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

diff --git a/SL/Layout/None.pm b/SL/Layout/None.pm
index ffd5bb5..1504f97 100644 (file)
--- a/SL/Layout/None.pm
+++ b/SL/Layout/None.pm
@@ -6,51 +6,39 @@ use parent qw(SL::Layout::Base);
 use List::MoreUtils qw(apply);
 
 sub javascripts_inline {
-  _setup_formats(),
-  _setup_focus(),
-  _setup_ajax_spinner(),
-}
-
-sub use_javascript {
-  my $self = shift;
-  qw(
-    js/jquery.js
-    js/common.js
-  ),
-  $self->SUPER::use_javascript(@_);
-}
+  my ($self)  = @_;
 
-sub use_stylesheet {
-  my $self = shift;
-  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 });
+  return $self->presenter->render(
+    'layout/javascript_setup',
+    { type => 'js' },
+    datefmt      => $datefmt,
+    focus        => $::request->layout->focus,
+    ajax_spinner => 1,
+  );
 }
 
-sub _setup_focus {
-  if ($::request->{layout}->focus) {
-    return $::form->parse_html_template('layout/focus_setup', {
-      focus => $::request->{layout}->focus,
-    })
-  } else {
-    return ();
-  }
+sub static_javascripts {
+  qw(
+    jquery.js
+    common.js
+    namespace.js
+    jquery-ui.js
+    kivi.js
+  ),
+  'locale/'. $::myconfig{countrycode} .'.js',
 }
 
-sub _setup_ajax_spinner {
-  return SL::Presenter->get->render('layout/ajax_spinner_setup', { type => 'js' });
+sub static_stylesheets {
+  qw(
+    main.css
+    menu.css
+  ),
 }
 
 1;