X-Git-Url: http://wagnertech.de/gitweb/gitweb.cgi/kivitendo-erp.git/blobdiff_plain/bbf383bf0e93e42769263af14bdb53737832728a..6dd6719d91cf5a48acb6fb3731f9e143d7a7d83b:/SL/Layout/Javascript.pm diff --git a/SL/Layout/Javascript.pm b/SL/Layout/Javascript.pm index f3a2f0f06..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", { partial => 1, no_output => 1 }, + $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), "");