From cf1e0a4c39b820343224e4b75f31596d09132dad Mon Sep 17 00:00:00 2001
From: ulimaass <>
Date: Sun, 29 Sep 2013 07:24:59 +0000
Subject: [PATCH] Fixed floorplan-specific icons and eliminated FHT-text
 "desired-temp"

git-svn-id: https://svn.fhem.de/fhem/trunk/fhem@3970 2b470e98-0d58-463d-a4d8-8e2adae1ed80
---
 FHEM/95_FLOORPLAN.pm | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/FHEM/95_FLOORPLAN.pm b/FHEM/95_FLOORPLAN.pm
index ea6b40be2..6922ea419 100644
--- a/FHEM/95_FLOORPLAN.pm
+++ b/FHEM/95_FLOORPLAN.pm
@@ -37,6 +37,7 @@
 # 0026: Adapted to FHEMWEB-changes re webCmdFn - fp_setbutton not functional (May 23, 2013)
 # 0027: Added FP_detailFn(), added delete-button in arrange-menu, fixed link for pdf-docu, minor code cleanup, added get config (July 08, 2013)
 # 0028: Implemented informid for longpoll, usage of @FW_fhemwebjs (July 19, 2013)
+# 0029: Fixed floorplan-specific icons and eliminated FHT-text "desired-temp" - both due to changes in fhemweb (Sep 29, 2013)
 #
 ################################################################
 #
@@ -496,14 +497,16 @@ FP_show(){
             my $state = ReadingsVal($d, "state", undef);
 	    $fp_image =~ s/\{state\}/$state/;                                                       # replace {state} by actual device-status
             $txt =~ s/\<img\ src\=\"(.*)\"/\<img\ src\=\"\/fhem\/icons\/$fp_image\"/;           # replace icon-link in html
+            $txt =~ s/\<img\ (.*) src\=\"(.*)\"/\<img\ $1 src\=\"\/fhem\/images\/default\/$fp_image\"/;           # replace icon-link in html (new)
         }
         if ($fp_fpimage) {
             my $state = ReadingsVal($d, "state", undef);
             $fp_fpimage =~ s/\{state\}/$state/;                                                 # replace {state} by actual device-status
             $txt =~ s/\<img\ src\=\"(.*)\"/\<img\ src\=\"\/fhem\/icons\/$fp_fpimage\"/;         # replace icon-link in html
+            $txt =~ s/\<img\ (.*) src\=\"(.*)\"/\<img\ $1 src\=\"\/fhem\/images\/default\/$fp_fpimage\"/;     # replace icon-link in html (new)
         }
 		if ($style == 3 || $style == 6) {
-		  FW_pO "<td><div informId=\"$d-$text\">$txt</div></td>";                               # reading
+		  FW_pO "<td><div informId=\"$d-$text\">$txt</div>";                                    # reading
 		} else {
 	      FW_pO "<td informId=\"$d\" colspan=\"$cols\">$txt";                                   # state
 		}
@@ -513,7 +516,8 @@ FP_show(){
 		  $txt="";
     	  FW_pO "<tr class=\"devicetimestamp fp_$FP_name\" id=\"$d-devicetimestamp\">";         # For css: class=devicetimestamp, id=<devicename>-devicetimestamp
 		  $txt = ReadingsTimestamp($d, $text, "Undefined Reading $d-<b>$text</b>");             # Style3+6 = DeviceReading given in $text
-          FW_pO "<td><div colspan=\"$cols\" informId=\"$d-$text-ts\">$txt</div></td>";
+#          FW_pO "<td><div colspan=\"$cols\" informId=\"$d-$text-ts\">$txt</div></td>";
+		  FW_pO "<td><div colspan=\"$cols\" informId=\"$d-$text-ts\">$txt</div>";
 	      FW_pO "</td></tr>";
 	    }
 
@@ -539,6 +543,7 @@ FP_show(){
                                                  $d, $FW_room, $cmd, $values);
               use strict "refs";
               if(defined($htmlTxt)) {
+			    $htmlTxt =~ s/>desired-temp/>/;  #mod20130929
 				FW_pO $htmlTxt;
                 $firstIdx = 1;
                 last;