mhop/fhem
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

HTML check (with Safari Web Inspactor)

Browse Source 
git-svn-id: https://fhem.svn.sourceforge.net/svnroot/fhem/trunk/fhem@754 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
rudolfkoenig
2010-11-07 11:39:49 +00:00
parent a0e88259d5
commit a2d177e2ed
8 changed files with 70 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
webfrontend/pgm2/01_FHEMWEB.pm
View File

@@ -477,8 +477,10 @@ FW_makeTable($$$$$$$$)
my @al = map { s/[:;].*//;$_ } split(" ", $clist);
pO "<td>" . FW_select("arg.$ccmd$d",\@al,undef) . "</td>";
pO "<td>" . FW_textfield("val.$ccmd$d", 20) . "</td>";
pO "<td>" . FW_submit("cmd.$ccmd$d", $ccmd) . "</td>";
pO FW_hidden("dev.$ccmd$d", $d);
pO "<td>" .
FW_submit("cmd.$ccmd$d", $ccmd) .
FW_hidden("dev.$ccmd$d", $d) .
"</td>";
pO "</tr>";
}
@@ -489,7 +491,8 @@ FW_makeTable($$$$$$$$)
pF " <tr class=\"%s\">", $row?"odd":"even";
$row = ($row+1)%2;
if($makelink && $__reldoc) {
pO "<td><a href=\"$__reldoc#$v\">$v</a></td>"; # no pH, want to open extra browser
# no pH, want to open extra browser
pO "<td><a href=\"$__reldoc#$v\">$v</a></td>";
} else {
pO "<td>$v</td>";
}
@@ -810,12 +813,14 @@ FW_showRoom()
my @tv = map { ($_.".0", $_+0.5) } (5..30);
shift(@tv); # 5.0 is not valid
$v = int($v*20)/$v if($v =~ m/^[0-9].$/);
pO FW_hidden("arg.$d", "desired-temp");
pO FW_hidden("dev.$d", $d);
pO "<td>" .
FW_hidden("arg.$d", "desired-temp") .
FW_hidden("dev.$d", $d) .
FW_select("val.$d", \@tv, ReadingsVal($d, "desired-temp", $v)) .
FW_submit("cmd.$d", "set") . "</td>";
FW_submit("cmd.$d", "set") .
"</td>";
} elsif($type eq "FileLog") {
@@ -838,7 +843,9 @@ FW_showRoom()
} elsif($type eq "weblink") {
pO "<td>";
FW_showWeblink($d, $defs{$d}{LINK}, $defs{$d}{WLTYPE});
pO "</td>";
} else {
@@ -1526,7 +1533,7 @@ FW_showWeblink($$$)
} elsif($t eq "fileplot") {
my @va = split(":", $v, 3);
if(@va != 3 || !$defs{$va[0]} || !$defs{$va[0]}{currentlogfile}) {
pO "<td>Broken definition: $v</a></td>";
pO "<td>Broken definition: $v</td>";
} else {
if($va[2] eq "CURRENT") {
$defs{$va[0]}{currentlogfile} =~ m,([^/]*)$,;

10
webfrontend/pgm2/98_SVG.pm
View File

@@ -53,11 +53,10 @@ SVG_render($$$$$$$)
my ($w, $h) = ($ow-2*$x, $oh-2*$y); # Rect size
# Html Header
pO "<?xml version=\"1.0\" encoding=\"UTF-8\"?>";
pO "<!DOCTYPE svg>";
pO "<svg version=\"1.1\" xmlns=\"http://www.w3.org/2000/svg\" ".
"xmlns:xlink=\"http://www.w3.org/1999/xlink\" " .
">";
pO '<?xml version="1.0" encoding="UTF-8"?>';
pO '<!DOCTYPE svg>';
pO '<svg version="1.1" xmlns="http://www.w3.org/2000/svg" '.
'xmlns:xlink="http://www.w3.org/1999/xlink" >';
pO "<style type=\"text/css\"><![CDATA[";
if(open(FH, "$__dir/svg_style.css")) {
@@ -430,7 +429,6 @@ time_to_sec($)
if(!$str) {
return 0;
}
Log 1, $str;
my ($y,$m,$d,$h,$mi,$s) = split("[-_:]", $str);
$s = 0 if(!$s);
$mi= 0 if(!$mi);

10
webfrontend/pgm2/svg.js
View File

@@ -9,11 +9,10 @@ function
compressPoints(pointList)
{
var i, x, y, lx = -1, ly, ret = "";
var pl_arr = pointList.split(" ");
for(i = 0; i < pl_arr.length; i++) {
var xy = pl_arr[i].split(",");
x = parseInt(xy[0]);
y = parseInt(xy[1]);
var pl_arr = pointList.split(/[, ]/);
for(i = 0; i < pl_arr.length; i +=2) {
x = parseInt(pl_arr[i]);
y = parseInt(pl_arr[i+1]);
if(pl_arr.length > 500 && lx != -1 && x-lx < 2) // Filter the data.
continue;
ret = ret+
@@ -90,7 +89,6 @@ svg_paste(evt)
"translate(0,"+ (h/y_mul+y_min-h/ny_mul-ny_min)*y_mul +") "+
"scale(1, "+ (y_mul/ny_mul) +") ";
o.setAttribute("transform", tr);
d.documentElement.appendChild(o);
}