Public/fhem-mirror
1
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-05-04 22:19:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

01_FHEMWEB.pm: change default style to f18, iconPath to fhemSVG:openautomation:default

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@17307 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
rudolfkoenig 2018-09-09 13:42:47 +00:00
parent ce267e2f25
commit 5139f76c2a
2 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
fhem/CHANGED
View File

@ -1,5 +1,7 @@
# Add changes at the top of the list. Keep it in ASCII, and 80-char wide. # 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. # 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 - bugfix: 72_XiaomiDevice: update vacuum volume readings after set
- change: 98_DOIFtools: improved direct help contetn - change: 98_DOIFtools: improved direct help contetn
- change: 38_netatmo: removed rain sum readings - change: 38_netatmo: removed rain sum readings

19
fhem/FHEM/01_FHEMWEB.pm
View File

@ -737,11 +737,12 @@ FW_answerCall($)
$FW_RETTYPE = "text/html; charset=$FW_encoding"; $FW_RETTYPE = "text/html; charset=$FW_encoding";
$MW_dir = "$attr{global}{modpath}/FHEM"; $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_ss = ($FW_sp =~ m/smallscreen/);
$FW_tp = ($FW_sp =~ m/smallscreen|touchpad/); $FW_tp = ($FW_sp =~ m/smallscreen|touchpad/);
my $spDir = ($FW_sp eq "default" ? "" : "$FW_sp:");
@FW_iconDirs = grep { $_ } split(":", AttrVal($FW_wname, "iconPath", @FW_iconDirs = grep { $_ } split(":", AttrVal($FW_wname, "iconPath",
"$FW_sp:default:fhemSVG:openautomation")); "${spDir}fhemSVG:openautomation:default"));
@FW_fhemwebjs = ("fhemweb.js"); @FW_fhemwebjs = ("fhemweb.js");
push(@FW_fhemwebjs, "$FW_sp.js") if(-r "$FW_dir/pgm2/$FW_sp.js"); push(@FW_fhemwebjs, "$FW_sp.js") if(-r "$FW_dir/pgm2/$FW_sp.js");
@ -2296,11 +2297,7 @@ FW_style($$)
FW_pO "</table>$end"; FW_pO "</table>$end";
} elsif($a[1] eq "set") { } 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_styleStamp = time();
$FW_RET =~ s,/style.css\?v=\d+,/style.css?v=$FW_styleStamp,; $FW_RET =~ s,/style.css\?v=\d+,/style.css?v=$FW_styleStamp,;
FW_addContent($start); FW_addContent($start);
@ -2953,11 +2950,13 @@ FW_Notify($$)
$FW_wname = $ntfy->{SNAME}; $FW_wname = $ntfy->{SNAME};
$FW_ME = "/" . AttrVal($FW_wname, "webname", "fhem"); $FW_ME = "/" . AttrVal($FW_wname, "webname", "fhem");
$FW_subdir = ($h->{iconPath} ? "/floorplan/$h->{iconPath}" : ""); # 47864 $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_ss = ($FW_sp =~ m/smallscreen/);
$FW_tp = ($FW_sp =~ m/smallscreen|touchpad/); $FW_tp = ($FW_sp =~ m/smallscreen|touchpad/);
my $spDir = ($FW_sp eq "default" ? "" : "$FW_sp:");
@FW_iconDirs = grep { $_ } split(":", AttrVal($FW_wname, "iconPath", @FW_iconDirs = grep { $_ } split(":", AttrVal($FW_wname, "iconPath",
"$FW_sp:default:fhemSVG:openautomation")); "${spDir}fhemSVG:openautomation:default"));
if($h->{iconPath}) { if($h->{iconPath}) {
unshift @FW_iconDirs, $h->{iconPath}; unshift @FW_iconDirs, $h->{iconPath};
FW_readIcons($h->{iconPath}); FW_readIcons($h->{iconPath});
@ -3704,7 +3703,7 @@ FW_widgetOverride($$)
<li>iconPath<br> <li>iconPath<br>
colon separated list of directories where the icons are read from. colon separated list of directories where the icons are read from.
The directories start in the fhem/www/images directory. The default is The directories start in the fhem/www/images directory. The default is
$styleSheetPrefix:default:fhemSVG:openautomation<br> $styleSheetPrefix:fhemSVG:openautomation:default<br>
Set it to fhemSVG:openautomation to get only SVG images. Set it to fhemSVG:openautomation to get only SVG images.
</li> </li>
<br> <br>
@ -4406,7 +4405,7 @@ FW_widgetOverride($$)
Durch Doppelpunkt getrennte Aufz&auml;hlung der Verzeichnisse, in Durch Doppelpunkt getrennte Aufz&auml;hlung der Verzeichnisse, in
welchen nach Icons gesucht wird. Die Verzeichnisse m&uuml;ssen unter welchen nach Icons gesucht wird. Die Verzeichnisse m&uuml;ssen unter
fhem/www/images angelegt sein. Standardeinstellung ist: fhem/www/images angelegt sein. Standardeinstellung ist:
$styleSheetPrefix:default:fhemSVG:openautomation<br> $styleSheetPrefix:fhemSVG:openautomation:default<br>
Setzen Sie den Wert auf fhemSVG:openautomation um nur SVG Bilder zu Setzen Sie den Wert auf fhemSVG:openautomation um nur SVG Bilder zu
benutzen. benutzen.
</li><br> </li><br>