diff --git a/fhem/CHANGED b/fhem/CHANGED index 150cc65ea..053925133 100644 --- a/fhem/CHANGED +++ b/fhem/CHANGED @@ -1,5 +1,7 @@ # Add changes at the top of the list. Keep it in ASCII, and 80-char wide. # Do not insert empty lines here, update check depends on it. + - change: 01_FHEMWEB.pm: change default style to f18 + - change: 01_FHEMWEB.pm: change iconPath: to fhemSVG:openautomation:default - bugfix: 72_XiaomiDevice: update vacuum volume readings after set - change: 98_DOIFtools: improved direct help contetn - change: 38_netatmo: removed rain sum readings diff --git a/fhem/FHEM/01_FHEMWEB.pm b/fhem/FHEM/01_FHEMWEB.pm index 96ba8310a..8939b2700 100644 --- a/fhem/FHEM/01_FHEMWEB.pm +++ b/fhem/FHEM/01_FHEMWEB.pm @@ -737,11 +737,12 @@ FW_answerCall($) $FW_RETTYPE = "text/html; charset=$FW_encoding"; $MW_dir = "$attr{global}{modpath}/FHEM"; - $FW_sp = AttrVal($FW_wname, "stylesheetPrefix", ""); + $FW_sp = AttrVal($FW_wname, "stylesheetPrefix", "f18"); $FW_ss = ($FW_sp =~ m/smallscreen/); $FW_tp = ($FW_sp =~ m/smallscreen|touchpad/); + my $spDir = ($FW_sp eq "default" ? "" : "$FW_sp:"); @FW_iconDirs = grep { $_ } split(":", AttrVal($FW_wname, "iconPath", - "$FW_sp:default:fhemSVG:openautomation")); + "${spDir}fhemSVG:openautomation:default")); @FW_fhemwebjs = ("fhemweb.js"); push(@FW_fhemwebjs, "$FW_sp.js") if(-r "$FW_dir/pgm2/$FW_sp.js"); @@ -2296,11 +2297,7 @@ FW_style($$) FW_pO "$end"; } elsif($a[1] eq "set") { - if($a[2] eq "default") { - CommandDeleteAttr(undef, "$FW_wname stylesheetPrefix"); - } else { - CommandAttr(undef, "$FW_wname stylesheetPrefix $a[2]"); - } + CommandAttr(undef, "$FW_wname stylesheetPrefix $a[2]"); $FW_styleStamp = time(); $FW_RET =~ s,/style.css\?v=\d+,/style.css?v=$FW_styleStamp,; FW_addContent($start); @@ -2953,11 +2950,13 @@ FW_Notify($$) $FW_wname = $ntfy->{SNAME}; $FW_ME = "/" . AttrVal($FW_wname, "webname", "fhem"); $FW_subdir = ($h->{iconPath} ? "/floorplan/$h->{iconPath}" : ""); # 47864 - $FW_sp = AttrVal($FW_wname, "stylesheetPrefix", 0); + $FW_sp = AttrVal($FW_wname, "stylesheetPrefix", "f18"); + $FW_sp = "" if($FW_sp eq "default"); $FW_ss = ($FW_sp =~ m/smallscreen/); $FW_tp = ($FW_sp =~ m/smallscreen|touchpad/); + my $spDir = ($FW_sp eq "default" ? "" : "$FW_sp:"); @FW_iconDirs = grep { $_ } split(":", AttrVal($FW_wname, "iconPath", - "$FW_sp:default:fhemSVG:openautomation")); + "${spDir}fhemSVG:openautomation:default")); if($h->{iconPath}) { unshift @FW_iconDirs, $h->{iconPath}; FW_readIcons($h->{iconPath}); @@ -3704,7 +3703,7 @@ FW_widgetOverride($$)
  • iconPath
    colon separated list of directories where the icons are read from. The directories start in the fhem/www/images directory. The default is - $styleSheetPrefix:default:fhemSVG:openautomation
    + $styleSheetPrefix:fhemSVG:openautomation:default
    Set it to fhemSVG:openautomation to get only SVG images.

  • @@ -4406,7 +4405,7 @@ FW_widgetOverride($$) Durch Doppelpunkt getrennte Aufzählung der Verzeichnisse, in welchen nach Icons gesucht wird. Die Verzeichnisse müssen unter fhem/www/images angelegt sein. Standardeinstellung ist: - $styleSheetPrefix:default:fhemSVG:openautomation
    + $styleSheetPrefix:fhemSVG:openautomation:default
    Setzen Sie den Wert auf fhemSVG:openautomation um nur SVG Bilder zu benutzen.