From ad27efa6a3b7e8feea8497c24acebe5bd501156b Mon Sep 17 00:00:00 2001
From: Sven Donath <lxo@dexo.de>
Date: Wed, 18 Aug 2010 13:38:28 +0200
Subject: [PATCH] =?utf8?q?Das=20seitliche=20Men=C3=BC=20hat=20jetzt=20Icon?=
 =?utf8?q?s=20f=C3=BCr=20die=20Unterpunkte,=20welche=20auch=20klickbar=20s?=
 =?utf8?q?ind.=20Damit=20n=C3=A4hert=20sich=20die=20Optik=20an=20das=20XUL?=
 =?utf8?q?-Men=C3=BC=20an,=20ohne=20von=20XUL=20abh=C3=A4ngig=20zu=20sein.?=
 =?utf8?q?=20Evtl.=20mache=20ich=20die=20kleinen=20Icons=20abschaltbar,=20?=
 =?utf8?q?f=C3=BCr=20die,=20die=20das=20so=20haben=20wollen.=20Die=20Icons?=
 =?utf8?q?=20haben=20title-tags,=20die=20mal=20in=20ein=20Hilfe-System=20m?=
 =?utf8?q?=C3=BCnden=20sollen.=20(Baustelle)=20Im=20Gegensatz=20zum=20XUL-?=
 =?utf8?q?Men=C3=BC=20ist=20eine=20durchg=C3=A4ngige=20Bedienung=20mit=20E?=
 =?utf8?q?inzelklick=20m=C3=B6glich.=20Den=20Redirekt=20f=C3=BCr=20den=20A?=
 =?utf8?q?ufruf=20von=20Lx-Office=20mit=20einem=20Nicht-XUL-f=C3=A4higen?=
 =?utf8?q?=20Browser=20und=20aktiviertem=20XUL-Men=C3=BC=20habe=20ich=20au?=
 =?utf8?q?f=20dieses=20HTML-Men=C3=BC=20gelegt,=20weil=20alles=20andere=20?=
 =?utf8?q?nicht=20kompatibel=20genug=20ist.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 bin/mozilla/menu.pl | 33 ++++++++++++++++++++++-----------
 xslt/xulmenu.xsl    |  4 ++--
 2 files changed, 24 insertions(+), 13 deletions(-)

diff --git a/bin/mozilla/menu.pl b/bin/mozilla/menu.pl
index b53f132aa..92fa43fa2 100644
--- a/bin/mozilla/menu.pl
+++ b/bin/mozilla/menu.pl
@@ -86,7 +86,7 @@ sub acc_menu {
   $mainlevel =~ s/\Q$mainlevel\E--//g;
   my $menu = Menu->new($::menufile);
 
-  $form->{title} = $locale->text('Accounting Menu');
+  $form->{title} = $locale->text('Lx-Office');
 
   $form->header;
 
@@ -96,7 +96,7 @@ sub acc_menu {
 |;
   print qq|<div align="left">\n<table width="|
     . $framesize
-    . qq|" border=0>\n|;
+    . qq|" border="0">\n|;
 
   &section_menu($menu);
 
@@ -129,9 +129,9 @@ sub section_menu {
     $ml    =~ s/--.*//;
     if ($ml eq $mainlevel) { $zeige = 1; }
     else { $zeige = 0; }
-    my $spacer = "&nbsp;" x (($item =~ s/--/--/g) * 1);
+    my $spacer = "&nbsp;" x (($item =~ s/--/--/g) * 2);
     $label =~ s/.*--//g;
-    my $label_icon = $label . ".gif";
+    my $label_icon = $level . "--" . $label . ".png";
     my $mlab       = $label;
     $label      = $locale->text($label);
 
@@ -197,18 +197,29 @@ sub section_menu {
           if ($zeige) {
             if (scalar @chunks <= 1) {
               print
-                qq|<tr><td class="hover" height="13" >$spacer<img src="image/unterpunkt.png"  style="vertical-align:text-top">|
-                . $menu->menuitem(\%myconfig, \%$form, $item, $level)
-                . qq|$label</a></td></tr>\n|;
+                qq|<tr><td class="hover" height="16" >$spacer| 
+                . $menu->menuitem(\%myconfig, \%$form, $item, $level) ;
+              
+            if (-f "image/icons/16x16/$label_icon")
+             { print 
+                qq|<img src="image/icons/16x16/$label_icon" border="0" style="vertical-align:text-top" title="| 
+                . $locale->text($item) 
+                . qq|">&nbsp;&nbsp;| } 
+            else {
+			   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="13" >$spacer<img src="image/unterpunkt.png"  style="vertical-align:text-top">|
+                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:23; height=2;">|
+                  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;
@@ -218,10 +229,10 @@ sub section_menu {
       } 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""><img src="image/icons/24x24/$item.png" border="0" style="vertical-align:middle" titel="Hallo Welt">&nbsp;$label</a>&nbsp;&nbsp;&nbsp;&nbsp;</td></tr>\n|;
+          qq|<tr><td class="bg" height="24" align="left" valign="middle"><a href="menu.pl?action=acc_menu&level=$ml_" class="nohover""><img src="image/icons/24x24/$item.png" border="0" style="vertical-align:middle" title="| . $locale->text("Help Menu $item") . qq|">&nbsp;$label</a>&nbsp;&nbsp;&nbsp;&nbsp;</td></tr>\n|;
         &section_menu($menu, $item);
 
-        #print qq|<br>\n|;
+        print qq|\n|;
       }
     }
   }
diff --git a/xslt/xulmenu.xsl b/xslt/xulmenu.xsl
index 3427c7b14..243d30ef8 100644
--- a/xslt/xulmenu.xsl
+++ b/xslt/xulmenu.xsl
@@ -18,11 +18,11 @@
 <xsl:template match="doc" mode="html">
   <html xmlns="http://www.w3.org/1999/xhtml">
     <head>
-      <meta http-equiv="refresh" content="2;url=menuv3.pl?action=display"/>
+      <meta http-equiv="refresh" content="2;url=menu.pl?action=display"/>
     </head>
     <body>
 Ihr Browser unterstuetzt kein XUL!<br/>
-wenn die automatische weiterleitung nicht funktioniert klicken sie <a href="menuv3.pl?action=display">hier</a>
+Falls die automatische Weiterleitung nicht funktioniert, klicken Sie <a href="menu.pl?action=display">hier</a>.
     </body>
   </html>
 </xsl:template>
-- 
2.20.1