From 7ef6fc9937c98819d923f1bbc0a64dbc789f724e Mon Sep 17 00:00:00 2001 From: rudolfkoenig <> Date: Sat, 21 Jan 2012 12:29:14 +0000 Subject: [PATCH] Dark-Style fixes git-svn-id: https://svn.fhem.de/fhem/trunk@1200 2b470e98-0d58-463d-a4d8-8e2adae1ed80 --- fhem/webfrontend/pgm2/98_SVG.pm | 5 ++-- fhem/webfrontend/pgm2/darksvg_defs.svg | 38 ++++++++++++++++++++++++- fhem/webfrontend/pgm2/darksvg_style.css | 37 ++++++++++++------------ fhem/webfrontend/pgm2/svg_style.css | 1 - 4 files changed, 58 insertions(+), 23 deletions(-) diff --git a/fhem/webfrontend/pgm2/98_SVG.pm b/fhem/webfrontend/pgm2/98_SVG.pm index fe5d8f2e4..6578e478e 100755 --- a/fhem/webfrontend/pgm2/98_SVG.pm +++ b/fhem/webfrontend/pgm2/98_SVG.pm @@ -40,15 +40,16 @@ SVG_render($$$$$$$) return "" if(!defined($dp)); my $th = 16; # "Font" height my ($x, $y) = (($SVG_ss ? 2 : 3)*$th, 1.2*$th); # Rect offset - my %conf; # gnuplot file settings ###################### # Convert the configuration to a "readable" form -> array to hash + my %conf; # gnuplot file settings map { chomp; my @a=split(" ",$_, 3); - if($a[0] && $a[0] eq "set") { $conf{$a[1]} = $a[2]; } } @{$confp}; + if($a[0] && $a[0] eq "set") { $conf{lc($a[1])} = $a[2]; } } @{$confp}; my $ps = "800,400"; $ps = $1 if($conf{terminal} =~ m/.*size[ ]*([^ ]*)/); + $conf{title} = "" if(!defined($conf{title})); $conf{title} =~ s/'//g; my ($ow,$oh) = split(",", $ps); # Original width diff --git a/fhem/webfrontend/pgm2/darksvg_defs.svg b/fhem/webfrontend/pgm2/darksvg_defs.svg index 246e389a6..aa4034ff4 100644 --- a/fhem/webfrontend/pgm2/darksvg_defs.svg +++ b/fhem/webfrontend/pgm2/darksvg_defs.svg @@ -1,7 +1,43 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/fhem/webfrontend/pgm2/darksvg_style.css b/fhem/webfrontend/pgm2/darksvg_style.css index 964786e7a..0685c46d5 100644 --- a/fhem/webfrontend/pgm2/darksvg_style.css +++ b/fhem/webfrontend/pgm2/darksvg_style.css @@ -5,28 +5,27 @@ text { font-family:Arial, Helvetica, sans-serif; font-size:12px; fill:#CCCCCC;} text.title {font-family:Arial, Helvetica, sans-serif; font-size:16px; fill:#CCCCCC;} text.copy { text-decoration:underline; stroke:none; fill:blue;} text.paste { text-decoration:underline; stroke:none; fill:blue;} -text.l0 { text-decoration:underline; stroke:none; fill:red;} -text.l1 { text-decoration:underline; stroke:none; fill:green;} -text.l2 { text-decoration:underline; stroke:none; fill:blue;} -text.l3 { text-decoration:underline; stroke:none; fill:magenta;} -text.l4 { text-decoration:underline; stroke:none; fill:brown;} -text.l5 { text-decoration:underline; stroke:none; fill:black;} -text.l6 { text-decoration:underline; stroke:none; fill:olive;} -text.l7 { text-decoration:underline; stroke:none; fill:gray;} -text.l8 { text-decoration:underline; stroke:none; fill:yellow;} polyline { stroke:black; fill:none; } -.border { stroke:black; fill:url(#grad1);} +.border { stroke:black; fill:url(#gr_bg);} .vgrid { stroke:gray; stroke-dasharray:2,6;} .hgrid { stroke:gray; stroke-dasharray:2,6;} .pasted { stroke:black; stroke-dasharray:1,1;} -.l0 { stroke:red;} -.l1 { stroke:green;} -.l2 { stroke:blue;} -.l3 { stroke:magenta;} -.l4 { stroke:brown;} -.l5 { stroke:black;} -.l6 { stroke:olive;} -.l7 { stroke:gray;} -.l8 { stroke:yellow;} +.l0 { stroke:red; } text.l0 { stroke:none; fill:red; } +.l1 { stroke:green; } text.l1 { stroke:none; fill:green; } +.l2 { stroke:blue; } text.l2 { stroke:none; fill:blue; } +.l3 { stroke:magenta; } text.l3 { stroke:none; fill:magenta; } +.l4 { stroke:brown; } text.l4 { stroke:none; fill:brown; } +.l5 { stroke:black; } text.l5 { stroke:none; fill:black; } +.l6 { stroke:olive; } text.l6 { stroke:none; fill:olive; } +.l7 { stroke:gray; } text.l7 { stroke:none; fill:gray; } +.l8 { stroke:yellow; } text.l8 { stroke:none; fill:yellow; } + +.l0fill{ stroke:#f00; fill:url(#gr_0); } text.l0fill{ stroke:none; fill:#f00; } +.l1fill{ stroke:#291; fill:url(#gr_1); } text.l1fill{ stroke:none; fill:#291; } +.l2fill{ stroke:#00f; fill:url(#gr_2); } text.l2fill{ stroke:none; fill:#00f; } +.l3fill{ stroke:#f0f; fill:url(#gr_3); } text.l3fill{ stroke:none; fill:#f0f; } +.l4fill{ stroke:#ff0; fill:url(#gr_4); } text.l4fill{ stroke:none; fill:#ff0; } +.l5fill{ stroke:#0ff; fill:url(#gr_5); } text.l5fill{ stroke:none; fill:#0ff; } +.l6fill{ stroke:#000; fill:url(#gr_6); } text.l6fill{ stroke:none; fill:#000; } diff --git a/fhem/webfrontend/pgm2/svg_style.css b/fhem/webfrontend/pgm2/svg_style.css index a9ef1537c..04d904381 100644 --- a/fhem/webfrontend/pgm2/svg_style.css +++ b/fhem/webfrontend/pgm2/svg_style.css @@ -28,4 +28,3 @@ polyline { stroke:black; fill:none; } .l4fill{ stroke:#ff0; fill:url(#gr_4); } text.l4fill{ stroke:none; fill:#ff0; } .l5fill{ stroke:#0ff; fill:url(#gr_5); } text.l5fill{ stroke:none; fill:#0ff; } .l6fill{ stroke:#000; fill:url(#gr_6); } text.l6fill{ stroke:none; fill:#000; } -