Merge branch 'after-262'

[kivitendo-erp.git] / bin / mozilla / menuv3.pl

diff --git a/bin/mozilla/menuv3.pl b/bin/mozilla/menuv3.pl
index a2b2669..d444b75 100644 (file)
--- a/bin/mozilla/menuv3.pl
+++ b/bin/mozilla/menuv3.pl
@@ -32,18 +32,26 @@
 #
 #######################################################################
 
-$menufile = "menu.ini";
 use SL::Menu;
+use URI;
+
+use strict;
 
 1;
 
 # end of main
 
 sub display {
+  my $form     = $main::form;
+
   $form->header(qq|<link rel="stylesheet" href="css/menuv3.css?id=" type="text/css">|);
 
-  $form->{date} = clock_line();
-  $form->{menu} = acc_menu();
+  $form->{date}     = clock_line();
+  $form->{menu}     = acc_menu();
+  my $callback      = $form->unescape($form->{callback});
+  $callback         = URI->new($callback)->rel($callback) if $callback;
+  $callback         = "login.pl?action=company_logo"      if $callback =~ /^(\.\/)?$/;
+  $form->{callback} = $callback;
 
   print $form->parse_html_template("menu/menuv3");
 
@@ -72,11 +80,12 @@ sub clock_line {
 }
 
 sub acc_menu {
-  $locale = Locale->new($language, "menu");
+  my $form     = $main::form;
+  my %myconfig = %main::myconfig;
 
-  $mainlevel = $form->{level};
+  my $mainlevel = $form->{level};
   $mainlevel =~ s/\Q$mainlevel\E--//g;
-  my $menu = new Menu "$menufile";
+  my $menu = Menu->new("menu.ini");
 
   $| = 1;
 
@@ -85,6 +94,10 @@ sub acc_menu {
 
 sub print_menu {
   my ($menu, $parent, $depth) = @_;
+
+  my $form     = $main::form;
+  my %myconfig = %main::myconfig;
+
   my $html;
 
   die if ($depth * 1 > 5);
@@ -100,7 +113,7 @@ sub print_menu {
     next if (($item eq "") || ($item =~ /--/));
 
     my $menu_item = $menu->{"${parent}${item}"};
-    my $menu_title = $locale->text($item);
+    my $menu_title = $::locale->text($item);
     my $menu_text = $menu_title;
 
     my $target = "main_window";
@@ -116,11 +129,7 @@ sub print_menu {
         $html .= qq|<li><div class="x">${menu_text}</div><ul>${h}</ul></li>\n|;
       }
     } else {
-      if ($depth>1) {
-      $html .= qq|<li class='sub'>|;
-      } else {
       $html .= qq|<li>|;
-      }
       $html .= $menu->menuitem_v3(\%myconfig, $form, "${parent}$item",
                                   { "title" => $menu_title,
                                     "target" => $target });