From 005b4d9b8584ba649593fcc81fcd03af1fbb0360 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Sven=20Sch=C3=B6ling?= Date: Thu, 30 Dec 2010 17:46:47 +0100 Subject: [PATCH] =?utf8?q?Revert=20"Men=C3=BC=20refactored=20damit=20keine?= =?utf8?q?=20Icons=20verloren=20gehen."?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit This reverts commit 25b37b7f3ab68650c1d8898b534cac5bdd64c7e5. --- SL/Menu.pm | 2 +- bin/mozilla/menu.pl | 250 +++++++++++++++++++++++++------------------- 2 files changed, 141 insertions(+), 111 deletions(-) diff --git a/SL/Menu.pm b/SL/Menu.pm index ab35fed1a..9dfb85190 100644 --- a/SL/Menu.pm +++ b/SL/Menu.pm @@ -81,7 +81,7 @@ sub menuitem { ? qw(module target href) : qw(module action target href); -# map { delete $self->{$item}{$_} } @vars; + map { delete $self->{$item}{$_} } @vars; # add other params foreach my $key (keys %{ $self->{$item} }) { diff --git a/bin/mozilla/menu.pl b/bin/mozilla/menu.pl index ac5ba0020..ae2d6b746 100644 --- a/bin/mozilla/menu.pl +++ b/bin/mozilla/menu.pl @@ -43,29 +43,28 @@ use SL::Menu; use Data::Dumper; use URI; -use List::MoreUtils qw(apply); - my $menufile = "menu.ini"; -my $nbsp = ' '; my $mainlevel; # end of main sub display { - $::lxdebug->enter_sub; + $main::lxdebug->enter_sub(); + + my $form = $main::form; - my $callback = $::form->unescape($::form->{callback}); + my $callback = $form->unescape($form->{callback}); $callback = URI->new($callback)->rel($callback) if $callback; $callback = "login.pl?action=company_logo" if $callback =~ /^(\.\/)?$/; my $framesize = _calc_framesize(); - $::form->header; + $form->header; print qq| - + @@ -75,111 +74,179 @@ sub display { </HTML> |; - $::lxdebug->leave_sub; + $main::lxdebug->leave_sub(); } sub acc_menu { - $::lxdebug->enter_sub; + $main::lxdebug->enter_sub(); + + my $form = $main::form; + my $locale = $main::locale; + my $framesize = _calc_framesize(); + + $mainlevel = $form->{level}; + $mainlevel =~ s/\Q$mainlevel\E--//g; + my $menu = Menu->new($::menufile); - my $framesize = _calc_framesize() - 2; - my $menu = Menu->new($::menufile); - $mainlevel = $::form->{level}; - $::form->{title} = $::locale->text('Lx-Office'); - $::form->header; + $form->{title} = $locale->text('Lx-Office'); + + $form->header; print qq| <body class="menu"> + +|; + print qq|<div align="left">\n<table width="| + . ($framesize-2) + . qq|" border="0">\n|; -<div align="left">\n<table width="$framesize" border="0">\n|; - - section_menu($menu); + &section_menu($menu); - print qq|</table></div> + print qq|</table></div>|; + print qq| </body> </html> |; - $::lxdebug->leave_sub; + $main::lxdebug->leave_sub(); } sub section_menu { - $::lxdebug->enter_sub; + $main::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; - my $ml = apply { s/--.*// } $item; - my $show = $ml eq $mainlevel; - my $spacer = $nbsp x (($item =~ s/--/--/g) * 2); - my $label_icon = $level . "--" . $label . ".png"; + my $form = $main::form; + my %myconfig = %main::myconfig; + my $locale = $main::locale; + my $is_not_links_browser = $ENV{HTTP_USER_AGENT} =~ /links/i ? 0 : 1; - $label = $::locale->text($label); + my $zeige; - $menuitem->{target} ||= "main_window"; - - my $anchor = $menu->menuitem(\%::myconfig, $::form, $item, $level); - - next if $menuitem->{HIDDEN}; + # build tiered menus + my @menuorder = $menu->access_control(\%myconfig, $level); + while (@menuorder) { + my $item = shift @menuorder; + my $label = $item; + my $ml = $item; + $label =~ s/\Q$level\E--//g; + $ml =~ s/--.*//; + if ($ml eq $mainlevel) { $zeige = 1; } + else { $zeige = 0; } + my $spacer = " " x (($item =~ s/--/--/g) * 2); + $label =~ s/.*--//g; + my $label_icon = $level . "--" . $label . ".png"; + my $mlab = $label; + $label = $locale->text($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 - my @chunks; - my $l = 20; - for (split / /, $label) { - $l += length $_; - if ($l < 20) { - $chunks[-1] .= " $_"; + my @chunks = (); + my ($i,$l) = (-1, 20); + map { + if (($l += length $_) < 20) { + $chunks[$i] .= " $_"; } else { $l = length $_; - push @chunks, $_; + $chunks[++$i] = $_; + } - } + } split / /, $label; + map { s/ / / } @chunks; # end multi line - if ($menuitem->{submenu}) { - if ($::form->{level} && $item =~ /^\Q$::form->{level}\E/) { - my $image = make_image(submenu => 1); - print "<tr><td style='vertical-align:bottom'><b>$spacer$image$label</b></td></tr>\n" if $show; + $label =~ s/ / /g; + $menu->{$item}{target} = "main_window" unless $menu->{$item}{target}; - # remove same level items - $menu->{$_}{HIDDEN} = 1 for grep /^$item/, @menuorder; - section_menu($menu, $item); - } else { - print "<tr><td>$anchor$label ...</a></td></tr>\n" if $show; + if ($menu->{$item}{submenu}) { + $menu->{$item}{$item} = !$form->{$item}; + if ($form->{level} && $item =~ /^\Q$form->{level}\E/) { + + # expand menu + if ($zeige) { + print + qq|<tr><td style='vertical-align:bottom'><b>$spacer<img src="image/unterpunkt.png">$label</b></td></tr>\n|; + } # remove same level items - $menu->{$_}{HIDDEN} = 1 for grep /^$item/, @menuorder; - } - } elsif ($menuitem->{module}) { - if ($::form->{$item} && $::form->{level} eq $item) { - my $image = make_image(); - print qq|<tr><td valign=bottom>$spacer$image$anchor$label</a></td></tr>\n| if $show; + map { shift @menuorder } grep /^$item/, @menuorder; + &section_menu($menu, $item); + } else { + if ($zeige) { + print qq|<tr><td>| + . $menu->menuitem(\%myconfig, \%$form, $item, $level) + . qq|$label ...</a></td></tr>\n|; + } # 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 "<tr><td class='hover' height='16'>$spacer$anchor$image1$chunks[0]</a></td></tr>\n"; - print "<tr style='vertical-align:top'><td class='hover'>$spacer$image2$anchor$chunks[$_]</a></td></tr>\n" - for 1..$#chunks; + map { shift @menuorder } grep /^$item/, @menuorder; } } else { - my $ml_ = $::form->escape($ml); - my $image = make_image(icon => $item . '.png', size => 24, label => $label, valign => 'middle'); - my $anchor = "<a href='menu.pl?action=acc_menu&level=$ml_' class='nohover' title='$label'>"; - print qq|<tr><td class="bg" height="24" align="left" valign="middle">$anchor$image$label</a></td></tr>\n|; - - &section_menu($menu, $item); + if ($menu->{$item}{module}) { + if ($form->{$item} && $form->{level} eq $item) { + $menu->{$item}{$item} = !$form->{$item}; + if ($zeige) { + print + qq|<tr><td valign=bottom>$spacer<img src="image/unterpunkt.png">| + . $menu->menuitem(\%myconfig, \%$form, $item, $level) + . qq|$label</a></td></tr>\n|; + } + + # remove same level items + map { shift @menuorder } grep /^$item/, @menuorder; + &section_menu($menu, $item); + } else { + if ($zeige) { + if (scalar @chunks <= 1) { + print + qq|<tr><td class="hover" height="16" >$spacer| + . $menu->menuitem(\%myconfig, \%$form, $item, $level) ; + + if (-f "image/icons/16x16/$label_icon" && ($is_not_links_browser)) + { print + qq|<img src="image/icons/16x16/$label_icon" border="0" style="vertical-align:text-top" title="| + . $label + . qq|">  | } + else { + if ($is_not_links_browser) { + print qq|<img src="image/unterpunkt.png" border="0" style="vertical-align:text-top">|; + } + } + + print + qq|$label</a></td></tr>\n|; + } else { + my $tmpitem = $menu->menuitem(\%myconfig, \%$form, $item, $level); + print + qq|<tr><td class="hover" height="16" >$spacer<img src="image/unterpunkt.png" style="vertical-align:text-top">| + . $tmpitem + . qq|$chunks[0]</a></td></tr>\n|; + map { + print + qq|<tr style="vertical-align:top""><td class="hover">$spacer<img src="image/unterpunkt.png" style="visibility:hidden; width:24; height=2;">| + . $tmpitem + . qq|$chunks[$_]</a></td></tr>\n|; + } 1..$#chunks; + } + } + } + } else { + my $ml_ = $form->escape($ml); + print + qq|<tr><td class="bg" height="24" align="left" valign="middle"> + <a href="menu.pl?action=acc_menu&level=$ml_" class="nohover" title="$label">|; + if ($is_not_links_browser) { + print qq|<img src="image/icons/24x24/$item.png" border="0" style="vertical-align:middle" title="$label">|; + } + print qq| $label</a>    </td></tr>\n|; + &section_menu($menu, $item); + + print qq|\n|; + } } } - $::lxdebug->leave_sub; + $main::lxdebug->leave_sub(); } sub _calc_framesize { @@ -192,43 +259,6 @@ sub _calc_framesize { : 200; } -sub _show_images { - # don't show images in links - _calc_framesize() != 240; -} - -sub make_image { - my (%params) = @_; - - 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 $padding = $size == 16 && $icon_found || $hidden ? $nbsp x 2 - : $size == 24 ? $nbsp - : ''; - - return "<img src='$image_url' border='0' style='$style' title='$label' $width>$padding"; -} - -sub _icon_path { - my ($label, $size) = @_; - - $size ||= 16; - - return "image/icons/${size}x${size}/$label"; -} - 1; __END__ -- 2.20.1