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

01_FHEMWEB.pm: add local title attribute, and eval it (Forum #48668)

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@10712 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
rudolfkoenig 2016-02-03 16:38:46 +00:00
parent 3df9076119
commit 758ac144c0
3 changed files with 21 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
fhem/FHEM/01_FHEMWEB.pm
View File

@ -175,6 +175,7 @@ FHEMWEB_Initialize($)
smallscreen:unused
smallscreenCommands:0,1
stylesheetPrefix
title
touchpad:unused
webname
);
@ -774,7 +775,10 @@ FW_answerCall($)
$FW_lastHashUpdate = $lastDefChange;
}
my $t = AttrVal("global", "title", "Home, Sweet Home");
my $t = AttrVal($FW_wname, "title",
AttrVal("global", "title", "Home, Sweet Home"));
$t = eval $t if($t =~ m/^{.*}$/s); # Forum #48668
FW_pO '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" '.
'"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">';
@ -3426,6 +3430,11 @@ FW_widgetOverride($$)
See also the clearSvgCache command for clearing the cache.
</li><br>
<a name="title"></a>
<li>title<br>
Sets the title of the page. If enclosed in {} the content is evaluated.
</li><br>
<a name="webCmd"></a>
<li>webCmd<br>
Colon separated list of commands to be shown in the room overview for a
@ -4104,6 +4113,12 @@ FW_widgetOverride($$)
Siehe den clearSvgCache Befehl um diese Daten zu l&ouml;schen.
</li><br>
<a name="title"></a>
<li>title<br>
Setzt den Titel der Seite. Falls in {} eingeschlossen, dann wird es
als Perl Ausdruck evaluiert.
</li><br>
<a name="webCmd"></a>
<li>webCmd<br>
Durch Doppelpunkte getrennte Auflistung von Befehlen, die f&uuml;r ein

9
fhem/docs/commandref_frame.html
View File

@ -1413,7 +1413,7 @@ The following local attributes are used by a wider range of devices:
shutdown.
</li><br>
<li><a href="#fheminfo">sendStatistics</a>
<li><a href="#fheminfo">sendStatistics</a><br>
<a name="statefile"></a>
<li>statefile<br>
@ -1422,12 +1422,9 @@ The following local attributes are used by a wider range of devices:
no information will be saved.
</li><br>
<a name="title"></a>
<li>title<br>
Used by the web frontend fhemweb.pl (webpgm2) as a Page title.
</li><br>
<li><a href="#title">title</a><br>
<li><a href="#fheminfo">uniqueID</a>
<li><a href="#fheminfo">uniqueID</a><br>
<a name="userattr"></a>
<li>userattr<br>

8
fhem/docs/commandref_frame_DE.html
View File

@ -1455,7 +1455,7 @@ Die folgenden lokalen Attribute werden von mehreren Ger&auml;ten verwendet:
gel&ouml;scht.
</li><br>
<li><a href="#fheminfo">sendStatistics</a>
<li><a href="#fheminfo">sendStatistics</a><br>
<a name="statefile"></a>
<li>statefile<br>
@ -1465,11 +1465,7 @@ Die folgenden lokalen Attribute werden von mehreren Ger&auml;ten verwendet:
werden keinerlei Informationen gesichert.
</li><br>
<a name="title"></a>
<li>title<br>
Das Attribut &quot;title&quot; wird unter dem Frontend fhemweb.pl (webpgm2) zur
Festlegung des Seitentitels benutzt..
</li><br>
<li><a href="#title">title</a><br>
<li><a href="#fheminfo">uniqueID</a>