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

FHEMWEB: defaultRoom attribute by Happy Fhem User

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@4977 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
rudolfkoenig
2014-02-17 20:06:51 +00:00
parent 9f4f22e749
commit 29f21c78b0
1 changed files with 30 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
fhem/FHEM/01_FHEMWEB.pm
View File

@@ -125,6 +125,7 @@ FHEMWEB_Initialize($)
basicAuth basicAuth
basicAuthMsg basicAuthMsg
column column
defaultRoom
endPlotNow:1,0 endPlotNow:1,0
endPlotToday:1,0 endPlotToday:1,0
fwcompress:0,1 fwcompress:0,1
@@ -656,11 +657,19 @@ FW_answerCall($)
elsif($FW_detail) { FW_doDetail($FW_detail); } elsif($FW_detail) { FW_doDetail($FW_detail); }
elsif($FW_room) { FW_showRoom(); } elsif($FW_room) { FW_showRoom(); }
elsif(!$FW_cmdret && elsif(!$FW_cmdret &&
!$FW_contentFunc && !$FW_contentFunc) {
AttrVal("global", "motd", "none") ne "none") {
my $motd = AttrVal("global","motd",undef); $FW_room = AttrVal($FW_wname, "defaultRoom", '');
$motd =~ s/\n/<br>/g; if($FW_room ne '') {
FW_pO "<div id=\"content\">$motd</div>"; FW_showRoom();
} else {
my $motd = AttrVal("global","motd",undef);
if(defined($motd)) {
$motd =~ s/\n/<br>/g;
FW_pO "<div id=\"content\">$motd</div>";
}
}
} }
FW_pO "</body></html>"; FW_pO "</body></html>";
return 0; return 0;
@@ -2756,6 +2765,14 @@ FW_ActivateInform()
attr WEB sortRooms DG OG EG Keller attr WEB sortRooms DG OG EG Keller
</li> </li>
<br> <br>
<a name="defaultRoom"></a>
<li>defaultRoom<br>
show the specified room if no room selected, e.g. on execution of some
commands. If set hides the <a href="#motd">motd</a>. Example:<br>
attr WEB defaultRoom Zentrale
</li>
<br>
<a name="sortby"></a> <a name="sortby"></a>
<li>sortby<br> <li>sortby<br>
@@ -3222,6 +3239,14 @@ FW_ActivateInform()
attr WEB sortRooms DG OG EG Keller attr WEB sortRooms DG OG EG Keller
</li><br> </li><br>
<a name="defaultRoom"></a>
<li>defaultRoom<br>
Zeigt den angegebenen Raum an falls kein Raum explizit ausgew&auml;hlt
wurde. Achtung: falls gesetzt, wird motd nicht mehr angezeigt.
Beispiel:<br>
attr WEB defaultRoom Zentrale
</li><br>
<a name="sortby"></a> <a name="sortby"></a>
<li>sortby<br> <li>sortby<br>
Der Wert dieses Attributs wird zum sortieren von Ger&auml;ten in Der Wert dieses Attributs wird zum sortieren von Ger&auml;ten in