X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=bin%2Fmozilla%2Fmenu.pl;h=3f439db89327f343cfaa522cfb12e59d853a5c45;hb=5f3f953a9ccd519fbe329d65a49239271b1b520d;hp=11b68b02d43fd208854bf80ac040c9850b668e61;hpb=cc36154c636685cace5747b664142bab83ddf701;p=kivitendo-erp.git diff --git a/bin/mozilla/menu.pl b/bin/mozilla/menu.pl index 11b68b02d..3f439db89 100644 --- a/bin/mozilla/menu.pl +++ b/bin/mozilla/menu.pl @@ -59,11 +59,11 @@ sub display { $callback = "login.pl?action=company_logo" if $callback =~ /^(\.\/)?$/; my $framesize = _calc_framesize(); - $::form->header; + $::form->header(doctype => 'frameset'); print qq| - + @@ -82,22 +82,15 @@ sub acc_menu { $::lxdebug->enter_sub; my $framesize = _calc_framesize() - 2; - my $menu = Menu->new($::menufile); + my $menu = Menu->new("menu.ini"); $mainlevel = $::form->{level}; - $::form->{title} = $::locale->text('Lx-Office'); + $::form->{title} = $::locale->text('kivitendo'); $::form->header; - print qq| - - -

\n\n|; - - section_menu($menu); - - print qq|

- - -|; + print $::form->parse_html_template('menu/menu', { + framesize => $framesize, + sections => [ section_menu($menu) ], + }); $::lxdebug->leave_sub; } @@ -105,9 +98,9 @@ sub acc_menu { sub section_menu { $::lxdebug->enter_sub; my ($menu, $level) = @_; - - # build tiered menus my @menuorder = $menu->access_control(\%::myconfig, $level); + my @items; + for my $item (@menuorder) { my $menuitem = $menu->{$item}; my $label = apply { s/.*--// } $item; @@ -116,85 +109,92 @@ sub section_menu { my $spacer = $nbsp x (($item =~ s/--/--/g) * 2); my $label_icon = $level . "--" . $label . ".png"; - $label = $::locale->text($label); + next if $level && $item ne "$level--$label"; - $menuitem->{target} ||= "main_window"; + $label = $::locale->text($label); - my $anchor = $menu->menuitem(\%::myconfig, $::form, $item, $level); + menuitem($menuitem); -# next if $menuitem->{HIDDEN}; + my $anchor = $menuitem->{href}; - # multi line hack, sschoeling jul06 - # if a label is too long, try to split it at whitespaces, then join it to chunks of less - # than 20 chars and store it in an array. - # use this array later instead of the -ed label - my @chunks; - my $l = 20; - for (split / /, $label) { - $l += length $_; - if ($l < 20) { - $chunks[-1] .= " $_"; - } else { - $l = length $_; - push @chunks, $_; - } - } - # end multi line + if (!$level) { # toplevel + my $ml_ = $::form->escape($ml); + my $image = make_image(icon => $item . '.png', size => 24, label => $label); + my $anchor = "menu.pl?action=acc_menu&level=$ml_"; - if ($menuitem->{submenu}) { - if ($::form->{level} && $item =~ /^\Q$::form->{level}\E/) { - my $image = make_image(submenu => 1); - print "$spacer$image$label\n" if $show; + push @items, make_item(href => $anchor, img => $image, label => $label, height => 24, class => 'menu'); + push @items, section_menu($menu, $item); - # remove same level items - $menu->{$_}{HIDDEN} = 1 for grep /^$item/, @menuorder; - section_menu($menu, $item); + } elsif ($menuitem->{submenu}) { + my $image = make_image(submenu => 1); + if ($mainlevel && $item =~ /^\Q$mainlevel\E/) { + push @items, make_item(target => $menuitem->{target}, spacer => $spacer, bold => 1, img => $image, label => $label, class => 'submenu') if $show; + push @items, section_menu($menu, $item); } else { - print "$anchor$label ...\n" if $show; - - # remove same level items - $menu->{$_}{HIDDEN} = 1 for grep /^$item/, @menuorder; + push @items, make_item(spacer => $spacer, href => $anchor, img => $image, label => $label . ' ...', class => 'submenu') if $show; } } elsif ($menuitem->{module}) { - if ($::form->{$item} && $::form->{level} eq $item) { - my $image = make_image(); - print qq|$spacer$image$anchor$label\n| if $show; - - # remove same level items - $menu->{$_}{HIDDEN} = 1 for grep /^$item/, @menuorder; - section_menu($menu, $item); - } elsif ($show) { - my $image1 = make_image(label => $label, icon => $label_icon); - my $image2 = make_image(hidden => 1); - print "$spacer$anchor$image1$chunks[0]\n"; - print "$spacer$image2$anchor$chunks[$_]\n" - for 1..$#chunks; - } - } else { - my $ml_ = $::form->escape($ml); - my $image = make_image(icon => $item . '.png', size => 24, label => $label, valign => 'middle'); - my $anchor = ""; - print qq|$anchor$image$label\n|; - - §ion_menu($menu, $item); + my $image = make_image(label => $label, icon => $label_icon); + push @items, make_item(target => $menuitem->{target}, img => $image, href => $anchor, spacer => $spacer, label => $label, class => 'item') if $show; + push @items, section_menu($menu, $item) if $show && $::form->{$item} && $::form->{level} eq $item; } } $::lxdebug->leave_sub; + return @items; } -sub _calc_framesize { - my $is_lynx_browser = $ENV{HTTP_USER_AGENT} =~ /links/i; - my $is_mobile_browser = $ENV{HTTP_USER_AGENT} =~ /mobile/i; - my $is_mobile_style = $::form->{stylesheet} =~ /mobile/i; +sub menuitem { + my ($item, $name) = @_; + + $item->{module} ||= $::form->{script}; + $item->{action} ||= "section_menu"; + $item->{target} ||= "main_window"; + $item->{href} ||= "$item->{module}?action=$item->{action}"; + + # add other params + foreach my $key (keys %$item) { + next if $key =~ /target|module|action|href/; + $item->{href} .= "&" . $::form->escape($key, 1) . "="; + my ($value, $conf) = split(/=/, $item->{$key}, 2); + $value = $::myconfig{$value} . "/$conf" if ($conf); + $item->{href} .= $::form->escape($value, 1); + } - return $is_mobile_browser && $is_mobile_style ? 130 - : $is_lynx_browser ? 240 - : 200; +# my $str = ""; +# +# return $str; } -sub _show_images { - # don't show images in links - _calc_framesize() != 240; +sub make_item { + my %params = @_; + $params{a} ||= ''; + $params{spacer} ||= ''; + $params{height} ||= 16; + + return { + %params, + chunks => [ multiline($params{label}) ], + }; +} + +# multi line hack, sschoeling jul06 +# if a label is too long, try to split it at whitespaces, then join it to chunks of less +# than 20 chars and store it in an array. +# use this array later instead of the -ed label +sub multiline { + my ($label) = @_; + my @chunks; + my $l = 20; + for (split / /, $label) { + $l += length $_; + if ($l < 20) { + $chunks[-1] .= " $_"; + } else { + $l = length $_; + push @chunks, $_; + } + } + return @chunks; } sub make_image { @@ -202,23 +202,35 @@ sub make_image { my $label = $params{label}; my $icon = $params{icon}; - my $hidden = $params{hidden}; my $size = $params{size} || 16; - my $valign = $params{valign} || 'text-top'; return unless _show_images(); my $icon_found = $icon && -f _icon_path($icon, $size); my $image_url = $icon_found ? _icon_path($icon, $size) : "image/unterpunkt.png"; - my $style = $hidden ? "visibility:hidden" : "vertical-align:$valign"; - my $width = $hidden ? "width='$size'" : ''; + my $width = $icon_found ? $size : 24; + + my $padding = $size == 16 && $icon_found ? $nbsp x 2 + : $size == 24 ? $nbsp + : ''; + + return "

$padding"; +} - my $padding = $size == 16 && $icon_found || $hidden ? $nbsp x 2 - : $size == 24 ? $nbsp - : ''; +sub _calc_framesize { + my $is_lynx_browser = $ENV{HTTP_USER_AGENT} =~ /links/i; + my $is_mobile_browser = $ENV{HTTP_USER_AGENT} =~ /mobile/i; + my $is_mobile_style = $::form->{stylesheet} =~ /mobile/i; - return "

$padding"; + return $is_mobile_browser && $is_mobile_style ? 130 + : $is_lynx_browser ? 240 + : 200; +} + +sub _show_images { + # don't show images in links + _calc_framesize() != 240; } sub _icon_path {