diff --git a/src/nhttpd/web/Y_Blocks.txt b/src/nhttpd/web/Y_Blocks.txt index 7894b0ca4..df2f9b83c 100644 --- a/src/nhttpd/web/Y_Blocks.txt +++ b/src/nhttpd/web/Y_Blocks.txt @@ -496,19 +496,92 @@ end-block~frame_live_epg # ------- Remote start-block~remote -{=if-equal:CST Neo SAT~{=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_neo=}~ - {=if-equal:{=func:get_boxtype=}~CST Neo CABLE~{=include-block:Y_Blocks.txt;remote_neo=}~ - {=if-equal:{=func:get_boxtype=}~CST Zee SAT~{=include-block:Y_Blocks.txt;remote_zee=}~ - {=if-equal:{=func:get_boxtype=}~CST Zee CABLE~{=include-block:Y_Blocks.txt;remote_zee=}~ - {=if-equal:{=func:get_boxtype=}~CST Neo Twin SAT~{=include-block:Y_Blocks.txt;remote_zee=}~ - {=if-equal:{=func:get_boxtype=}~CST Neo Twin CABLE~{=include-block:Y_Blocks.txt;remote_zee=}~ -{=include-block:Y_Blocks.txt;remote_hd1=}=}=}=}=}=}=} +{=var-set:nfbtype={=ini-get:/var/tuxbox/config/neutrino.conf;remote_control_hardware=}=} +{=var-set:yfbtype={=ini-get:/var/tuxbox/config/Y-Web.conf;fb;0=}=} +{=var-set:boxtype={=func:get_boxtype=}=} +{=if-equal:{=var-get:yfbtype=}~0~ + {=if-equal:{=var-get:nfbtype=}~2~ {=include-block:Y_Blocks.txt;rc_dbox_philips=}~ + {=if-equal:{=var-get:nfbtype=}~1~ {=include-block:Y_Blocks.txt;rc_dbox_nokia_old=}~ + {=if-equal:{=var-get:boxtype=}~CST Neo SAT~ {=include-block:Y_Blocks.txt;rc_cst_v2=}~ + {=if-equal:{=var-get:boxtype=}~CST Neo CABLE~ {=include-block:Y_Blocks.txt;rc_cst_v2=}~ + {=if-equal:{=var-get:boxtype=}~CST Zee SAT~ {=include-block:Y_Blocks.txt;rc_cst_v3=}~ + {=if-equal:{=var-get:boxtype=}~CST Zee CABLE~ {=include-block:Y_Blocks.txt;rc_cst_v3=}~ + {=if-equal:{=var-get:boxtype=}~CST Neo Twin SAT~ {=include-block:Y_Blocks.txt;rc_cst_v3=}~ {=comment:todo! rc version 4 ~=} + {=if-equal:{=var-get:boxtype=}~CST Neo Twin CABLE~ {=include-block:Y_Blocks.txt;rc_cst_v3=}~ {=comment:todo! rc version 4 ~=} + + {=comment:fallback~=} {=include-block:Y_Blocks.txt;rc_cst_v1=} + =}=}=}=}=}=} + =}=} +~ + {=if-equal:{=var-get:yfbtype=}~-2~ {=include-block:Y_Blocks.txt;rc_dbox_philips=}~ + {=if-equal:{=var-get:yfbtype=}~-1~ {=include-block:Y_Blocks.txt;rc_dbox_nokia_old=}~ + {=if-equal:{=var-get:yfbtype=}~1~ {=include-block:Y_Blocks.txt;rc_cst_v1=}~ + {=if-equal:{=var-get:yfbtype=}~2~ {=include-block:Y_Blocks.txt;rc_cst_v2=}~ + {=if-equal:{=var-get:yfbtype=}~3~ {=include-block:Y_Blocks.txt;rc_cst_v3=}~ + {=if-equal:{=var-get:yfbtype=}~4~ {=include-block:Y_Blocks.txt;rc_cst_v3=}~ {=comment:todo! rc version 4 ~=} + + {=comment:fallback~=} {=include-block:Y_Blocks.txt;rc_cst_hd1=} + =}=}=}=}=}=} +=} end-block~remote -# ------- Remote Coolstream Neo -start-block~remote_neo - - +# ------ Remote CST V1 (HD1 / BSE) +start-block~rc_cst_v1 +remote + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +end-block~rc_cst_v1 + +# ------- Remote CST V2 (NEO) +start-block~rc_cst_v2 +remote + @@ -557,12 +630,12 @@ start-block~remote_neo -end-block~remote_neo +end-block~rc_cst_v2 -# ------ Remote Coolstream ZEE -start-block~remote_zee - - +# ------ Remote CST V3 (ZEE, NEO2) +start-block~rc_cst_v3 +remote + @@ -612,57 +685,70 @@ start-block~remote_zee -end-block~remote_zee +end-block~rc_cst_v3 -# ------ Remote Coolstream HD1 -start-block~remote_hd1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +# ------- Remote d-Box Nokia old +start-block~rc_dbox_nokia_old +remote + + + + + + + + + + + + + + + + + + + + + + + + + + + -end-block~remote_hd1 +end-block~rc_dbox_nokia_old + +# ------- Remote d-Box Philips/Sagem +start-block~rc_dbox_philips +remote + + + + + + + + + + + + + + + + + + + + + + + + + + + + +end-block~rc_dbox_philips diff --git a/src/nhttpd/web/Y_Settings_yWeb.yhtm b/src/nhttpd/web/Y_Settings_yWeb.yhtm index bc7e396d9..0be09d97a 100644 --- a/src/nhttpd/web/Y_Settings_yWeb.yhtm +++ b/src/nhttpd/web/Y_Settings_yWeb.yhtm @@ -9,12 +9,20 @@ function do_submit(){ document.f.submit(); } function do_init(){ - val = "{=ini-get:/var/tuxbox/config/Y-Web.conf;fb;{=if-equal:{=global-var-get:boxtype=}~coolstream~Coolstream~default=}~open=}"; + val = "{=ini-get:/var/tuxbox/config/Y-Web.conf;fb;0~open=}"; var sel=2; switch(val){ - case "default": sel=0; break; - case "Nokia": sel=1; break; - case "CST": sel=3; break; + case "-2": // d-box philips + case "-1": // d-box nokia old + case "0": // auto + case "1": // cst hd1/bse + case "2": // cst neo + case "3": // cst zee/neo2 + case "4": // cst neo twin (todo!) + sel=(sel*1+val*1); + break; + default: + break; } document.f.fb.selectedIndex = sel; val = "{=ini-get:/var/tuxbox/config/Y-Web.conf;start_page;bouquets~cache=}"; @@ -78,12 +86,17 @@ function do_init(){ {=L:others=} {=L:set.yweb.remote=} - + + + {=L:set.yweb.start_page=} diff --git a/src/nhttpd/web/Y_Version.txt b/src/nhttpd/web/Y_Version.txt index 92c58e2c6..fd3d4cd20 100644 --- a/src/nhttpd/web/Y_Version.txt +++ b/src/nhttpd/web/Y_Version.txt @@ -1,4 +1,4 @@ -version=2.8.0.33 -date=06.02.2013 +version=2.8.0.34 +date=24.06.2013 type=Release info=Port CST diff --git a/src/nhttpd/web/images/LICENSE b/src/nhttpd/web/images/LICENSE index c98e4bd19..71f5be81e 100644 --- a/src/nhttpd/web/images/LICENSE +++ b/src/nhttpd/web/images/LICENSE @@ -1,7 +1,7 @@ Same pictures used are form the Tuxbox Community: Published under GPL v2 -- rc.jpg : Jonny Spitzner -- rc_sagem.jpg Jonny Spitzner +- rc_dbox_nokia_old.jpg : Jonny Spitzner +- rc_dbox_philips.jpg : Jonny Spitzner - tux.gif : from wiki.tuxbox.org From Johannes Golombek yjogol@online.de: diff --git a/src/nhttpd/web/images/Makefile.am b/src/nhttpd/web/images/Makefile.am index 01bcdc88b..c2cb4e513 100644 --- a/src/nhttpd/web/images/Makefile.am +++ b/src/nhttpd/web/images/Makefile.am @@ -38,7 +38,6 @@ install_DATA = accept.png \ ftype_folder.gif \ ftype_link.gif \ fullscreen.png \ - hd1.jpg \ help.gif \ help_white.gif \ hidden.gif \ @@ -56,7 +55,6 @@ install_DATA = accept.png \ lock.gif \ lock.png \ modify.png \ - neo.jpg \ new.gif \ new.png \ ok.gif \ @@ -66,9 +64,11 @@ install_DATA = accept.png \ properties.gif \ properties.png \ radio.png \ - rc.gif \ - rc.jpg \ - rc_sagem.jpg \ + rc_cst_v1.jpg \ + rc_cst_v2.jpg \ + rc_cst_v3.jpg \ + rc_dbox_nokia_old.jpg \ + rc_dbox_philips.jpg \ record.gif \ record.png \ reload.gif \ @@ -105,5 +105,4 @@ install_DATA = accept.png \ x_red.gif \ yjogol.gif \ y.png \ - zap.png \ - zee.jpg + zap.png diff --git a/src/nhttpd/web/images/rc.gif b/src/nhttpd/web/images/rc.gif deleted file mode 100644 index dfa2a1520..000000000 Binary files a/src/nhttpd/web/images/rc.gif and /dev/null differ diff --git a/src/nhttpd/web/images/hd1.jpg b/src/nhttpd/web/images/rc_cst_v1.jpg similarity index 100% rename from src/nhttpd/web/images/hd1.jpg rename to src/nhttpd/web/images/rc_cst_v1.jpg diff --git a/src/nhttpd/web/images/neo.jpg b/src/nhttpd/web/images/rc_cst_v2.jpg similarity index 100% rename from src/nhttpd/web/images/neo.jpg rename to src/nhttpd/web/images/rc_cst_v2.jpg diff --git a/src/nhttpd/web/images/zee.jpg b/src/nhttpd/web/images/rc_cst_v3.jpg similarity index 100% rename from src/nhttpd/web/images/zee.jpg rename to src/nhttpd/web/images/rc_cst_v3.jpg diff --git a/src/nhttpd/web/images/rc.jpg b/src/nhttpd/web/images/rc_dbox_nokia_old.jpg similarity index 100% rename from src/nhttpd/web/images/rc.jpg rename to src/nhttpd/web/images/rc_dbox_nokia_old.jpg diff --git a/src/nhttpd/web/images/rc_sagem.jpg b/src/nhttpd/web/images/rc_dbox_philips.jpg similarity index 100% rename from src/nhttpd/web/images/rc_sagem.jpg rename to src/nhttpd/web/images/rc_dbox_philips.jpg diff --git a/src/nhttpd/web/images/rcd.jpg b/src/nhttpd/web/images/rcd.jpg deleted file mode 100644 index 129742060..000000000 Binary files a/src/nhttpd/web/images/rcd.jpg and /dev/null differ