From b65d48d5a73868fa65eed84dd054a30ffba0c026 Mon Sep 17 00:00:00 2001
From: viegener <>
Date: Sun, 26 Feb 2017 12:45:35 +0000
Subject: [PATCH] 02_FTUISRV: doc change on ftui-if
git-svn-id: https://svn.fhem.de/fhem/trunk@13528 2b470e98-0d58-463d-a4d8-8e2adae1ed80
---
fhem/CHANGED | 1 +
fhem/FHEM/02_FTUISRV.pm | 10 +++++++---
2 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/fhem/CHANGED b/fhem/CHANGED
index bc82f335a..96c1a5e40 100644
--- a/fhem/CHANGED
+++ b/fhem/CHANGED
@@ -1,5 +1,6 @@
# 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.
+ - update: 02_FTUISRV: doc change on ftui-if
- feature: 50_TelegramBot: Secured: api key handled in setkey/getkey
msgChatId with peer / communication with TBot_List
- update: 98_DOIFtools: add a possibility to set the attribute icon for DOIF
diff --git a/fhem/FHEM/02_FTUISRV.pm b/fhem/FHEM/02_FTUISRV.pm
index 4ebc67da4..c2d55972e 100644
--- a/fhem/FHEM/02_FTUISRV.pm
+++ b/fhem/FHEM/02_FTUISRV.pm
@@ -71,9 +71,9 @@
# add new attribute for defining special template urls templateFiles
# allow spaces around = and after for more tolerance
# do not require space at end of tag before ?> for more tolerance
-
# more tolerance on spaces around =
-#
+# doc change on ftui-if
+
#
################################################################
#TODO:
@@ -719,6 +719,7 @@ sub FTUISRV_handleIf( $$$ ) {
Log3 $name, 4, "$name: FTUISRV_handleIf expr elements :".scalar(@a).":";
Log3 $name, 4, "$name: FTUISRV_handleIf expr after setmagic :".$expr.":";
}
+ #Debug "Expr : ".( ( $expr ) ? $then : $else ).":";
# put then/else depending on expr
$done .= ( ( $expr ) ? $then : $else );
@@ -1136,9 +1137,12 @@ sub FTUISRV_BinaryFileRead($) {
<?ftui-if=( expression ) ?> ... [ <?ftui-else ?> ... ] <?ftui-endif ?>
<?ftui-if=( [tempdevice:batteryok] ) ?> ... <?ftui-else ?> ... <?ftui-endif ?>
+ <?ftui-if=( {( ReadingsVal("tempdevice","batteryok","") eq "ok" )} ) ?> ... <?ftui-else ?> ... <?ftui-endif ?>
<?ftui-loopinc="name" loopvariable=( loop-expression ) varname1="content1" ... varnameN="contentN" ?>