diff --git a/data/y-web/Y_Blocks.txt b/data/y-web/Y_Blocks.txt index 1954cbf94..ecf2b20bc 100644 --- a/data/y-web/Y_Blocks.txt +++ b/data/y-web/Y_Blocks.txt @@ -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=} diff --git a/data/y-web/Y_Settings_yWeb.yhtm b/data/y-web/Y_Settings_yWeb.yhtm index 9d1996df6..4232d8841 100644 --- a/data/y-web/Y_Settings_yWeb.yhtm +++ b/data/y-web/Y_Settings_yWeb.yhtm @@ -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 { + {=L:bc.menue.screenshot=} + + {=L:set.yweb.screenshot_rc=} + + {=L:off=}  + {=L:on=} + + + + {=L:set.yweb.screenshot_timeout=} + + + + {=L:others=} {=L:set.yweb.remote=} - + - {=L:set.yweb.screenshot_rc=} - - {=L:off=}  - {=L:on=} - {=L:set.yweb.start_page=} @@ -193,7 +202,7 @@ select { Styles - + diff --git a/data/y-web/Y_Tools_Screenshot.yhtm b/data/y-web/Y_Tools_Screenshot.yhtm index 03c96809d..afd1d8df4 100644 --- a/data/y-web/Y_Tools_Screenshot.yhtm +++ b/data/y-web/Y_Tools_Screenshot.yhtm @@ -141,7 +141,7 @@ function do_reload(){
- Reload: + Reload:
diff --git a/data/y-web/Y_Tools_Screenshot_GraphLCD.yhtm b/data/y-web/Y_Tools_Screenshot_GraphLCD.yhtm index e9bac4225..8f6783fe1 100644 --- a/data/y-web/Y_Tools_Screenshot_GraphLCD.yhtm +++ b/data/y-web/Y_Tools_Screenshot_GraphLCD.yhtm @@ -62,7 +62,7 @@ function do_reload(){
- Reload: + Reload:
diff --git a/data/y-web/Y_Tools_Screenshot_LCD4Linux.yhtm b/data/y-web/Y_Tools_Screenshot_LCD4Linux.yhtm index 37b8c0a03..d0ff740d1 100644 --- a/data/y-web/Y_Tools_Screenshot_LCD4Linux.yhtm +++ b/data/y-web/Y_Tools_Screenshot_LCD4Linux.yhtm @@ -25,7 +25,7 @@ function do_reload(){
- Reload: + Reload:
diff --git a/data/y-web/Y_Version.txt b/data/y-web/Y_Version.txt index 9bfad753d..27fd120f9 100644 --- a/data/y-web/Y_Version.txt +++ b/data/y-web/Y_Version.txt @@ -1,3 +1,3 @@ -version=3.0.59 -date=06.03.2023 +version=3.0.60 +date=07.03.2023 info=NI-Neutrino-Webinterface diff --git a/data/y-web/languages/Deutsch b/data/y-web/languages/Deutsch index de89cdeb5..e165f1cad 100644 --- a/data/y-web/languages/Deutsch +++ b/data/y-web/languages/Deutsch @@ -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ü +set.yweb.screenshot_timeout=Screenshot-Timeout # ===== Settings Picture viewer set.pv.pictureviewer=Bildbetrachter diff --git a/data/y-web/languages/English b/data/y-web/languages/English index 00a788678..c377cd4d2 100644 --- a/data/y-web/languages/English +++ b/data/y-web/languages/English @@ -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