From: Holger Lindemann Date: Wed, 22 Jul 2009 12:18:17 +0000 (+0200) Subject: Altes CSS menü wg. Probleme mit Opera wiederhergestellt. X-Git-Tag: release-2.6.1beta1~349^2 X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=b1513dccda2a40beac493ae20cf3985af2e88473;p=kivitendo-erp.git Altes CSS menü wg. Probleme mit Opera wiederhergestellt. Neues CSS als menuv4 eingefügt. JS alt entfernt. --- diff --git a/bin/mozilla/admin.pl b/bin/mozilla/admin.pl old mode 100644 new mode 100755 diff --git a/bin/mozilla/login.pl b/bin/mozilla/login.pl index 0d49058ae..22c37bf85 100644 --- a/bin/mozilla/login.pl +++ b/bin/mozilla/login.pl @@ -137,7 +137,7 @@ sub login { my %style_to_script_map = ( 'v3' => 'v3', 'neu' => 'new', - 'js' => 'js', + 'v4' => 'v4', 'xml' => 'XML', ); diff --git a/bin/mozilla/menuv3.pl b/bin/mozilla/menuv3.pl index a2b266908..c2fef5df4 100644 --- a/bin/mozilla/menuv3.pl +++ b/bin/mozilla/menuv3.pl @@ -116,11 +116,7 @@ sub print_menu { $html .= qq|
  • ${menu_text}
    • \n|; } } else { - if ($depth>1) { - $html .= qq|
  • |; - } else { $html .= qq|
  • |; - } $html .= $menu->menuitem_v3(\%myconfig, $form, "${parent}$item", { "title" => $menu_title, "target" => $target }); diff --git a/bin/mozilla/menuv4.pl b/bin/mozilla/menuv4.pl new file mode 100644 index 000000000..ffe3e82c9 --- /dev/null +++ b/bin/mozilla/menuv4.pl @@ -0,0 +1,132 @@ +#===================================================================== +# LX-Office ERP +# Copyright (C) 2004 +# Based on SQL-Ledger Version 2.1.9 +# Web http://www.lx-office.org +# +###################################################################### +# SQL-Ledger Accounting +# Copyright (c) 1998-2002 +# +# Author: Dieter Simader +# Email: dsimader@sql-ledger.org +# Web: http://www.sql-ledger.org +# +# Contributors: Christopher Browne +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +####################################################################### +# +# thre frame layout with refractured menu +# +####################################################################### + +$menufile = "menu.ini"; +use SL::Menu; + +1; + +# end of main + +sub display { + $form->header(qq||); + + $form->{date} = clock_line(); + $form->{menu} = acc_menu(); + + print $form->parse_html_template("menu/menuv4"); + +} + +sub clock_line { + my ($Sekunden, $Minuten, $Stunden, $Monatstag, $Monat, + $Jahr, $Wochentag, $Jahrestag, $Sommerzeit) + = localtime(time); + $Monat += 1; + $Jahrestag += 1; + $Monat = $Monat < 10 ? $Monat = "0" . $Monat : $Monat; + $Monatstag = $Monatstag < 10 ? $Monatstag = "0" . $Monatstag : $Monatstag; + $Jahr += 1900; + my @Wochentage = ("Sonntag", "Montag", "Dienstag", "Mittwoch", + "Donnerstag", "Freitag", "Samstag"); + my @Monatsnamen = ("", "Januar", "Februar", "März", + "April", "Mai", "Juni", "Juli", + "August", "September", "Oktober", "November", + "Dezember"); + return + $Wochentage[$Wochentag] . ", der " + . $Monatstag . "." + . $Monat . "." + . $Jahr . " - "; +} + +sub acc_menu { + $locale = Locale->new($language, "menu"); + + $mainlevel = $form->{level}; + $mainlevel =~ s/\Q$mainlevel\E--//g; + my $menu = new Menu "$menufile"; + + $| = 1; + + return print_menu($menu); +} + +sub print_menu { + my ($menu, $parent, $depth) = @_; + my $html; + + die if ($depth * 1 > 5); + + my @menuorder; + + @menuorder = $menu->access_control(\%myconfig, $parent); + + $parent .= "--" if ($parent); + + foreach my $item (@menuorder) { + substr($item, 0, length($parent)) = ""; + next if (($item eq "") || ($item =~ /--/)); + + my $menu_item = $menu->{"${parent}${item}"}; + my $menu_title = $locale->text($item); + my $menu_text = $menu_title; + + my $target = "main_window"; + $target = $menu_item->{"target"} if ($menu_item->{"target"}); + + if ($menu_item->{"submenu"} || !defined($menu_item->{"module"}) || + ($menu_item->{"module"} eq "menu.pl")) { + + my $h = print_menu($menu, "${parent}${item}", $depth * 1 + 1)."\n"; + if (!$parent) { + $html .= qq|\n|; + } else { + $html .= qq|
  • ${menu_text}
    • \n|; + } + } else { + if ($depth>1) { + $html .= qq|
  • |; + } else { + $html .= qq|
  • |; + } + $html .= $menu->menuitem_v3(\%myconfig, $form, "${parent}$item", + { "title" => $menu_title, + "target" => $target }); + $html .= qq|${menu_text}
    • \n|; + } + } + + return $html; +} diff --git a/css/menuv3.css b/css/menuv3.css index 4068de338..ae7ef33ff 100644 --- a/css/menuv3.css +++ b/css/menuv3.css @@ -22,15 +22,9 @@ margin:0; padding:1px 0 1px 3px; } -#menu h2:before { - content:" "; -} -#menu h2:after { - content:" "; -} #menu h2 { color:#fff; -padding:2 15px +padding:0 5px; } #menu a, #menu a:visited, #menu div.x, #menu div.x:visited { @@ -42,6 +36,7 @@ padding-right:10px; #menu a { background:#eee; } + #menu div.x, #menu div.x:visited { background:#eee url(../image/right.gif) no-repeat right; } @@ -61,6 +56,7 @@ list-style:none; margin:0; padding:0; float:left; +min-width:7em; } #menu li { @@ -69,12 +65,6 @@ float:none; border:0; } -li.sub { -position:relativ; -left:-25px; -top:-3px; -} - /* IE6 spacing bug fix,
  • s without a bottom border get spaced to far * correction: the bug will change the height of the parent element! this will also cause the whole menu to grow * so the only method to get this pile of crap going is to add a bottom border to the
  • s, where the enclosing