FHEM/fhem-mirror
2
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-01-31 18:59:33 +00:00
Code Issues Releases Wiki Activity

new option nolinks

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@3880 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
justme-1968 2013-09-08 15:22:29 +00:00
parent ae8482245a
commit 55e17b0d8c
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
fhem/FHEM/33_readingsGroup.pm
View File

@ -17,7 +17,7 @@ sub readingsGroup_Initialize($)
$hash->{UndefFn} = "readingsGroup_Undefine"; $hash->{UndefFn} = "readingsGroup_Undefine";
#$hash->{SetFn} = "readingsGroup_Set"; #$hash->{SetFn} = "readingsGroup_Set";
$hash->{GetFn} = "readingsGroup_Get"; $hash->{GetFn} = "readingsGroup_Get";
$hash->{AttrList} = "nameIcons mapping separator style nameStyle valueStyle valueFormat timestampStyle noheading:1 notime:1 nostate:1"; $hash->{AttrList} = "nameIcons mapping separator style nameStyle valueStyle valueFormat timestampStyle noheading:1 nolinks:1 notime:1 nostate:1";
$hash->{FW_detailFn} = "readingsGroup_detailFn"; $hash->{FW_detailFn} = "readingsGroup_detailFn";
$hash->{FW_summaryFn} = "readingsGroup_detailFn"; $hash->{FW_summaryFn} = "readingsGroup_detailFn";
@ -148,6 +148,7 @@ readingsGroup_2html($)
my $d = $hash->{NAME}; my $d = $hash->{NAME};
my $show_heading = !AttrVal( $d, "noheading", "0" ); my $show_heading = !AttrVal( $d, "noheading", "0" );
my $show_links = !AttrVal( $d, "nolinks", "0" );
my $show_state = !AttrVal( $d, "nostate", "0" ); my $show_state = !AttrVal( $d, "nostate", "0" );
my $show_time = !AttrVal( $d, "notime", "0" ); my $show_time = !AttrVal( $d, "notime", "0" );
@ -178,7 +179,9 @@ readingsGroup_2html($)
my $row = 1; my $row = 1;
$ret .= "<table>"; $ret .= "<table>";
$ret .= "<tr><td><div class=\"devType\"><a href=\"/fhem?detail=$d\">".AttrVal($d, "alias", $d)."</a></div></td></tr>" if( $show_heading ); my $txt = AttrVal($d, "alias", $d);
$txt = "<a href=\"/fhem?detail=$d\">$txt</a>" if( $show_links );
$ret .= "<tr><td><div class=\"devType\">$txt</a></div></td></tr>" if( $show_heading );
$ret .= "<tr><td><table $style class=\"block wide\">"; $ret .= "<tr><td><table $style class=\"block wide\">";
foreach my $device (@{$devices}) { foreach my $device (@{$devices}) {
my $h = $defs{@{$device}[0]}; my $h = $defs{@{$device}[0]};
@ -251,7 +254,8 @@ readingsGroup_2html($)
$ret .= sprintf("<tr class=\"%s\">", ($row&1)?"odd":"even"); $ret .= sprintf("<tr class=\"%s\">", ($row&1)?"odd":"even");
$row++; $row++;
$ret .= "<td><div $name_style class=\"dname\"><a href=\"/fhem?detail=$name\">$txt</a></div></td>"; $txt = "<a href=\"/fhem?detail=$name\">$txt</a>" if( $show_links );
$ret .= "<td><div $name_style class=\"dname\">$txt</div></td>";
$ret .= "<td><div $value_style\">$v</div></td>"; $ret .= "<td><div $value_style\">$v</div></td>";
$ret .= "<td><div></div>$fmtDateTime</td>" if( $show_time ); $ret .= "<td><div></div>$fmtDateTime</td>" if( $show_time );
} }
@ -316,7 +320,8 @@ readingsGroup_2html($)
$ret .= sprintf("<tr class=\"%s\">", ($row&1)?"odd":"even"); $ret .= sprintf("<tr class=\"%s\">", ($row&1)?"odd":"even");
$row++; $row++;
$ret .= "<td><div $name_style class=\"dname\"><a href=\"/fhem?detail=$name\">$txt</a></div></td>"; $txt = "<a href=\"/fhem?detail=$name\">$txt</a>" if( $show_links );
$ret .= "<td><div $name_style class=\"dname\">$txt</div></td>";
$ret .= "<td><div $value_style informId=\"$d-$name.$n\">$v</div></td>"; $ret .= "<td><div $value_style informId=\"$d-$name.$n\">$v</div></td>";
$ret .= "<td><div $timestamp_style informId=\"$d-$name.$n-ts\">$t</div></td>" if( $show_time ); $ret .= "<td><div $timestamp_style informId=\"$d-$name.$n-ts\">$t</div></td>" if( $show_time );
} }
@ -532,6 +537,8 @@ readingsGroup_Get($@)
<ul> <ul>
<li>noheading<br> <li>noheading<br>
If set to 1 the readings table will have no heading.</li> If set to 1 the readings table will have no heading.</li>
<li>nolinks<br>
Disables the html links from the heading and the reading names.</li>
<li>nostate<br> <li>nostate<br>
If set to 1 the state reading is excluded.</li> If set to 1 the state reading is excluded.</li>
<li>notime<br> <li>notime<br>