mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-08-26 15:02:50 +02:00
Code Issues Packages Projects Releases Wiki Activity

yWeb: add configurable screenshot timeout

Browse Source 
Origin commit data
------------------
Branch: ni/coolstream
Commit: 17851cffc0
Author: vanhofen <vanhofen@gmx.de>
Date: 2023-03-07 (Tue, 07 Mar 2023)

Origin message was:
------------------
- yWeb: add configurable screenshot timeout

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2023-03-07 22:32:17 +01:00
parent a159272861
commit 0ec76028eb
8 changed files with 25 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
data/y-web/Y_Blocks.txt
View File

@@ -25,6 +25,7 @@ start-block~yWeb_save_settings
{=ini-set:%(CONFIGDIR)/yWeb.conf;wol_desc_3;{=wol_desc_3=}~cache=}
{=ini-set:%(CONFIGDIR)/yWeb.conf;fb;{=fb=}~cache=}
{=ini-set:%(CONFIGDIR)/yWeb.conf;screenshot_rc;{=screenshot_rc=}~cache=}
{=ini-set:%(CONFIGDIR)/yWeb.conf;screenshot_timeout;{=screenshot_timeout=}~cache=}
{=ini-set:%(CONFIGDIR)/yWeb.conf;start_page;{=start_page=}~cache=}
{=ini-set:%(CONFIGDIR)/yWeb.conf;style;{=style=}~cache=}
{=ini-set:%(CONFIGDIR)/yWeb.conf;yweb_box_name;{=yweb_box_name=}~cache=}

25
data/y-web/Y_Settings_yWeb.yhtm
View File

@@ -26,7 +26,7 @@ function do_submit(){
}
}
function do_init(){
var val = "{=ini-get:/var/tuxbox/config/yWeb.conf;fb;0~open=}";
var val = "{=ini-get:%(CONFIGDIR)/yWeb.conf;fb;0~open=}";
var cst = (loadSyncURL("/control/info?hwinfo").indexOf("CST") > -1);
var fb_options = document.f.fb.getElementsByTagName("option");
for (var i = 0; i < fb_options.length; i++)
@@ -136,10 +136,24 @@ select {
<td colspan="3"><input type="text" name="yweb_box_color" size="8" value="{=ini-get:%(CONFIGDIR)/yWeb.conf;yweb_box_color=}"
title="{=L:set.yweb.box_color_desc=}"/></td>
</tr>
<tr><td class="y_form_header" colspan="4">{=L:bc.menue.screenshot=}</td></tr>
<tr>
<td>{=L:set.yweb.screenshot_rc=}</td>
<td colspan="3">
<input type="radio" name="screenshot_rc" value="false" />{=L:off=}&nbsp;
<input type="radio" name="screenshot_rc" value="true" />{=L:on=}
</td>
</tr>
<tr>
<td>{=L:set.yweb.screenshot_timeout=}</td>
<td colspan="3">
<input type="number" name="screenshot_timeout" size="3" min="0" max="180" value="{=ini-get:%(CONFIGDIR)/yWeb.conf;screenshot_timeout;15=}" title="{=L:set.yweb.screenshot_timeout=}"/>
</td>
</tr>
<tr><td class="y_form_header" colspan="4">{=L:others=}</td></tr>
<tr>
<td>{=L:set.yweb.remote=}</td>
<td>
<td colspan="3">
<select name="fb" title="{=L:remote=}">
<option value="{=var-get:_rc_dbox_philips=}">d-Box Philips</option>
<option value="{=var-get:_rc_dbox_nokia_old=}">d-Box Nokia (alt)</option>
@@ -173,11 +187,6 @@ select {
<option value="{=var-get:_rc_vuplus_duo=}">VU+ Duo</option>
</select>
</td>
<td>{=L:set.yweb.screenshot_rc=}</td>
<td>
<input type="radio" name="screenshot_rc" value="false" />{=L:off=}&nbsp;
<input type="radio" name="screenshot_rc" value="true" />{=L:on=}
</td>
</tr>
<tr>
<td>{=L:set.yweb.start_page=}</td>
@@ -193,7 +202,7 @@ select {
</tr>
<tr>
<td>Styles</td>
<td>
<td colspan="3">
<select name="style" title="Style">
{=script:Y_Tools style_get=}
</select>

2
data/y-web/Y_Tools_Screenshot.yhtm
View File

@@ -141,7 +141,7 @@ function do_reload(){
</div>
<div class="clear"></div>
<div class="right">
Reload: <input type="number" value="15" id="inputReload" min="1" max="180" title="{=L:bc.screenshot.reload_desc=}" disabled /> <input id="checkReload" name="checkReload" type="checkbox" />
Reload: <input type="number" value="{=ini-get:%(CONFIGDIR)/yWeb.conf;screenshot_timeout;15=}" id="inputReload" min="1" max="180" title="{=L:bc.screenshot.reload_desc=}" disabled /> <input id="checkReload" name="checkReload" type="checkbox" />
</div>
<div class="clear"></div>
</div>

2
data/y-web/Y_Tools_Screenshot_GraphLCD.yhtm
View File

@@ -62,7 +62,7 @@ function do_reload(){
</div>
<div class="clear"></div>
<div class="right">
Reload: <input type="number" value="15" id="inputReload" min="1" max="180" title="{=L:bc.screenshot.reload_desc=}" disabled /> <input id="checkReload" name="checkReload" type="checkbox" />
Reload: <input type="number" value="{=ini-get:%(CONFIGDIR)/yWeb.conf;screenshot_timeout;15=}" id="inputReload" min="1" max="180" title="{=L:bc.screenshot.reload_desc=}" disabled /> <input id="checkReload" name="checkReload" type="checkbox" />
</div>
<div class="clear"></div>
</div>

2
data/y-web/Y_Tools_Screenshot_LCD4Linux.yhtm
View File

@@ -25,7 +25,7 @@ function do_reload(){
<div id="screenshot_header">
<div id="buttons" style="display: block">
<div class="right">
Reload: <input type="number" value="15" id="inputReload" min="1" max="180" title="{=L:bc.screenshot.reload_desc=}" disabled /> <input id="checkReload" name="checkReload" type="checkbox" />
Reload: <input type="number" value="{=ini-get:%(CONFIGDIR)/yWeb.conf;screenshot_timeout;15=}" id="inputReload" min="1" max="180" title="{=L:bc.screenshot.reload_desc=}" disabled /> <input id="checkReload" name="checkReload" type="checkbox" />
</div>
<div class="clear"></div>
</div>

4
data/y-web/Y_Version.txt
View File

@@ -1,3 +1,3 @@
version=3.0.59
date=06.03.2023
version=3.0.60
date=07.03.2023
info=NI-Neutrino-Webinterface

1
data/y-web/languages/Deutsch
View File

@@ -306,6 +306,7 @@ set.yweb.box_color=Farbe
set.yweb.start_page=Startseite
set.yweb.remote=Fernbedienung
set.yweb.screenshot_rc=FB im Screenshot-Men&uuml;
set.yweb.screenshot_timeout=Screenshot-Timeout
# ===== Settings Picture viewer
set.pv.pictureviewer=Bildbetrachter

1
data/y-web/languages/English
View File

@@ -306,6 +306,7 @@ set.yweb.box_color=Color
set.yweb.start_page=Start page
set.yweb.remote=Remote
set.yweb.screenshot_rc=RC in screenshot menu
set.yweb.screenshot_timeout=Screenshot timeout
# ===== Settings Picture viewer
set.pv.pictureviewer=Pictureviewer