From 64b3d4cbefc518f5fbb0b068b287982cb6e187a3 Mon Sep 17 00:00:00 2001
From: borisneubert <>
Date: Sat, 3 Aug 2013 09:26:56 +0000
Subject: [PATCH] WeatherAsHtmlD() added, vertical layout improved

git-svn-id: https://svn.fhem.de/fhem/trunk@3588 2b470e98-0d58-463d-a4d8-8e2adae1ed80
---
 fhem/CHANGED            |  2 +-
 fhem/FHEM/59_Weather.pm | 68 +++++++++++++++++++++++++++++------------
 2 files changed, 50 insertions(+), 20 deletions(-)

diff --git a/fhem/CHANGED b/fhem/CHANGED
index 5df591ea2..484d3fd27 100644
--- a/fhem/CHANGED
+++ b/fhem/CHANGED
@@ -2,7 +2,7 @@
 - SVN
   - feature: SYSSTAT: allow (remote) monitoring system uptime
   - feature: new module 98_openweathermap.pm added (betateilchen)
-  - feature: WeatherAsHtmlH() added to 59_Weather.pm (Boris)
+  - feature: WeatherAsHtmlH(), WeatherAsHtmlD() added to 59_Weather.pm (Boris)
   - feature: new module I2C_BMP180 for reading I2C digital pressure sensor BMP180
     or BMP085 connected to Raspberry Pi (Dirk)
   - feature: new module 35_SWAP_0000002200000003 for panstamp rgb led driver
diff --git a/fhem/FHEM/59_Weather.pm b/fhem/FHEM/59_Weather.pm
index 392987319..31e713cc8 100755
--- a/fhem/FHEM/59_Weather.pm
+++ b/fhem/FHEM/59_Weather.pm
@@ -514,28 +514,57 @@ WeatherAsHtmlH($)
         if(!$defs{$d} || $defs{$d}{TYPE} ne "Weather");
 
   my $width= int(ICONSCALE*ICONWIDTH);
+  
+  
+  
+  my $format= '<td><table border=1><tr><td class="weatherIcon" width=%d>%s</td></tr><tr><td class="weatherValue">%s</td></tr><tr><td class="weatherValue">%s°C %s%%</td></tr><tr><td class="weatherValue">%s</td></tr></table></td>';
       
-  my $ret = sprintf('<table class="weather"><tr><th width=%d></th><th></th><th></th><th></th></tr><tr>', $width);
-  $ret .= sprintf('<td><table><tr><td class="weatherIcon" width=%d>%s</td></tr><tr><td class="weatherValue">%s<br>%s°C  %s%%<br>%s</td></tr></table></td>',
-        $width,
-        WeatherIconIMGTag(ReadingsVal($d, "icon", "")),
-        ReadingsVal($d, "condition", ""),
-        ReadingsVal($d, "temp_c", ""), ReadingsVal($d, "humidity", ""),
-        ReadingsVal($d, "wind_condition", ""));
-        
-
+  my $ret = '<table class="weather">';
+  
+  # icons
+  $ret .= sprintf('<tr><td class="weatherIcon" width=%d>%s</td>', $width, WeatherIconIMGTag(ReadingsVal($d, "icon", "")));
   for(my $i=1; $i<=5; $i++) {
-    $ret .= sprintf('<td><table><tr><td class="weatherIcon" width=%d>%s</td></tr><tr><td class="weatherValue"><span class="weatherDay">%s: %s</span><br><span class="weatherMin">min %s°C</span> <span class="weatherMax">max %s°C</span></td></tr></table></td>',
-        $width,
-        WeatherIconIMGTag(ReadingsVal($d, "fc${i}_icon", "")),
-        ReadingsVal($d, "fc${i}_day_of_week", ""),
-        ReadingsVal($d, "fc${i}_condition", ""),
-        ReadingsVal($d, "fc${i}_low_c", ""), ReadingsVal($d, "fc${i}_high_c", ""));
+    $ret .= sprintf('<td class="weatherIcon" width=%d>%s</td>', $width, WeatherIconIMGTag(ReadingsVal($d, "fc${i}_icon", "")));
+  }
+  $ret .= '</tr>';
+  
+  # condition
+  $ret .= sprintf('<tr><td class="weatherDay">%s</td>', ReadingsVal($d, "condition", ""));
+  for(my $i=1; $i<=5; $i++) {
+    $ret .= sprintf('<td class="weatherDay">%s: %s</td>', ReadingsVal($d, "fc${i}_day_of_week", ""),
+        ReadingsVal($d, "fc${i}_condition", ""));
+  }
+  $ret .= '</tr>';
+  
+  # temp/hum | min
+  $ret .= sprintf('<tr><td class="weatherMin">%s°C %s%%</td>', ReadingsVal($d, "temp_c", ""), ReadingsVal($d, "humidity", ""));
+  for(my $i=1; $i<=5; $i++) {
+    $ret .= sprintf('<td class="weatherMin">min %s°C</td>', ReadingsVal($d, "fc${i}_low_c", ""));
+  }
+  $ret .= '</tr>';
+  
+  # wind | max
+  $ret .= sprintf('<tr><td class="weatherMax">%s</td>', ReadingsVal($d, "wind_condition", ""));
+  for(my $i=1; $i<=5; $i++) {
+    $ret .= sprintf('<td class="weatherMax">max %s°C</td>', ReadingsVal($d, "fc${i}_high_c", ""));
   }
-
   $ret .= "</tr></table>";
+
   return $ret;
 }
+
+sub
+WeatherAsHtmlD($)
+{
+  my ($d) = @_;
+  if($FW_ss) {
+    WeatherAsHtmlV($d);
+  } else {
+    WeatherAsHtmlH($d);
+  }
+}
+
+
 #####################################
 
 
@@ -579,9 +608,10 @@ WeatherAsHtmlH($)
       define Forecast Weather 673513 1800
      </pre>
      
-    The module provides three additional functions <code>WeatherAsHtml</code>, <code>WeatherAsHtmlV</code> and
-    <code>WeatherAsHtmlH</code>. The former two functions are identical: they return the HTML code for a
-    vertically arranged weather forecast. The latter returns the HTML code for a horizontally arranged weather forecast.<br><br>
+    The module provides four additional functions <code>WeatherAsHtml</code>, <code>WeatherAsHtmlV</code>, <code>WeatherAsHtmlH</code> and
+    <code>WeatherAsHtmlD</code>. The former two functions are identical: they return the HTML code for a
+    vertically arranged weather forecast. The third function returns the HTML code for a horizontally arranged weather forecast. The 
+    latter function dynamically picks the orientation depending on wether a smallscreen style is set (vertical layout) or not (horizontal layout).<br><br>
     Example:
     <pre>
       define MyWeatherWeblink weblink htmlCode { WeatherAsHtmlH("MyWeather") }