mhop/fhem
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

sortby auf vielfachen Wunsch hinzugefuegt

Browse Source 
git-svn-id: https://fhem.svn.sourceforge.net/svnroot/fhem/trunk/fhem@2902 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
rudolfkoenig
2013-03-12 19:02:34 +00:00
parent b0c4211d41
commit ac73932335
1 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
FHEM/01_FHEMWEB.pm
View File

@@ -127,6 +127,7 @@ FHEMWEB_Initialize($)
addToAttrList("webCmd"); addToAttrList("webCmd");
addToAttrList("icon"); addToAttrList("icon");
addToAttrList("devStateIcon"); addToAttrList("devStateIcon");
addToAttrList("sortby");
InternalTimer(time()+60, "FW_closeOldClients", 0, 0); InternalTimer(time()+60, "FW_closeOldClients", 0, 0);
$FW_dir = "$attr{global}{modpath}/www"; $FW_dir = "$attr{global}{modpath}/www";
@@ -1044,8 +1045,9 @@ FW_showRoom()
FW_pO "<tr><td>"; FW_pO "<tr><td>";
FW_pO "<table class=\"block wide\" id=\"TYPE_$g\">"; FW_pO "<table class=\"block wide\" id=\"TYPE_$g\">";
foreach my $d (sort { lc(AttrVal($a,"alias",$a)) cmp foreach my $d (sort { lc(AttrVal($a, "sortby", AttrVal($a,"alias",$a))) cmp
lc(AttrVal($b,"alias",$b)) } keys %{$group{$g}}) { lc(AttrVal($b, "sortby", AttrVal($b,"alias",$b))) }
keys %{$group{$g}}) {
my $type = $defs{$d}{TYPE}; my $type = $defs{$d}{TYPE};
FW_pF "\n<tr class=\"%s\">", ($row&1)?"odd":"even"; FW_pF "\n<tr class=\"%s\">", ($row&1)?"odd":"even";
@@ -2905,6 +2907,14 @@ FW_htmlEscape($)
</li> </li>
<br> <br>
<a name="sortby"></a>
<li>sortby<br>
Take the value of this attribute when sorting the devices in the room
overview instead of the alias, or if that is missing the devicename
itself.
</li>
<br>
<a name="devStateIcon"></a> <a name="devStateIcon"></a>
<li>devStateIcon<br> <li>devStateIcon<br>
First form:<br> First form:<br>
@@ -2919,13 +2929,13 @@ FW_htmlEscape($)
attr lamp devStateIcon on:closed off:open<br> attr lamp devStateIcon on:closed off:open<br>
attr lamp devStateIcon .*:noIcon<br> attr lamp devStateIcon .*:noIcon<br>
</ul> </ul>
</li>
</ul> </ul>
Second form:<br> Second form:<br>
<ul> <ul>
Perl regexp enclosed in {}. Example:<br> Perl regexp enclosed in {}. Example:<br>
{'&lt;div style="width:32px;height:32px;background-color:green"&gt;&lt;/div&gt;'} {'&lt;div style="width:32px;height:32px;background-color:green"&gt;&lt;/div&gt;'}
</ul> </ul>
</li>
<br> <br>
<a name="webCmd"></a> <a name="webCmd"></a>