img -> css scaling, muss aber noch gefixt werden

diff --git a/bin/mozilla/menu.pl b/bin/mozilla/menu.pl
index 75f2bc44e06327cba69231db0025f843e4df01fa..16d8b75ae57f23b11707d912ae51b94a4199ebf1 100644 (file)
--- a/bin/mozilla/menu.pl
+++ b/bin/mozilla/menu.pl
@@ -40,12 +40,10 @@
 use strict;
 
 use SL::Menu;
 use strict;
 
 use SL::Menu;

-use Data::Dumper;

 use URI;
 
 use List::MoreUtils qw(apply);
 
 use URI;
 
 use List::MoreUtils qw(apply);
 

-my $menufile = "menu.ini";

 my $nbsp     = ' ';
 my $mainlevel;
 
 my $nbsp     = ' ';
 my $mainlevel;
 


@@ -140,7 +138,7 @@ sub section_menu {
     } elsif ($menuitem->{submenu}) {
       my $image = make_image(submenu => 1);
       if ($mainlevel && $item =~ /^\Q$mainlevel\E/) {
     } elsif ($menuitem->{submenu}) {
       my $image = make_image(submenu => 1);
       if ($mainlevel && $item =~ /^\Q$mainlevel\E/) {

-        push @items, make_item(target => $menuitem->{target}, spacer => $spacer, bold => 1, img => $image, label => $label, class => 'submenu') if $show;
+        push @items, make_item(target => $menuitem->{target}, spacer => $spacer, img => $image, label => $label, class => 'submenu') if $show;

         push @items, section_menu($menu, $item);
       } else {
         push @items, make_item(spacer => $spacer, href => $anchor, img => $image, label => $label . ' ...', class => 'submenu') if $show;
         push @items, section_menu($menu, $item);
       } else {
         push @items, make_item(spacer => $spacer, href => $anchor, img => $image, label => $label . ' ...', class => 'submenu') if $show;


@@ -190,22 +188,23 @@ sub multiline {
 sub make_image {
   my (%params) = @_;
 
 sub make_image {
   my (%params) = @_;
 

-  my $label  = $params{label};

   my $icon   = $params{icon};
   my $size   = $params{size}   || 16;
 
   return unless _show_images();
 
   my $icon_found = $icon && -f _icon_path($icon, $size);
   my $icon   = $params{icon};
   my $size   = $params{size}   || 16;
 
   return unless _show_images();
 
   my $icon_found = $icon && -f _icon_path($icon, $size);

-
-  my $image_url = $icon_found ? _icon_path($icon, $size) : "image/unterpunkt.png";
-  my $width     = $icon_found ? $size : 24;
-
-  my $padding   = $size == 16 && $icon_found ? $nbsp x 2
-                : $size == 24                ? $nbsp
-                :                            '';
-
-  return "<img src='$image_url' alt='$label' width='$width' height='$size'>$padding";
+  my $padding    = $size == 16 && $icon_found ? $nbsp x 2
+                 : $size == 24                ? $nbsp
+                 :                            '';
+
+  return  {
+    src     => $icon_found ? _icon_path($icon, $size) : "image/unterpunkt.png",
+    alt     => $params{label},
+    width   => $icon_found ? $size : 24,
+    height  => $size,
+    padding => $padding,
+  }

 }
 
 sub _calc_framesize {
 }
 
 sub _calc_framesize {

diff --git a/templates/webpages/menu/menu.html b/templates/webpages/menu/menu.html
index 5e1c1c7dbb332fdba72fec5fa8ba571b715cc6fa..25081d4f2f182349e037471fbdcf5bee9496d859 100644 (file)
--- a/templates/webpages/menu/menu.html
+++ b/templates/webpages/menu/menu.html
@@ -2,10 +2,9 @@
 <style type='text/css'>
   #html-menu { float:left; white-space: nowrap; }
   #html-menu tr { vertical-align: top; }
 <style type='text/css'>
   #html-menu { float:left; white-space: nowrap; }
   #html-menu tr { vertical-align: top; }

-  #html-menu img { vertical-align: middle; }

   #html-menu div.menuitem { padding: 2px 4px 1px 4px; }
   #html-menu div.submenu { font-weight: bold }
   #html-menu div.menuitem { padding: 2px 4px 1px 4px; }
   #html-menu div.submenu { font-weight: bold }

-  #html-menu img { visibility:hidden; border: 0 }
+  #html-menu img { vertical-align: middle; visibility:hidden; border: 0; }

   #html-menu div.menuitem:first-child img { visibility:visible }
   #html-menu a { vertical-align: top }
 </style>
   #html-menu div.menuitem:first-child img { visibility:visible }
   #html-menu a { vertical-align: top }
 </style>


@@ -18,9 +17,9 @@
  [%- FOREACH chunk IN item.chunks %]
      <div class='menuitem [% item.class %] hover'>[% item.spacer %]
      [%- IF item.href %]
  [%- FOREACH chunk IN item.chunks %]
      <div class='menuitem [% item.class %] hover'>[% item.spacer %]
      [%- IF item.href %]

-       [% L.link(item.href, item.img _ chunk, target=item.target) %]
+       [% L.link(item.href, L.html_tag('img', undef, item.img) _ chunk, target=item.target) %]

      [%- ELSE %]
      [%- ELSE %]

-       [% item.img _ chunk %]
+       [% L.html_tag('img', undef, item.img) _ chunk %]

      [%- END %]
      </div>
  [%- END %]
      [%- END %]
      </div>
  [%- END %]