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

allow <br> for line breaks in multi-reading lines

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@4488 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
justme-1968 2013-12-28 11:51:48 +00:00
parent 803ae3885f
commit 9beb47e56b
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
fhem/CHANGED
View File

@ -1,7 +1,8 @@
# 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.
- SVN - SVN
- feature: readingsGroup: process events only if visible in browser - feature: readingsGroup: process events only if visible in browser,
allow <br> for line breaks in multi-reading lines
- feature: FLOORPLAN: Style4 (S300TH specific) now keeps its formatting - feature: FLOORPLAN: Style4 (S300TH specific) now keeps its formatting
even with longpoll; Text "desiredTemperature" will now even with longpoll; Text "desiredTemperature" will now
be eliminated - for MAX devices. be eliminated - for MAX devices.

11
fhem/FHEM/33_readingsGroup.pm
View File

@ -324,7 +324,12 @@ readingsGroup_2html($)
my $name_style = lookup2($name_style,$name,$1,undef); my $name_style = lookup2($name_style,$name,$1,undef);
if( $first || $multi == 1 ) { if( $txt eq 'br' ) {
$ret .= sprintf("<tr class=\"%s\">", ($row-1&1)?"odd":"even");
$ret .= "<td><div $name_style class=\"dname\"></div></td>";
$first = 0;
next;
} elsif( $first || $multi == 1 ) {
$ret .= sprintf("<tr class=\"%s\">", ($row&1)?"odd":"even"); $ret .= sprintf("<tr class=\"%s\">", ($row&1)?"odd":"even");
$row++; $row++;
@ -698,8 +703,8 @@ readingsGroup_Get($@)
<li>If regex starts with a '+' it will be matched against the internal values of the device instead of the readings.</li> <li>If regex starts with a '+' it will be matched against the internal values of the device instead of the readings.</li>
<li>If regex starts with a '?' it will be matched against the attributes of the device instead of the readings.</li> <li>If regex starts with a '?' it will be matched against the attributes of the device instead of the readings.</li>
<li>regex can be of the form &lt;STRING&gt; or &lt;{perl}[#readings]&gt; where STRING or the string returned by perl is <li>regex can be of the form &lt;STRING&gt; or &lt;{perl}[#readings]&gt; where STRING or the string returned by perl is
inserted as the reading. skipped if STRING is undef. if readings is given the perl expression will be reevaluated inserted as the reading. skipped if STRING is undef. if STRING is br a new line will be started. if readings is
during longpoll updates.</li> given the perl expression will be reevaluated during longpoll updates.</li>
<li>For internal values and attributes longpoll update is not possible. Refresh the page to update the values.</li> <li>For internal values and attributes longpoll update is not possible. Refresh the page to update the values.</li>
<li>the &lt;{perl}&gt; expression is limited to expressions without a space. it is best just to call a small sub <li>the &lt;{perl}&gt; expression is limited to expressions without a space. it is best just to call a small sub
in 99_myUtils.pm instead of having a compex expression in the define.</li> in 99_myUtils.pm instead of having a compex expression in the define.</li>