X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FLayout%2FV3.pm;h=dc39a18871165be25429c2e4f25fa83373f2897f;hb=53593baa211863fbf66540cf1bcc36c8fb37257f;hp=78b498e97b4448abfa1da8e59aa25e569cf96803;hpb=b6fd15a8dc44f9b09d5a2bce766cda14b87c6e13;p=kivitendo-erp.git

diff --git a/SL/Layout/V3.pm b/SL/Layout/V3.pm
index 78b498e97..dc39a1887 100644
--- a/SL/Layout/V3.pm
+++ b/SL/Layout/V3.pm
@@ -2,47 +2,24 @@ package SL::Layout::V3;
 
 use strict;
 use parent qw(SL::Layout::Base);
-use SL::Layout::Css;
 
-use URI;
+use SL::Layout::None;
+use SL::Layout::Top;
+use SL::Layout::CssMenu;
+use SL::Layout::ActionBar;
+use SL::Layout::Content;
 
-sub new {
-  my ($class, @slurp) = @_;
+sub init_sub_layouts {
+  $_[0]->sub_layouts_by_name->{actionbar} = SL::Layout::ActionBar->new;
 
-  my $self = $class->SUPER::new(@slurp);
-
-  $self->add_sub_layouts([
+  [
     SL::Layout::None->new,
-  ]);
-
-  $self;
-}
-
-sub pre_content {
-  &render;
-}
-
-sub start_content {
-  "<div id='content'>\n";
+    SL::Layout::Top->new,
+    SL::Layout::CssMenu->new,
+    $_[0]->sub_layouts_by_name->{actionbar},
+    SL::Layout::Content->new,
+  ]
 }
 
-sub end_content {
-  "</div>\n";
-}
-
-sub render {
-  my ($self) = @_;
-
-  my $callback            = $::form->unescape($::form->{callback});
-  $callback               = URI->new($callback)->rel($callback) if $callback;
-  $callback               = "login.pl?action=company_logo"      if $callback =~ /^(\.\/)?$/;
-
-  $self->SUPER::render('menu/menuv3', { no_menu => 1, no_output => 1 },
-    force_ul_width => 1,
-    date           => $self->clock_line,
-    menu           => $self->print_menu,
-    callback       => $callback,
-  );
-}
 
 1;