From 9d5514886a53c29c44b7541264bed7564c3fb978 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Sven=20Sch=C3=B6ling?= Date: Mon, 27 Sep 2010 11:08:30 +0200 Subject: [PATCH] =?utf8?q?Revert=20"Das=20(linksseitige)=20HTML-Men=C3=BC?= =?utf8?q?=20komaptibel=20zum=20Textbrowser=20Links=20gemacht."?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit This reverts commit d2d63d80de28c7356e81eb1143d729e4415cd1b4. Das klappt so nicht. kopf.pl kann durchaus auch alleine aufgerufen werden ohne menu einzubinden, und selbst wenn darf framesize nicht einfach als globale Variable rumlungern. Siehe Dokumentation doc/INSTALL.fcgi (Entwicklungsaspekte) und Doku in SL/Dispatcher.pm Zeile 71. --- bin/mozilla/kopf.pl | 13 ++++--------- bin/mozilla/menu.pl | 34 +++++++++++++--------------------- 2 files changed, 17 insertions(+), 30 deletions(-) diff --git a/bin/mozilla/kopf.pl b/bin/mozilla/kopf.pl index ad0b8171e..ac3935dd4 100644 --- a/bin/mozilla/kopf.pl +++ b/bin/mozilla/kopf.pl @@ -111,24 +111,19 @@ 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 f6305dfb8..115880df9 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,7 +45,6 @@ use URI; my $menufile = "menu.ini"; my $mainlevel; -our $framesize; # end of main @@ -83,7 +82,7 @@ sub acc_menu { my $form = $main::form; my $locale = $main::locale; - $framesize = _calc_framesize(); # how to get it into kopf.pl or vice versa? + my $framesize = _calc_framesize(); # how to get it into kopf.pl or vice versa? $mainlevel = $form->{level}; $mainlevel =~ s/\Q$mainlevel\E--//g; @@ -98,7 +97,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); @@ -200,20 +199,18 @@ sub section_menu { if ($zeige) { if (scalar @chunks <= 1) { print - qq|\n|; } else { @@ -234,12 +231,7 @@ sub section_menu { } else { my $ml_ = $form->escape($ml); print - qq|\n|; + qq|\n|; §ion_menu($menu, $item); print qq|\n|; -- 2.20.1
$spacer| + qq|
$spacer| . $menu->menuitem(\%myconfig, \%$form, $item, $level) ; - - if (-f "image/icons/16x16/$label_icon" && ($framesize ne 240)) - { print - qq|  | } + + if (-f "image/icons/16x16/$label_icon") + { print + qq|  | } else { - if ($framesize ne 240) { - print qq||; - } + print qq||; } - + print qq|$label
- |; - if ($framesize ne 240) { - print qq||; - } - print qq| $label    
 $label