diff --git a/contrib/DS_Starter/76_SMAPortal.pm b/contrib/DS_Starter/76_SMAPortal.pm index 63fe9399b..51b9ac0a5 100644 --- a/contrib/DS_Starter/76_SMAPortal.pm +++ b/contrib/DS_Starter/76_SMAPortal.pm @@ -162,6 +162,7 @@ use vars qw($FW_ME); # webname (default is fh # Versions History intern our %vNotesIntern = ( + "2.4.2" => "02.07.2019 change header design of portal graphics ", "2.4.1" => "01.07.2019 replace space in consumer name by a valid sign for reading creation ", "2.4.0" => "26.06.2019 support for FTUI-Widget ", "2.3.7" => "24.06.2019 replace suggestIcon by consumerAdviceIcon ", @@ -1937,7 +1938,7 @@ sub PortalAsHtml ($$;$) { $colorw = AttrVal($wlname, 'weatherColor', undef); $wlalias = AttrVal($wlname, 'alias', $wlname); - $header = (AttrNum($wlname, 'showHeader', 1)) ? 1 : undef; + $header = AttrNum($wlname, 'showHeader', 1); # Icon Erstellung, mit @ ergänzen falls einfärben # Beispiel mit Farbe: $icon = FW_makeImage('light_light_dim_100.svg@green'); @@ -1978,26 +1979,22 @@ sub PortalAsHtml ($$;$) { # Sonst sind schmale Ausgaben nicht von den Balken bzw. deren Anzahl abhängig, sondern allein durch die Breite des Headers bestimmt if ($header) { - my ($h1,$h2); if(AttrVal("global","language","EN") eq "DE") { - $h1 = "Prognose [pv] - nächste 4 Stunden: $pv4h / Rest des Tages: $pvRe / Morgen: $pvTo"; - $h2 = "Prognose [co] - nächste 4 Stunden: $co4h / Rest des Tages: $coRe / Morgen: $coTo"; my ($year, $month, $day, $hour, $min, $sec) = $lup =~ /(\d+)-(\d\d)-(\d\d)\s+(.*)/; $lup = "$3.$2.$1 $4"; $lupt = "letzte Aktualisierung:"; - } else { - $h1 = "forecast data [pv] - next 4 hours: $pv4h / rest of day: $pvRe / tomorrow: $pvTo"; - $h2 = "forecast data [co] - next 4 hours: $co4h / rest of day: $coRe / tomorrow: $coTo"; } - $lup = "     ($lupt $lup)"; - if ($type eq 'pv') { - $header = $dlink.' '.$lup.'
'.$h1; - } elsif ($type eq 'co') { - $header = $dlink.' '.$lup.'
'.$h2; - } else { - $header = $dlink.' '.$lup.'
'.$h1.'
'.$h2; - } + $header = ""; + $header .= ""; + if(AttrVal("global","language","EN") eq "DE") { + $header .= ""; + $header .= ""; + } else { + $header .= ""; + $header .= ""; + } + $header .= "
".$dlink."(".$lupt." ".$lup.")
PV > nächste 4h: $pv4h Rest Heute: $pvRe Morgen: $pvTo
CO > nächste 4h: $co4h Rest Heute: $coRe Morgen: $coTo
PV > next 4h: $pv4h rest today: $pvRe tomorrow: $pvTo
CO > next 4h: $co4h rest today: $coRe tomorrow: $coTo
"; } # Werte aktuelle Stunde