2
0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-05-03 19:49:02 +00:00

98_DOIF.pm: fixed uiTable function icon, switch

git-svn-id: https://svn.fhem.de/fhem/trunk@20708 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
Damian 2019-12-10 21:34:14 +00:00
parent 9be80d8831
commit 7c9834a392

View File

@ -3852,18 +3852,18 @@ sub FW_makeImage {
my ($value,$icon_off,$icon_on,$state_off,$state_on)=@_; my ($value,$icon_off,$icon_on,$state_off,$state_on)=@_;
$state_on=(defined ($state_on) and $state_on ne "") ? $state_on : "on"; $state_on=(defined ($state_on) and $state_on ne "") ? $state_on : "on";
$state_off=(defined ($state_off) and $state_off ne "") ? $state_off : "off"; $state_off=(defined ($state_off) and $state_off ne "") ? $state_off : "off";
$icon_off=(defined ($icon_off) and $icon_off ne "") ? $icon_off : "off"; my $i_off=(defined ($icon_off) and $icon_off ne "") ? $icon_off : "off";
$icon_on=((defined ($icon_on) and $icon_on ne "") ? $icon_on : "$icon_off\@DarkOrange"); $icon_on=((defined ($icon_on) and $icon_on ne "") ? $icon_on :(defined ($icon_off) and $icon_off ne "") ? "$icon_off\@DarkOrange" : "on");
return($value,"",("iconSwitch,".$state_on.",".$icon_off.",".$state_off.",".$icon_on)); return($value,"",("iconSwitch,".$state_on.",".$i_off.",".$state_off.",".$icon_on));
} }
sub icon { sub icon {
my ($value,$icon_off,$icon_on,$state_off,$state_on)=@_; my ($value,$icon_off,$icon_on,$state_off,$state_on)=@_;
$state_on=(defined ($state_on) and $state_on ne "") ? $state_on : "on"; $state_on=(defined ($state_on) and $state_on ne "") ? $state_on : "on";
$state_off=(defined ($state_off) and $state_off ne "") ? $state_off : "off"; $state_off=(defined ($state_off) and $state_off ne "") ? $state_off : "off";
$icon_off=(defined ($icon_off) and $icon_off ne "") ? $icon_off : "off"; my $i_off=(defined ($icon_off) and $icon_off ne "") ? $icon_off : "off";
$icon_on=((defined ($icon_on) and $icon_on ne "") ? $icon_on : "$icon_off\@DarkOrange"); $icon_on=((defined ($icon_on) and $icon_on ne "") ? $icon_on :(defined ($icon_off) and $icon_off ne "") ? "$icon_off\@DarkOrange" : "on");
return($value,"",("iconLabel,".$state_on.",".$icon_on.",".$state_off.",".$icon_off)); return($value,"",("iconLabel,".$state_on.",".$icon_on.",".$state_off.",".$i_off));
} }
1; 1;