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

git-svn-id: https://fhem.svn.sourceforge.net/svnroot/fhem/trunk/fhem@1271 2b470e98-0d58-463d-a4d8-8e2adae1ed80

Browse Source
This commit is contained in:
borisneubert
2012-02-20 12:38:48 +00:00
parent c6d7710756
commit 3263c0f152
4 changed files with 204 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
webfrontend/pgm2/01_FHEMWEB.pm
View File

@@ -856,19 +856,11 @@ FW_roomOverview($)
########################
# Show the overview of devices in one room
# API v1.0
sub
FW_showRoom()
{
return if(!$FW_room);
# (re-) list the icons
FW_ReadIcons();
FW_pO "<form method=\"get\" action=\"$FW_ME\">";
FW_pO "<div id=\"content\">";
FW_pO "<table>"; # Need for equal width of subtables
my $rf = ($FW_room ? "&amp;room=$FW_room" : ""); # stay in the room
FW_showRoom1($) {
my $rf= shift;
my $row=1;
foreach my $type (sort keys %FW_types) {
@@ -937,6 +929,39 @@ FW_showRoom()
}
FW_pO "</table><br>";
}
# API v1.0
sub
FW_showRoom2($) {
my $rf= shift;
FW_pO "API v2<P>";
}
sub
FW_showRoom()
{
return if(!$FW_room);
# (re-) list the icons
FW_ReadIcons();
FW_pO "<form method=\"get\" action=\"$FW_ME\">";
FW_pO "<div id=\"content\">";
FW_pO "<table>"; # Need for equal width of subtables
my $rf = ($FW_room ? "&amp;room=$FW_room" : ""); # stay in the room
my $apiversion= AttrVal("global", "apiversion", 1);
if($apiversion==1) {
FW_showRoom1($rf);
} else {
FW_showRoom2($rf);
};
# Now the weblinks
my $buttons = 1;
my @list = ($FW_room eq "all" ? keys %defs : keys %{$FW_rooms{$FW_room}});