Merge branch 'b-3.6.1' of ../kivitendo-erp_20220811

[kivitendo-erp.git] / SL / Layout / V3.pm

diff --git a/SL/Layout/V3.pm b/SL/Layout/V3.pm
index 4769c40..dc39a18 100644 (file)
--- a/SL/Layout/V3.pm
+++ b/SL/Layout/V3.pm
@@ -2,39 +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 init_sub_layouts {
-  [ SL::Layout::None->new ]
+  $_[0]->sub_layouts_by_name->{actionbar} = SL::Layout::ActionBar->new;
+
+  [
+    SL::Layout::None->new,
+    SL::Layout::Top->new,
+    SL::Layout::CssMenu->new,
+    $_[0]->sub_layouts_by_name->{actionbar},
+    SL::Layout::Content->new,
+  ]
 }
 
-sub pre_content {
-  &render;
-}
-
-sub start_content {
-  "<div id='content'>\n";
-}
-
-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;