X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FLayout%2FJavascript.pm;h=5615ce9576def35aed5d95410161a313cebf4b46;hb=45659209a7151609c68e28281fe06407076cea5f;hp=c63b1f7c7ac0a031095f72113c7d391d6e7f2511;hpb=7647d46acbc2a8253c0afeac5c706c3eb76995d5;p=kivitendo-erp.git diff --git a/SL/Layout/Javascript.pm b/SL/Layout/Javascript.pm index c63b1f7c7..5615ce957 100644 --- a/SL/Layout/Javascript.pm +++ b/SL/Layout/Javascript.pm @@ -34,6 +34,8 @@ 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; @@ -47,7 +49,7 @@ sub display { $callback = URI->new($callback)->rel($callback) if $callback; $callback = "login.pl?action=company_logo" if $callback =~ /^(\.\/)?$/; - $self->render("menu/menunew", { output => 0 }, + $self->presenter->render("menu/menunew", force_ul_width => 1, date => $self->clock_line, menu_items => $self->acc_menu, @@ -110,10 +112,13 @@ sub create_menu { my $form = $main::form; my %myconfig = %main::myconfig; + $depth ||= 0; + die if ($depth * 1 > 5); my @menuorder = $menu->access_control(\%myconfig, $parent); $parent .= "--" if ($parent); + $parent ||= ''; foreach my $name (@menuorder) { substr($name, 0, length($parent), "");