From 6dda27850982bffefb9626bb09446158003183df Mon Sep 17 00:00:00 2001 From: rudolfkoenig <> Date: Mon, 29 Jul 2013 19:19:08 +0000 Subject: [PATCH] FHEMWEB: Howto/Wiki/Forum replaced with Remote doc git-svn-id: https://svn.fhem.de/fhem/trunk@3538 2b470e98-0d58-463d-a4d8-8e2adae1ed80 --- fhem/FHEM/01_FHEMWEB.pm | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/fhem/FHEM/01_FHEMWEB.pm b/fhem/FHEM/01_FHEMWEB.pm index 7f174fc65..b0d09fc40 100755 --- a/fhem/FHEM/01_FHEMWEB.pm +++ b/fhem/FHEM/01_FHEMWEB.pm @@ -974,10 +974,8 @@ FW_roomOverview($) my @list = ( "Everything", "$FW_ME?room=all", "", "", - "Howto", "$FW_ME/docs/HOWTO.html", "Commandref", "$FW_ME/docs/commandref.html", - "Wiki", "http://fhemwiki.de", - "Forum", "http://forum.fhem.de", + "Remote doc", "http://fhem.de/fhem.html#Documentation", "Edit files", "$FW_ME?cmd=style%20list", "Select style", "$FW_ME?cmd=style%20select", "Event monitor", "$FW_ME?cmd=style%20eventMonitor", @@ -1028,12 +1026,7 @@ FW_roomOverview($) } else { my $td = ""; - if($l1 eq "Forum") { # Ugly hack. - $FW_RET = substr($FW_RET, 0, length($FW_RET)-12); # Remove last /tr - $td = " / "; - } else { - FW_pF "", $l1 eq $FW_room ? " class=\"sel\"" : ""; - } + FW_pF "", $l1 eq $FW_room ? " class=\"sel\"" : ""; # image tag if we have an icon, else empty my $icoName = "ico$l1"; @@ -2505,7 +2498,7 @@ FW_devState($$@) $cmdList = "desired-temp" if(!$cmdList); } elsif($allSets =~ m/\bdesiredTemperature:/) { - $txt = ReadingsVal($d, "temperature", ""); + $txt = ReadingsVal($d, "temperature", ""); # ignores stateFormat!!! $txt =~ s/ .*//; $txt .= "°C"; $cmdList = "desiredTemperature" if(!$cmdList);