From 4a91a9455607a626f16c8013b77f9df5395e0b7f Mon Sep 17 00:00:00 2001
From: ulimaass <>
Date: Thu, 15 Mar 2012 19:13:26 +0000
Subject: [PATCH] cleanup

git-svn-id: https://svn.fhem.de/fhem/trunk/fhem@1351 2b470e98-0d58-463d-a4d8-8e2adae1ed80
---
 contrib/95_FLOORPLAN/99_myFloorplanList.pm | 55 +++++++++++++++++-----
 1 file changed, 43 insertions(+), 12 deletions(-)

diff --git a/contrib/95_FLOORPLAN/99_myFloorplanList.pm b/contrib/95_FLOORPLAN/99_myFloorplanList.pm
index 265263047..a49394231 100644
--- a/contrib/95_FLOORPLAN/99_myFloorplanList.pm
+++ b/contrib/95_FLOORPLAN/99_myFloorplanList.pm
@@ -2,24 +2,25 @@ package main;
 use strict;
 use warnings;
 use POSIX;
-
+my @wert;
+my $div_class;
+sub doMakeHtml($@);
+######################################################################################
 sub
 myFloorplanList_Initialize($$)
 {
   my ($hash) = @_;
 }
 ###################################################################################
-# Einbinden in fhem mit
+# Define in fhem by
 # define w_WertListe1 weblink htmlCode {doWertListe1()}
 # attr w_WertListe1 room Listen
 #
 sub
 doWertListe1() {
-    my @wert;
-	my $div_class = "WertListe";  #format in css-file using #WertListe
-
+	$div_class = "WertListe";  #format in css-file using #WertListe
 	
-# Change this list as needed	
+# vvvvvvvvvvvvv Change this list as needed vvvvvvvvvvvvvvv
 	$wert[0] = "FHT Ist:"		.','.	ReadingsVal("ez_FHT","measured-temp","ezFHT measured-temp Fehler");
 	$wert[1] = "FHT Soll:"		.','.	ReadingsVal("ez_FHT","desired-temp","ezFHT desired-temp Fehler");
 	$wert[2] = "FHT Actuator:"	.','.	ReadingsVal("ez_FHT","actuator","ezFHT actuator Fehler");
@@ -28,15 +29,45 @@ doWertListe1() {
 	$wert[5] = "GoogleTemp:"	.','.	ReadingsVal("MunichWeather","temperature","MunichWeather temperature Error");
 	$wert[6] = "GoogleSky:"		.','.	ReadingsVal("MunichWeather","condition","MunichWeather condition Error"); 
 	$wert[7] = "GoogleIcon:"	.','.	"<img src=\"http://www.google.com".ReadingsVal("MunichWeather","icon","MunichWeather icon Error")."\">"; 
-	my $FritzTemp = `ctlmgr_ctl r power status/act_temperature` ;
-	$wert[8] = "FritzBoxTemp:"	.','.	$FritzTemp . "&deg";
-# Change this list as needed
-	
+	my $FritzTemp = `ctlmgr_ctl r power status/act_temperature` ;           # read  FritzBox internal temperature
+	$wert[8] = "FritzBoxTemp:"	.','.	$FritzTemp . "&deg";				# print FritzBox internal temperature
+# ^^^^^^^^^^^^^ Change this list as needed ^^^^^^^^^^^^^^^
 
+	return doMakeHtml($div_class, @wert);
+}
+
+###################################################################################
+# Define in fhem by
+# define w_WertListe2 weblink htmlCode {doWertListe2()}
+# attr w_WertListe2 room Listen
+#
+#sub
+#doWertListe2() {
+#	$div_class = "WertListe";  #format in css-file using #WertListe
+#
+#	
+# vvvvvvvvvvvvv Change this list as needed vvvvvvvvvvvvvvv
+#	$wert[0] = "FHT Ist:"		.','.	ReadingsVal("ez_FHT","measured-temp","ezFHT measured-temp Fehler");
+#	$wert[1] = "FHT Soll:"		.','.	ReadingsVal("ez_FHT","desired-temp","ezFHT desired-temp Fehler");
+#	$wert[2] = "FHT Actuator:"	.','.	ReadingsVal("ez_FHT","actuator","ezFHT actuator Fehler");
+# and so on
+# ^^^^^^^^^^^^^ Change this list as needed ^^^^^^^^^^^^^^^
+#
+#	return doMakeHtml($div_class, @wert);
+#}
+
+###################################################################################
+# Create html-code
+# 
+sub
+doMakeHtml($@) {
+	my ($div_class, @line ) = @_;
 	my $htmlcode = '<div  class="'.$div_class."\"><table>\n";
-	foreach (@wert) {
+	foreach (@line) {
 		my ($title, $value) = split (",",$_);
-		$htmlcode .= "<tr><td>$title</td><td>$value</td></tr>\n";
+		my $cssTitle = $title;
+		$cssTitle =~ s,[: -],,g;
+		$htmlcode .= "<tr><td><span \"$cssTitle-title\">$title</span></td><td><span \"$cssTitle-value\">$value</span></td></tr>\n";
 	}
 	$htmlcode .= "</table></div>";
 	return $htmlcode;