Und Zahlen auch erlauben in Klassennamen.

diff --git a/SL/Layout/MenuLeft.pm b/SL/Layout/MenuLeft.pm
index 34dc2d9ca30b1b5ae7a401e829ec0122cf43975a..f2e8a053fa197c6fde30c3da5dca5784fe8a9a2b 100644 (file)
--- a/SL/Layout/MenuLeft.pm
+++ b/SL/Layout/MenuLeft.pm
@@ -51,7 +51,7 @@ sub section_menu {
     my $menuitem   = $menu->{$item};
     my $olabel     = apply { s/.*--// } $item;
     my $ml         = apply { s/--.*// } $item;
     my $menuitem   = $menu->{$item};
     my $olabel     = apply { s/.*--// } $item;
     my $ml         = apply { s/--.*// } $item;

-    my $icon_class = apply { $_ =lc $_; s/[^a-z]/-/g } $item;
+    my $icon_class = apply { $_ =lc $_; s/[^a-z0-9_-]/-/g } $item;

     my $spacer     = "s" . (0 + $item =~ s/--/--/g);
 
     next if $level && $item ne "$level--$olabel";
     my $spacer     = "s" . (0 + $item =~ s/--/--/g);
 
     next if $level && $item ne "$level--$olabel";

diff --git a/css/icons16.css b/css/icons16.css
index 27e2020c9a60f5d17a8df81aecdedf87d3623627..55ec5974301a3cc0a502f835e06d2666b2c64cd5 100644 (file)
--- a/css/icons16.css
+++ b/css/icons16.css
@@ -80,7 +80,7 @@
 .icon16.master-data--reports--services { background-position: -1248px 0px; }
 .icon16.master-data--reports--vendors { background-position: -1264px 0px; }
 .icon16.master-data--update-prices { background-position: -1280px 0px; }
 .icon16.master-data--reports--services { background-position: -1248px 0px; }
 .icon16.master-data--reports--vendors { background-position: -1264px 0px; }
 .icon16.master-data--update-prices { background-position: -1280px 0px; }

-.icon16.mdi-text-editor---x-- { background-position: -1296px 0px; }
+.icon16.mdi-text-editor-16x16 { background-position: -1296px 0px; }

 .icon16.neues-fenster { background-position: -1312px 0px; }
 .icon16.program--logout { background-position: -1328px 0px; }
 .icon16.program { background-position: -1344px 0px; }
 .icon16.neues-fenster { background-position: -1312px 0px; }
 .icon16.program--logout { background-position: -1328px 0px; }
 .icon16.program { background-position: -1344px 0px; }

diff --git a/css/icons24.css b/css/icons24.css
index 944cdb5372ef592146568d7e05bd56df1ce58c8a..87a382e669d0eef1292f79ba8ab65851d7884dac 100644 (file)
--- a/css/icons24.css
+++ b/css/icons24.css
@@ -59,7 +59,7 @@
 .icon24.general-ledger--reports--ar-aging { background-position: -1368px 0px; }
 .icon24.general-ledger--reports--journal { background-position: -1392px 0px; }
 .icon24.general-ledger--reports { background-position: -1416px 0px; }
 .icon24.general-ledger--reports--ar-aging { background-position: -1368px 0px; }
 .icon24.general-ledger--reports--journal { background-position: -1392px 0px; }
 .icon24.general-ledger--reports { background-position: -1416px 0px; }

-.icon24.leftarrow_-- { background-position: -1440px 0px; }
+.icon24.leftarrow_24 { background-position: -1440px 0px; }

 .icon24.master-data--add-assembly { background-position: -1464px 0px; }
 .icon24.master-data--add-customer { background-position: -1488px 0px; }
 .icon24.master-data--add-license { background-position: -1512px 0px; }
 .icon24.master-data--add-assembly { background-position: -1464px 0px; }
 .icon24.master-data--add-customer { background-position: -1488px 0px; }
 .icon24.master-data--add-license { background-position: -1512px 0px; }


@@ -88,6 +88,6 @@
 .icon24.reports--income-statement { background-position: -2064px 0px; }
 .icon24.reports { background-position: -2088px 0px; }
 .icon24.reports--ustva { background-position: -2112px 0px; }
 .icon24.reports--income-statement { background-position: -2064px 0px; }
 .icon24.reports { background-position: -2088px 0px; }
 .icon24.reports--ustva { background-position: -2112px 0px; }

-.icon24.rightarrow_-- { background-position: -2136px 0px; }
+.icon24.rightarrow_24 { background-position: -2136px 0px; }

 .icon24.system { background-position: -2160px 0px; }
 .icon24.warehouse { background-position: -2184px 0px; }
 .icon24.system { background-position: -2160px 0px; }
 .icon24.warehouse { background-position: -2184px 0px; }

diff --git a/scripts/image_maps.pl b/scripts/image_maps.pl
index 0329481947386b944ceed452eb28099966fb7ce9..f025340ab32b4ee39335234085313a85bf5b6d20 100755 (executable)
--- a/scripts/image_maps.pl
+++ b/scripts/image_maps.pl
@@ -83,10 +83,10 @@ for (@gd_images) {
     my $name = fileparse($_->{filename}, ".png");
 
     # the full grammar for valid css class names is completely bonkers (to put it mildly).
     my $name = fileparse($_->{filename}, ".png");
 
     # the full grammar for valid css class names is completely bonkers (to put it mildly).

-    # so instead of trying to punch filenames into those class names, we'll just reduce them to a nice minimal set of
-    # a-z _ -
+    # so instead of trying to punch filenames into those class names, we'll
+    # just reduce them to a nice minimal set of lower case /[a-z0-9_-]*/

     $name = lc $name;
     $name = lc $name;

-    $name =~ s/[^a-z_-]/-/g;
+    $name =~ s/[^a-z0-9_-]/-/g;

     print $file ".$class_for_map.$name { background-position: -$_->{h_offset}px 0px; }\n";
   }
 }
     print $file ".$class_for_map.$name { background-position: -$_->{h_offset}px 0px; }\n";
   }
 }