From df93ad82bafc26d2f272cbb7be2751cc9aa768b2 Mon Sep 17 00:00:00 2001 From: vanhofen Date: Tue, 6 Sep 2016 17:03:31 +0200 Subject: [PATCH] yWeb: allow screenshot page as start page Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/75639e6e698f540471dcc38d544e43514648ae80 Author: vanhofen Date: 2016-09-06 (Tue, 06 Sep 2016) Origin message was: ------------------ - yWeb: allow screenshot page as start page ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- src/nhttpd/web/Y_Blocks.txt | 12 ++++++++++-- src/nhttpd/web/Y_Settings_yWeb.yhtm | 4 +++- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/src/nhttpd/web/Y_Blocks.txt b/src/nhttpd/web/Y_Blocks.txt index 6ecaa3aad..7f08329f7 100644 --- a/src/nhttpd/web/Y_Blocks.txt +++ b/src/nhttpd/web/Y_Blocks.txt @@ -374,6 +374,7 @@ function do_submit() + @@ -446,9 +447,16 @@ start-block~frame_boxcontrol ~ {=if-equal:{=var-get:startpage=}~control~Y_Tools_Boxcontrol.yhtm ~ - {=if-equal:{=var-get:startpage=}~remote~Y_Tools_Rcsim.yhtm~Y_NI_blank.yhtm=} + {=if-equal:{=var-get:startpage=}~remote~Y_Tools_Rcsim.yhtm + ~ + {=if-equal:{=var-get:startpage=}~screenshot~Y_Tools_Screenshot.yhtm?osd=1 + ~ + Y_NI_blank.yhtm + =} + =} =} - =}=} + =} +=} {=include-block:Y_Blocks.txt;frame_secondary=} end-block~frame_boxcontrol diff --git a/src/nhttpd/web/Y_Settings_yWeb.yhtm b/src/nhttpd/web/Y_Settings_yWeb.yhtm index 6f4c4b2af..864947720 100644 --- a/src/nhttpd/web/Y_Settings_yWeb.yhtm +++ b/src/nhttpd/web/Y_Settings_yWeb.yhtm @@ -48,11 +48,12 @@ function do_init(){ document.f.fb.selectedIndex = sel; obj_set_radio_value('screenshot_rc', "{=ini-get:/var/tuxbox/config/Y-Web.conf;screenshot_rc;false~cache=}"); val = "{=ini-get:/var/tuxbox/config/Y-Web.conf;start_page;bouquets~cache=}"; - var sel=3; + var sel=4; switch(val){ case "bouquets": sel=0; break; case "control": sel=1; break; case "remote": sel=2; break; + case "screenshot": sel=3; break; } document.f.start_page.selectedIndex = sel; style_old = "{=ini-get:/var/tuxbox/config/Y-Web.conf;style~cache=}"; @@ -171,6 +172,7 @@ select { +