X-Git-Url: http://wagnertech.de/gitweb/gitweb.cgi/mfinanz.git/blobdiff_plain/95ecb4289e58990f441f0273182c55f45f26bfb6..de8868c:/bin/mozilla/menu.pl

diff --git a/bin/mozilla/menu.pl b/bin/mozilla/menu.pl
index ac5ba0020..791095739 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|
 <frameset rows="28px,*" cols="*" framespacing="0" frameborder="0">
-  <frame  src="kopf.pl" name="kopf"  scrolling="NO">
+  <frame  src="controller.pl?action=FrameHeader/header" scrolling="NO">
   <frameset cols="$framesize,*" framespacing="0" frameborder="0" border="0" id="menuframe" name="menuframe">
     <frame src="$::form->{script}?action=acc_menu" name="acc_menu"  scrolling="auto" noresize marginwidth="0">
     <frame src="$callback" name="main_window" scrolling="auto">
@@ -82,7 +82,7 @@ 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->header;
@@ -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 &nbsp;-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 = "<a href='menu.pl?action=acc_menu&level=$ml_' class='nohover' title='$label'>";
 
-    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;
+      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 "<tr><td>$anchor$label&nbsp;...</a></td></tr>\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 . '&nbsp;...') if $show;
       }
     } 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;
-
-        # 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;
-      }
-    } 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);
+      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       ? '</a>' : '';
+  my $bold   = $params{bold} ?  '<b>' : '';
+  my $b_end  = $bold         ? '</b>' : '';
+  my $hidden_image = make_image(hidden => 1);
+  return join "\n",
+        "<tr><td class='hover' height='$height'>$bold$spacer$anchor$image$chunks[0]$a_end$b_end</td></tr>\n",
+    map "<tr style='vertical-align:top'><td class='hover'>$bold$spacer$hidden_image$anchor$chunks[$_]$a_end$b_end</td></tr>\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 &nbsp;-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 "<img src='$image_url' border='0' style='$style' title='$label' $width>$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) = @_;