From 53fcbad24e538a7c26d3d26e997bf1ac327615b8 Mon Sep 17 00:00:00 2001 From: yjogol Date: Fri, 26 Feb 2010 06:39:35 +0000 Subject: [PATCH] yweb: fix setting of default Remote to coolstream. fix save of remote type (settings->yweb) (ybug 454) git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@421 e54a6e83-5905-42d5-8d5c-058d10e6a962 --- src/nhttpd/web/Y_Blocks.txt | 3 ++- src/nhttpd/web/Y_Settings_yWeb.yhtm | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/nhttpd/web/Y_Blocks.txt b/src/nhttpd/web/Y_Blocks.txt index ae15e8105..53bfd6643 100644 --- a/src/nhttpd/web/Y_Blocks.txt +++ b/src/nhttpd/web/Y_Blocks.txt @@ -435,7 +435,8 @@ end-block~frame_live_epg # ------- Remote start-block~remote -{=if-equal:Nokia~{=if-equal:{=ini-get:/var/tuxbox/config/Y-Web.conf;fb;default=}~default~{=func:get_boxtype=}~{=ini-get:/var/tuxbox/config/Y-Web.conf;fb;default=}=}~{=include-block:Y_Blocks.txt;remote_standard=}~{=if-equal:{=ini-get:/var/tuxbox/config/Y-Web.conf;fb;default=}~Sagem~{=include-block:Y_Blocks.txt;remote_sagem=}~{=include-block:Y_Blocks.txt;remote_coolstream=}=}=} +{=var-set:defaultfb={=if-equal:{=global-var-get:boxtype=}~coolstream~Coolstream~default=}=} +{=if-equal:Nokia~{=if-equal:{=ini-get:/var/tuxbox/config/Y-Web.conf;fb;{=var-get:defaultfb=}=}~default~{=func:get_boxtype=}~{=ini-get:/var/tuxbox/config/Y-Web.conf;fb;{=var-get:defaultfb=}=}=}~{=include-block:Y_Blocks.txt;remote_standard=}~{=if-equal:{=ini-get:/var/tuxbox/config/Y-Web.conf;fb;default=}~Sagem~{=include-block:Y_Blocks.txt;remote_sagem=}~{=include-block:Y_Blocks.txt;remote_coolstream=}=}=} end-block~remote # ------- Remote diff --git a/src/nhttpd/web/Y_Settings_yWeb.yhtm b/src/nhttpd/web/Y_Settings_yWeb.yhtm index 3da2f0e75..6703c1ec6 100644 --- a/src/nhttpd/web/Y_Settings_yWeb.yhtm +++ b/src/nhttpd/web/Y_Settings_yWeb.yhtm @@ -9,11 +9,12 @@ function do_submit(){ document.f.submit(); } function do_init(){ - val = "{=ini-get:/var/tuxbox/config/Y-Web.conf;fb;default~open=}"; + val = "{=ini-get:/var/tuxbox/config/Y-Web.conf;fb;{=if-equal:{=global-var-get:boxtype=}~coolstream~Coolstream~default=}~open=}"; var sel=2; switch(val){ case "default": sel=0; break; case "Nokia": sel=1; break; + case "Coolstream": sel=3; break; } document.f.fb.selectedIndex = sel; val = "{=ini-get:/var/tuxbox/config/Y-Web.conf;start_page;bouquets~cache=}";