X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FLayout%2FV3.pm;h=f37eea49c79e616700d8541fe645deb70d8af14e;hb=85c4af4a97e002a6ec7804c7fb28d3c4c0972398;hp=713764f6051e3b63aa2d57f3e55ae35c92b1cb7e;hpb=2a5e8973583d3e6dec80d291124bcee9baaf781e;p=kivitendo-erp.git
diff --git a/SL/Layout/V3.pm b/SL/Layout/V3.pm
index 713764f60..f37eea49c 100644
--- a/SL/Layout/V3.pm
+++ b/SL/Layout/V3.pm
@@ -87,18 +87,20 @@ sub menuitem_v3 {
$action = $menuitem->{action};
}
- my $level = $::form->escape($item);
+ my $level = $::form->escape($item);
- my $str = qq|escape($menuitem->{target}) . '"' : '';
+ my $str = qq|{href}|;
- @vars = qw(module target href);
+ $main::lxdebug->leave_sub();
+ return $str . $menuitem->{href} . '">';
}
- map { delete $menuitem->{$_} } @vars;
+ $str .= qq|$module?action=| . $::form->escape($action) . qq|&level=| . $::form->escape($level);
+
+ map { delete $menuitem->{$_} } qw(module action target href);
# add other params
foreach my $key (keys %{ $menuitem }) {
@@ -130,7 +132,7 @@ sub init_sub_layouts {
sub use_stylesheet {
my $self = shift;
qw(
- frame_header/header.css
+ icons16.css frame_header/header.css
),
$self->SUPER::use_stylesheet(@_);
}
@@ -144,7 +146,7 @@ sub use_javascript {
}
sub pre_content {
- &render;
+ $_[0]->render;
}
sub start_content {
@@ -162,7 +164,7 @@ sub render {
$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 },
+ $self->presenter->render('menu/menuv3',
force_ul_width => 1,
date => $self->clock_line,
menu => $self->print_menu,