mirror of
https://github.com/fhem/fhem-mirror.git
synced 2025-01-31 06:39:11 +00:00
49_SSCamSTRM: new attribute "noLink" - suppress link to detail view
git-svn-id: https://svn.fhem.de/fhem/trunk@20198 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
nasseeder1
parent
5c9ed9df0c
commit
9a696739ac
@ -1,5 +1,6 @@
|
||||
# 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.
|
||||
- feature: 49_SSCamSTRM: new attribute "noLink" - suppress link to detail view
|
||||
- bugfix: 49_SSCam: fix warnings, Forum: 45671#msg975610
|
||||
- change: 70_ZoneMinder: improved contents of state (thx Florian_GT)
|
||||
- change: 95_Dashboard: attr dashboard_activetab is now working as designed,
|
||||
|
||||
@ -48,6 +48,7 @@ eval "use FHEM::Meta;1" or my $modMetaAbsent = 1;
|
||||
|
||||
# Versions History intern
|
||||
our %SSCam_vNotesIntern = (
|
||||
"8.18.2" => "19.09.2019 sample streams changed in comref, support of attr noLink in Streaming-Device ",
|
||||
"8.18.1" => "18.09.2019 fix warnings, Forum: https://forum.fhem.de/index.php/topic,45671.msg975610.html#msg975610 ",
|
||||
"8.18.0" => "13.09.2019 change usage of own hashes to central %data hash, release unnecessary allocated memory ",
|
||||
"8.17.0" => "12.09.2019 fix warnings, support hide buttons in streaming device, change handle delete SNAPHASHOLD ",
|
||||
@ -164,6 +165,7 @@ our %SSCam_vNotesIntern = (
|
||||
|
||||
# Versions History extern
|
||||
our %SSCam_vNotesExtern = (
|
||||
"8.18.2" => "19.09.2019 SSCam supports the new attribute \"noLink\" in streaming devices ",
|
||||
"8.15.0" => "09.07.2019 support of integrating Streaming-Devices in a SSCam FTUI widget ",
|
||||
"8.14.0" => "01.06.2019 In detailview are buttons provided to open the camera native setup screen or Synology Surveillance Station and the Synology Surveillance Station online help. ",
|
||||
"8.12.0" => "25.03.2019 Delay FHEM shutdown as long as sessions are not terminated, but not longer than global attribute \"maxShutdownDelay\". ",
|
||||
@ -7250,6 +7252,7 @@ sub SSCam_StreamDev($$$;$) {
|
||||
|
||||
my $alias = AttrVal($strmdev, "alias", $strmdev); # Linktext als Aliasname oder Devicename setzen
|
||||
my $dlink = "<a href=\"/fhem?detail=$strmdev\">$alias</a>";
|
||||
$dlink = $alias if(AttrVal($strmdev, "noLink", 0)); # keine Links im Stream-Dev generieren
|
||||
|
||||
my $StmKey = ReadingsVal($camname,"StmKey",undef);
|
||||
|
||||
@ -7735,7 +7738,11 @@ sub SSCam_composegallery ($;$$$) {
|
||||
$uuid = $streamHash->{FUUID}; # eindeutige UUID des Streamingdevices
|
||||
delete $streamHash->{HELPER}{STREAM};
|
||||
$alias = AttrVal($strmdev, "alias", $strmdev); # Linktext als Aliasname oder Devicename setzen
|
||||
$dlink = "<a href=\"/fhem?detail=$strmdev\">$alias</a>";
|
||||
if(AttrVal($strmdev, "noLink", 0)) {
|
||||
$dlink = $alias; # keine Links im Stream-Dev generieren
|
||||
} else {
|
||||
$dlink = "<a href=\"/fhem?detail=$strmdev\">$alias</a>";
|
||||
}
|
||||
}
|
||||
|
||||
my $cmddosnap = "FW_cmd('$FW_ME$FW_subdir?XHR=1&cmd=set $name snap 1 2 STRM:$uuid')"; # Snapshot auslösen mit Kennzeichnung "by STRM-Device"
|
||||
@ -10615,10 +10622,13 @@ attr <name> genericStrmHtmlTag <img $HTMLATTR
|
||||
|
||||
<ul>
|
||||
<b>Examples:</b><br>
|
||||
attr <name> hlsStrmObject https://video-dev.github.io/streams/x36xhzz/x36xhzz.m3u8 <br>
|
||||
# a video stream used for testing the streaming device function (internet connection is needed) <br><br>
|
||||
attr <name> hlsStrmObject https://bitdash-a.akamaihd.net/content/MI201109210084_1/m3u8s/f08e80da-bf1d-4e3d-8899-f0f6155f6efa.m3u8 <br>
|
||||
attr <name> hlsStrmObject https://bitdash-a.akamaihd.net/content/sintel/hls/playlist.m3u8 <br>
|
||||
# Sample video streams used for testing the streaming device function (internet connection is needed) <br><br>
|
||||
|
||||
attr <name> hlsStrmObject http://192.168.2.10:32000/CamHE1.m3u8 <br>
|
||||
# playback a HLS video stream of a camera witch is delivered by e.g. a ffmpeg conversion process <br><br>
|
||||
|
||||
attr <name> hlsStrmObject http://192.168.2.10:32000/$NAME.m3u8 <br>
|
||||
# Same as example above, but use the replacement with variable $NAME for "CamHE1"
|
||||
</ul>
|
||||
@ -12431,10 +12441,13 @@ attr <name> genericStrmHtmlTag <img $HTMLATTR
|
||||
|
||||
<ul>
|
||||
<b>Beispiele:</b><br>
|
||||
attr <name> hlsStrmObject https://video-dev.github.io/streams/x36xhzz/x36xhzz.m3u8 <br>
|
||||
# ein Beispielstream der zum Test des Streaming Devices verwendet werden kann (Internetverbindung nötig) <br><br>
|
||||
attr <name> hlsStrmObject https://bitdash-a.akamaihd.net/content/MI201109210084_1/m3u8s/f08e80da-bf1d-4e3d-8899-f0f6155f6efa.m3u8 <br>
|
||||
attr <name> hlsStrmObject https://bitdash-a.akamaihd.net/content/sintel/hls/playlist.m3u8 <br>
|
||||
# Beispielstreams der zum Test des Streaming Devices verwendet werden kann (Internetverbindung nötig) <br><br>
|
||||
|
||||
attr <name> hlsStrmObject http://192.168.2.10:32000/CamHE1.m3u8 <br>
|
||||
# Wiedergabe eines Kamera HLS-Streams der z.B. durch ffmpeg bereitgestellt wird <br><br>
|
||||
|
||||
attr <name> hlsStrmObject http://192.168.2.10:32000/$NAME.m3u8 <br>
|
||||
# Wie obiges Beispiel mit der Variablennutzung für "CamHE1"
|
||||
</ul>
|
||||
|
||||
@ -35,6 +35,7 @@ eval "use FHEM::Meta;1" or my $modMetaAbsent = 1;
|
||||
|
||||
# Versions History intern
|
||||
our %SSCamSTRM_vNotesIntern = (
|
||||
"2.9.0" => "19.09.2019 new attribute noLink ",
|
||||
"2.8.0" => "09.09.2019 new attribute hideFooter ",
|
||||
"2.7.0" => "15.07.2019 FTUI support, new attributes htmlattrFTUI, hideDisplayNameFTUI, ptzButtonSize, ptzButtonSizeFTUI ",
|
||||
"2.6.0" => "21.06.2019 GetFn -> get <name> html ",
|
||||
@ -87,6 +88,7 @@ sub SSCamSTRM_Initialize($) {
|
||||
"hideDisplayName:1,0 ".
|
||||
"hideDisplayNameFTUI:1,0 ".
|
||||
"hideButtons:1,0 ".
|
||||
"noLink:1,0 ".
|
||||
"popupWindowSize ".
|
||||
"popupStreamFW:$fwd ".
|
||||
"popupStreamTo:OK,1,2,3,4,5,6,7,8,9,10,15,20,25,30,40,50,60 ".
|
||||
@ -569,6 +571,12 @@ attr <name> genericStrmHtmlTag <img $HTMLATTR
|
||||
</li>
|
||||
<br>
|
||||
|
||||
<a name="noLink"></a>
|
||||
<li><b>noLink</b><br>
|
||||
The device name or alias doesn't contain a link to the detail device view.
|
||||
</li>
|
||||
<br>
|
||||
|
||||
<a name="popupStreamFW"></a>
|
||||
<li><b>popupStreamFW</b><br>
|
||||
You can specify a particular FHEMWEB device whose active browser pages should open a popup window by the
|
||||
@ -800,6 +808,12 @@ attr <name> genericStrmHtmlTag <img $HTMLATTR
|
||||
</li>
|
||||
<br>
|
||||
|
||||
<a name="noLink"></a>
|
||||
<li><b>noLink</b><br>
|
||||
Der Devicename oder Alias enthält keinen Link zur Detailansicht.
|
||||
</li>
|
||||
<br>
|
||||
|
||||
<a name="popupStreamFW"></a>
|
||||
<li><b>popupStreamFW</b><br>
|
||||
Es kann mit diesem Attribut das FHEMWEB-Device bestimmt werden, auf dessen Browserseiten sich Popup-Fenster mit
|
||||
|
||||
Loading…
Reference in New Issue
Block a user