Merge branch 'master' of github.com:kivitendo/kivitendo-erp

[mfinanz.git] / SL / Layout / None.pm

diff --git a/SL/Layout/None.pm b/SL/Layout/None.pm
index 57b9966696ea06fce8fc848db2609e49327f67b2..971ef857a00980edd8855d44b13d1890a4d2f643 100644 (file)
--- a/SL/Layout/None.pm
+++ b/SL/Layout/None.pm
@@ -3,25 +3,45 @@ package SL::Layout::None;
 use strict;
 use parent qw(SL::Layout::Base);
 
 use strict;
 use parent qw(SL::Layout::Base);
 

+use List::MoreUtils qw(apply);
+

 sub javascripts_inline {
 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 _setup_formats {
-  $::form->parse_html_template('generic/javascript_setup')
+sub use_javascript {
+  my $self = shift;
+  qw(
+    js/jquery.js
+    js/common.js
+    js/namespace.js
+    js/kivi.js
+  ),
+  'js/locale/'. $::myconfig{countrycode} .'.js',
+  $self->SUPER::use_javascript(@_);

 }
 
 }
 

-sub _setup_focus {
-  if ($::request->{layout}->focus || $::form->{fokus}) {
-    return $::form->parse_html_template('generic/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;
 }
 
 1;