X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=bin%2Fmozilla%2Fmenu.pl;h=36bdadc3f1e50df8a8aee202f6891facc1fc714c;hb=829f6742c99fdf3b3ef78713c3ce1c1266f67d98;hp=11b68b02d43fd208854bf80ac040c9850b668e61;hpb=73d0071ffe8ca44dcd3686342e78117477063c33;p=kivitendo-erp.git
diff --git a/bin/mozilla/menu.pl b/bin/mozilla/menu.pl
index 11b68b02d..36bdadc3f 100644
--- a/bin/mozilla/menu.pl
+++ b/bin/mozilla/menu.pl
@@ -105,9 +105,8 @@ sub acc_menu {
sub section_menu {
$::lxdebug->enter_sub;
my ($menu, $level) = @_;
-
- # build tiered menus
my @menuorder = $menu->access_control(\%::myconfig, $level);
+
for my $item (@menuorder) {
my $menuitem = $menu->{$item};
my $label = apply { s/.*--// } $item;
@@ -116,85 +115,74 @@ sub section_menu {
my $spacer = $nbsp x (($item =~ s/--/--/g) * 2);
my $label_icon = $level . "--" . $label . ".png";
+ next if $level && $item ne "$level--$label";
+
$label = $::locale->text($label);
$menuitem->{target} ||= "main_window";
my $anchor = $menu->menuitem(\%::myconfig, $::form, $item, $level);
-# next if $menuitem->{HIDDEN};
-
- # 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, valign => 'middle');
+ my $anchor = "";
- if ($menuitem->{submenu}) {
- if ($::form->{level} && $item =~ /^\Q$::form->{level}\E/) {
- my $image = make_image(submenu => 1);
- print "| $spacer$image$label |
\n" if $show;
+ print make_item(a => $anchor, img => $image, label => $label, height => 24);
+ section_menu($menu, $item);
- # remove same level items
- $menu->{$_}{HIDDEN} = 1 for grep /^$item/, @menuorder;
+ } elsif ($menuitem->{submenu}) {
+ my $image = make_image(submenu => 1);
+ if ($mainlevel && $item =~ /^\Q$mainlevel\E/) {
+ print make_item(spacer => $spacer, bold => 1, img => $image, label => $label) if $show;
section_menu($menu, $item);
} else {
- print "| $anchor$label ... |
\n" if $show;
-
- # remove same level items
- $menu->{$_}{HIDDEN} = 1 for grep /^$item/, @menuorder;
+ print make_item(spacer => $spacer, a => $anchor, img => $image, label => $label . ' ...') 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);
+ print make_item(img => $image, a => $anchor, spacer => $spacer, label => $label) if $show;
+ section_menu($menu, $item) if $show && $::form->{$item} && $::form->{level} eq $item;
}
}
$::lxdebug->leave_sub;
}
-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 $is_mobile_browser && $is_mobile_style ? 130
- : $is_lynx_browser ? 240
- : 200;
+sub make_item {
+ my %params = @_;
+ my $anchor = $params{a} || '';
+ my @chunks = multiline($params{label});
+ my $spacer = $params{spacer} || '';
+ my $image = $params{img};
+ my $height = $params{height} || 16;
+ my $a_end = $anchor ? '' : '';
+ my $bold = $params{bold} ? '' : '';
+ my $b_end = $bold ? '' : '';
+ my $hidden_image = make_image(hidden => 1);
+ return join "\n",
+ "| $bold$spacer$anchor$image$chunks[0]$a_end$b_end |
\n",
+ map "| $bold$spacer$hidden_image$anchor$chunks[$_]$a_end$b_end |
\n",
+ 1..$#chunks;
}
-sub _show_images {
- # don't show images in links
- _calc_framesize() != 240;
+# 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 {
@@ -221,6 +209,21 @@ sub make_image {
return "
$padding";
}
+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 $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 {
my ($label, $size) = @_;