Merge branch 'dpt_trans_entfernen'

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

diff --git a/SL/Layout/None.pm b/SL/Layout/None.pm
index 9fbd0aca0f380437b414edf96704f18ab0d0271f..60b8512fee35df34b4983627b8c801fd5953d922 100644 (file)
--- a/SL/Layout/None.pm
+++ b/SL/Layout/None.pm
@@ -3,28 +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(),
 }
 
-sub javascripts {
-  'js/common.js'
+sub use_javascript {
+  my $self = shift;
+  qw(
+    js/jquery.js
+    js/common.js
+  ),
+  $self->SUPER::use_javascript(@_);
 }
 
-sub stylesheets {
-  'main'
+sub use_stylesheet {
+  my $self = shift;
+  qw(
+    main.css
+    menu.css
+  ),
+  $self->SUPER::use_stylesheet(@_);
 }
 
 sub _setup_formats {
-  $::form->parse_html_template('layout/javascript_setup')
+  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 });
 }
 
 sub _setup_focus {
-  if ($::request->{layout}->focus || $::form->{fokus}) {
+  if ($::request->{layout}->focus) {
     return $::form->parse_html_template('layout/focus_setup', {
       focus => $::request->{layout}->focus,
-      fokus => $::form->{fokus},
     })
   } else {
     return ();