X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=bin%2Fmozilla%2Fmenuv3.pl;h=aedb881a26b9918c429a9bcedc4f4ee85cb6004d;hb=840aea131eef33512dccc13184e01affafaafb37;hp=807db3597a592f8d0e9c282c1acc45192ebefa68;hpb=e98e20941b580769e3f4e6e2bcac60a679b7e06b;p=kivitendo-erp.git diff --git a/bin/mozilla/menuv3.pl b/bin/mozilla/menuv3.pl index 807db3597..aedb881a2 100644 --- a/bin/mozilla/menuv3.pl +++ b/bin/mozilla/menuv3.pl @@ -43,7 +43,7 @@ sub display { $form->header(qq||); - print(qq|\n|); + print(qq|\n|); clock_line(); @@ -70,7 +70,10 @@ sub display { sub clock_line { - $login = "[" + $fensterlink="menuv3.pl?login=$form->{login}&password=$form->{password}&path=$form->{path}&action=display"; + $fenster = "["."neues Fenster]"; + + $login = "[Nutzer " . $form->{login} . " - {"path"} @@ -105,62 +108,22 @@ sub clock_line { print qq| - - - - + + + +

[drucken]	\| - . $login . $datum . qq\| -
$fenster [drucken]	+ $login $datum +

|; } @@ -180,29 +143,6 @@ sub acc_menu { return print_menu($menu); } -sub my_length { - my ($s) = @_; - my $len = 0; - my $i; - my $skip = 0; - - for ($i = 0; $i < length($s); $i++) { - my $c = substr($s, $i, 1); - if ($skip && ($c eq ";")) { - $skip = 0; - } elsif ($skip) { - next; - } elsif ($c eq "&") { - $skip = 1; - $len++; - } else { - $len++; - } - } - - return $len; -} - sub print_menu { my ($menu, $parent, $depth) = @_; my $html; @@ -223,26 +163,24 @@ sub print_menu { my $menu_title = $locale->text($item); my $menu_text = $menu_title; - $menu_text =~ s/ /
/ if ($parent && (my_length($menu_text) >= 17)); - my $target = "main_window"; $target = $menu_item->{"target"} if ($menu_item->{"target"}); if ($menu_item->{"submenu"} || !defined($menu_item->{"module"}) || ($menu_item->{"module"} eq "menu.pl")) { - my $h = print_menu($menu, "${parent}${item}", $depth * 1 + 1); + my $h = print_menu($menu, "${parent}${item}", $depth * 1 + 1)."\n"; if (!$parent) { - $html .= qq|

${menu_text}

|; + $html .= qq|

${menu_text}

\n|; } else { - $html .= qq|

\n|; } } else { $html .= qq|

|; $html .= $menu->menuitem_v3(\%myconfig, $form, "${parent}$item", { "title" => $menu_title, "target" => $target }); - $html .= qq|${menu_text}

|; + $html .= qq|${menu_text}\n|; } }