ActionBar: calling conventions geändert, +check/disabled/confirm

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

diff --git a/SL/Layout/Javascript.pm b/SL/Layout/Javascript.pm
index 366e0d7c9464322b1b11f7b0883cff77236e1a9f..76728ef917cb6e8f05d7e1cae7ab9ec66c96c4dd 100644 (file)
--- a/SL/Layout/Javascript.pm
+++ b/SL/Layout/Javascript.pm
@@ -3,6 +3,10 @@ package SL::Layout::Javascript;
 use strict;
 use parent qw(SL::Layout::Base);
 
+use SL::Layout::None;
+use SL::Layout::Top;
+use SL::Layout::Content;
+
 use List::Util qw(max);
 use URI;
 
@@ -10,6 +14,7 @@ sub init_sub_layouts {
   [
     SL::Layout::None->new,
     SL::Layout::Top->new,
+    SL::Layout::Content->new,
   ]
 }
 
@@ -41,25 +46,16 @@ sub pre_content {
   $_[0]->presenter->render("menu/menunew",
     force_ul_width  => 1,
     menu            => $_[0]->menu,
-    icon_path       => sub { my $img = "image/icons/16x16/$_[0].png"; -f $img ? $img : () },
+    icon_path       => sub { my $simg = "image/icons/svg/$_[0].svg";  my $pimg="image/icons/16x16/$_[0].png"; -f $simg ? $simg : ( -f $pimg ? $pimg : ()) },
     max_width       => sub { 10 * max map { length $::locale->text($_->{name}) } @{ $_[0]{children} || [] } },
   );
 }
 
-sub start_content {
-  "<div id='content'>\n";
-}
-
-sub end_content {
-  "</div>\n";
-}
-
 sub stylesheets {
   $_[0]->add_stylesheets(qw(
     dhtmlsuite/menu-item.css
     dhtmlsuite/menu-bar.css
     icons16.css
-    frame_header/header.css
     menu.css
   ));
   $_[0]->SUPER::stylesheets;