From: Sven Donath Date: Sun, 26 Sep 2010 21:08:58 +0000 (+0200) Subject: Das (linksseitige) HTML-Menü komaptibel zum Textbrowser Links gemacht. X-Git-Tag: release-2.6.2beta1~121 X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=d2d63d80de28c7356e81eb1143d729e4415cd1b4;p=kivitendo-erp.git Das (linksseitige) HTML-Menü komaptibel zum Textbrowser Links gemacht. Weiterhin werden die Bedienelemente (HTML-Links) im Kopf nur angezeigt, wenn nicht der Browser Links oder Links2 verwendet wird, da sie auf JavaScript basieren und somit keine Funktion hätten. --- diff --git a/bin/mozilla/kopf.pl b/bin/mozilla/kopf.pl index ac3935dd4..ad0b8171e 100644 --- a/bin/mozilla/kopf.pl +++ b/bin/mozilla/kopf.pl @@ -111,19 +111,24 @@ window.onload=clockon my $framesize = _calc_framesize(); # framesize calculation as in menu.pl is only a quick and dirty hack here # it would be better to use a global or config variable +# is there any better solution then the JS-Link for Back? Possibly with the callback variable? + print qq| - - |; + if ($framesize ne 240) { # only show the the links in case of "links" in $ENV{HTTP_USER_AGENT} (see sub _calc_framesize) + print qq| + + |; + } + print qq| diff --git a/bin/mozilla/menu.pl b/bin/mozilla/menu.pl index 115880df9..f6305dfb8 100644 --- a/bin/mozilla/menu.pl +++ b/bin/mozilla/menu.pl @@ -33,7 +33,7 @@ # CHANGE LOG: # DS. 2002-03-25 Created # 2004-12-14 - New Optik - Marco Welter -# 2010-08-19 - Icons for sub entries and one click +# 2010-08-19 - Icons for sub entries and one click # JS switchable HTML-menu - Sven Donath ####################################################################### @@ -45,6 +45,7 @@ use URI; my $menufile = "menu.ini"; my $mainlevel; +our $framesize; # end of main @@ -82,7 +83,7 @@ sub acc_menu { my $form = $main::form; my $locale = $main::locale; - my $framesize = _calc_framesize(); # how to get it into kopf.pl or vice versa? + $framesize = _calc_framesize(); # how to get it into kopf.pl or vice versa? $mainlevel = $form->{level}; $mainlevel =~ s/\Q$mainlevel\E--//g; @@ -97,7 +98,7 @@ sub acc_menu { |; print qq|
\n
+
[| . $locale->text('Menu') . qq|]  [| . $locale->text('New Win/Tab') . qq|]  [| . $locale->text('Print') . qq|]  [| . $locale->text('Back') . qq|]  [| . $locale->text('Fwd') . qq|] - - | . $login . $datum . qq|  
\n|; §ion_menu($menu); @@ -199,18 +200,20 @@ sub section_menu { if ($zeige) { if (scalar @chunks <= 1) { print - qq|\n|; } else { @@ -231,7 +234,12 @@ sub section_menu { } else { my $ml_ = $form->escape($ml); print - qq|\n|; + qq|\n|; §ion_menu($menu, $item); print qq|\n|;
$spacer| + qq|
$spacer| . $menu->menuitem(\%myconfig, \%$form, $item, $level) ; - - if (-f "image/icons/16x16/$label_icon") - { print - qq|  | } + + if (-f "image/icons/16x16/$label_icon" && ($framesize ne 240)) + { print + qq|  | } else { - print qq||; + if ($framesize ne 240) { + print qq||; + } } - + print qq|$label
 $label    
+ |; + if ($framesize ne 240) { + print qq||; + } + print qq| $label