";
pO "";
@@ -556,7 +561,7 @@ FW_doDetail($)
$__room = FW_getAttr($d, "room", undef);
my $t = $defs{$d}{TYPE};
- pO "";
+ pO " ";
pO " ";
pO "Delete $d";
@@ -592,15 +597,15 @@ sub
FW_roomOverview($)
{
my ($cmd) = @_;
- pO "";
- pO "";
- pO "  ";
- pO " ";
- pO " ";
+ ##############
+ # LOGO
+ my $logofile = ($__ss ? "fhem_smallscreen.png" : "fhem.png");
+ pO "";
+ ##############
+ # MENU
+ my (@list1, @list2);
+ push(@list1, ""); push(@list2, "");
if(defined($data{FWEXT})) {
foreach my $k (sort keys %{$data{FWEXT}}) {
my $h = $data{FWEXT}{$k};
next if($h !~ m/HASH/ || !$h->{LINK} || !$h->{NAME});
- pO "| {LINK} . "\">"
- . $h->{NAME}. " | ";
+ push(@list1, $h->{NAME});
+ push(@list2, $__ME ."/".$h->{LINK});
}
- pO " | ";
+ push(@list1, ""); push(@list2, "");
}
-
$__room = "" if(!$__room);
foreach my $r (sort keys %__rooms) {
next if($r eq "hidden");
- pF " ", $r eq $__room ? " class=\"sel\"" : "";
- pO "| $r | ";
+ push @list1, $r;
+ push @list2, "$__ME?room=$r";
}
- pF " ", "all" eq $__room ? " class=\"sel\"" : "";
- pO " | All together | ";
- pO " ";
+ push(@list1, "All together"); push(@list2, "$__ME?room=all");
+ push(@list1, ""); push(@list2, "");
+ push(@list1, "Howto"); push(@list2, "$__ME/HOWTO.html");
+ push(@list1, "FAQ"); push(@list2, "$__ME/faq.html");
+ push(@list1, "Details"); push(@list2, "$__ME/commandref.html");
+ push(@list1, "Examples"); push(@list2, "$__ME/cmd=style examples");
+ push(@list1, "Edit files"); push(@list2, "$__ME/cmd=style list");
+ push(@list1, ""); push(@list2, "");
- pO " | ";
- pO " ";
- pO " ";
- pO " | Howto | ";
- pO " | FAQ | ";
- pO " | Details | ";
- my $sel = ($cmd =~ m/examples/) ? " class=\"sel\"" : "";
- pO " | Examples | ";
- $sel = ($cmd =~ m/list/) ? " class=\"sel\"" : "";
- pO " | Edit files | ";
- pO " ";
- pO " | ";
- pO "
";
+ pO " | " if($idx);
+ pO " "
+ if($idx", $list1[$idx] eq $__room ? " class=\"sel\"" : "";
+ pO "| $list1[$idx] | ";
+ }
+ }
+ pO " ";
+
+ }
pO "";
- pO "";
}
@@ -680,7 +710,7 @@ FW_showRoom()
}
pO " | \n
";
pO " ";
@@ -846,7 +876,7 @@ FW_logWrapper($)
$path = FW_getAttr($d,"archivedir","") . "/$file" if(!-f $path);
if(!open(FH, $path)) {
- pO " $path: $! ";
+ pO " $path: $! ";
return;
}
binmode (FH); # necessary for Windows
@@ -855,13 +885,13 @@ FW_logWrapper($)
$cnt =~ s/</g;
$cnt =~ s/>/>/g;
- pO " ";
+ pO " ";
} else {
- pO " ";
+ pO " ";
@@ -1123,7 +1153,7 @@ FW_makeEdit($$$$)
pO " ";
- pO " " . FW_submit("cmd.${cmd}$name", "$cmd $name");
+ pO " " . FW_submit("cmd.${cmd}$name", "$cmd $name");
pO " ";
$eval = " $eval " if($eval =~ m/\n/);
pO " $eval ";
@@ -1310,13 +1340,15 @@ FW_style($$)
push(@fl, " ");
push(@fl, FW_fileList("$__dir/.*.css"));
push(@fl, " ");
+ push(@fl, FW_fileList("$__dir/.*.js"));
+ push(@fl, " ");
push(@fl, FW_fileList("$__dir/.*.gplot"));
push(@fl, " ");
push(@fl, FW_fileList("$__dir/.*html"));
- pO " ";
+ pO " ";
pO " ";
- pO " $msg
" if($msg);
+ pO " $msg
" if($msg);
pO " ";
my $row = 0;
foreach my $file (@fl) {
@@ -1331,9 +1363,9 @@ FW_style($$)
} elsif($a[1] eq "examples") {
my @fl = FW_fileList("$__dir/example.*");
- pO "";
+ pO " ";
pO " ";
- pO " $msg
" if($msg);
+ pO " $msg
" if($msg);
pO " ";
my $row = 0;
foreach my $file (@fl) {
@@ -1357,9 +1389,9 @@ FW_style($$)
my $data = join("", );
close(FH);
- pO " |
|
|
|