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 c3708bf..1504f97 100644 (file)
--- a/SL/Layout/None.pm
+++ b/SL/Layout/None.pm
@@ -14,31 +14,31 @@ sub javascripts_inline {
     s/y+/yy/gi;
   } $::myconfig{dateformat};
 
-  return $self->render(
+  return $self->presenter->render(
     'layout/javascript_setup',
-    { type => 'js', output => 0, },
+    { 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(@_);
 }
 
 1;