diff --git a/TODO b/TODO
index 4c8144076..534639906 100644
--- a/TODO
+++ b/TODO
@@ -1,5 +1,5 @@
FHEM:
-- fork problem (?)
+- uniform .gplot "set title" and naming (ks300_1.gplot -> tempRain.gplot)
- HomeMatic signing
- HomeMatic set log 2
- mergelog
diff --git a/docs/commandref.html b/docs/commandref.html
index 92cbf271e..1ebe6b447 100644
--- a/docs/commandref.html
+++ b/docs/commandref.html
@@ -5516,7 +5516,7 @@ Terminating
plotmode
label
- Colon separated list of values. The values will be used to replace
+ Double-Colon separated list of values. The values will be used to replace
<L#> type of strings in the .gplot file, with # beginning at 1
(<L1>, <L2>, etc.). Each value will be evaluated as a perl
expression, so you have access e.g. to the $value hash.
@@ -5530,7 +5530,7 @@ Terminating
Fixed text for the right and left axis:
- Fhem config:
- attr wl_1 label "Temperature":"Humidity"
+ attr wl_1 label "Temperature"::"Humidity"
.gplot file entry:
set ylabel <L1>
set y2label <L2>
diff --git a/webfrontend/pgm2/01_FHEMWEB.pm b/webfrontend/pgm2/01_FHEMWEB.pm
index 7c58cff8d..86de2408b 100755
--- a/webfrontend/pgm2/01_FHEMWEB.pm
+++ b/webfrontend/pgm2/01_FHEMWEB.pm
@@ -495,6 +495,7 @@ FW_updateHashes()
foreach my $d (sort keys %defs ) {
next if(IsIgnored($d));
my $t = AttrVal($d, "subType", $defs{$d}{TYPE});
+ $t = AttrVal($d, "model", $t) if($t eq "unknown");
$FW_types{$t}{$d} = 1;
}
@@ -1023,7 +1024,7 @@ FW_substcfg($$$$$$)
my $label = AttrVal($wl, "label", undef);
my @g_label;
if ($label) {
- @g_label = split(":",$label);
+ @g_label = split("::",$label);
foreach (@g_label) {
$_ = AnalyzeCommand(undef, "{ $_ }");
}
diff --git a/webfrontend/pgm2/98_SVG.pm b/webfrontend/pgm2/98_SVG.pm
index 001b90ca0..35b590f4e 100755
--- a/webfrontend/pgm2/98_SVG.pm
+++ b/webfrontend/pgm2/98_SVG.pm
@@ -87,6 +87,7 @@ SVG_render($$$$$$$)
pO "$title";
+ # Copy and Paste labels, hidden by default
pO " ";
@@ -123,7 +124,6 @@ SVG_render($$$$$$$)
($off1,$off2) = ($ow-$x-$th, $y+$th);
-
for my $i (0..int(@ltitle)-1) {
my $j = $i+1;
my $t = $ltitle[$i];
diff --git a/webfrontend/pgm2/ks300_2.gplot b/webfrontend/pgm2/ks300_2.gplot
index f0f3cd73a..d7ae65bf8 100644
--- a/webfrontend/pgm2/ks300_2.gplot
+++ b/webfrontend/pgm2/ks300_2.gplot
@@ -10,10 +10,10 @@ set timefmt "%Y-%m-%d_%H:%M:%S"
set xlabel " "
set ytics nomirror
set y2tics
-set title ''
+set title ''
set grid
-set ylabel "Wind (Km/h)"
+set ylabel "Wind (km/h)"
set y2label "Humidity (%)"
#FileLog 8:IR:0:
diff --git a/webfrontend/pgm2/svg_style.css b/webfrontend/pgm2/svg_style.css
index 9d820390d..67ced61b7 100644
--- a/webfrontend/pgm2/svg_style.css
+++ b/webfrontend/pgm2/svg_style.css
@@ -4,18 +4,17 @@ text { font-family:Times; font-size:12px; }
text.title { font-size:16px; }
text.copy { text-decoration:underline; stroke:none; fill:blue; }
text.paste { text-decoration:underline; stroke:none; fill:blue; }
-text.l0 { test-decoration:underline; stroke:none; fill:red; }
-text.l1 { test-decoration:underline; stroke:none; fill:green; }
-text.l2 { test-decoration:underline; stroke:none; fill:blue; }
-text.l3 { test-decoration:underline; stroke:none; fill:magenta; }
-text.l4 { test-decoration:underline; stroke:none; fill:brown; }
-text.l5 { test-decoration:underline; stroke:none; fill:black; }
-text.l6 { test-decoration:underline; stroke:none; fill:olive; }
-text.l7 { test-decoration:underline; stroke:none; fill:gray; }
-text.l8 { test-decoration:underline; stroke:none; fill:yellow; }
+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:none; }
.border { stroke:black; fill:url(#grad1); }
.vgrid { stroke:gray; stroke-dasharray:2,6; }
.hgrid { stroke:gray; stroke-dasharray:2,6; }