diff --git a/src/nhttpd/web/Y_Blocks.txt b/src/nhttpd/web/Y_Blocks.txt index 64481a580..d545ba880 100644 --- a/src/nhttpd/web/Y_Blocks.txt +++ b/src/nhttpd/web/Y_Blocks.txt @@ -642,14 +642,14 @@ end-block~rc_cst_v2 # ------ Remote CST V3 (ZEE, NEO2) start-block~rc_cst_v3 {=var-set:rcu=rc_cst_v3=} -remote +remote {=include-block:Y_Blocks.txt;map_rc_cst_v3_v4=} end-block~rc_cst_v3 # ------ Remote CST V4 (NEO TWIN) start-block~rc_cst_v4 {=var-set:rcu=rc_cst_v4=} -remote +remote {=include-block:Y_Blocks.txt;map_rc_cst_v3_v4=} end-block~rc_cst_v4 @@ -732,7 +732,7 @@ end-block~map_rc_cst_v3_v4 # ------- Remote CST V5 (TANK) start-block~rc_cst_v5 -remote +remote standby @@ -795,7 +795,7 @@ end-block~rc_cst_v5 # ------- Remote CST V6 (TRINITY) start-block~rc_cst_v6 -remote +remote standby mute @@ -861,7 +861,7 @@ end-block~rc_cst_v6 # ------- Remote d-Box Nokia old start-block~rc_dbox_nokia_old -remote +remote @@ -894,7 +894,7 @@ end-block~rc_dbox_nokia_old # ------- Remote d-Box Philips/Sagem start-block~rc_dbox_philips -remote +remote diff --git a/src/nhttpd/web/Y_Version.txt b/src/nhttpd/web/Y_Version.txt index 7bf07d7cf..da287c7bf 100644 --- a/src/nhttpd/web/Y_Version.txt +++ b/src/nhttpd/web/Y_Version.txt @@ -1,4 +1,4 @@ -version=2.9.0.1 +version=2.9.0.2 date=25.02.2015 type=Release info=Port CST diff --git a/src/nhttpd/web/images/LICENSE b/src/nhttpd/web/images/LICENSE index 7c9ed72b6..7eb35cea8 100644 --- a/src/nhttpd/web/images/LICENSE +++ b/src/nhttpd/web/images/LICENSE @@ -1,7 +1,5 @@ Same pictures used are form the Tuxbox Community: Published under GPL v2 -- 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 f4192f7d3..a9af29633 100644 --- a/src/nhttpd/web/images/Makefile.am +++ b/src/nhttpd/web/images/Makefile.am @@ -47,12 +47,12 @@ install_DATA = accept.png \ radio.png \ rc_cst_v1.jpg \ rc_cst_v2.jpg \ - rc_cst_v3.jpg \ - rc_cst_v4.jpg \ - rc_cst_v5.jpg \ - rc_cst_v6.jpg \ - rc_dbox_nokia_old.jpg \ - rc_dbox_philips.jpg \ + rc_cst_v3.png \ + rc_cst_v4.png \ + rc_cst_v5.png \ + rc_cst_v6.png \ + rc_dbox_nokia_old.png \ + rc_dbox_philips.png \ record.png \ reload.png \ remove.png \ diff --git a/src/nhttpd/web/images/rc_cst_v2.png b/src/nhttpd/web/images/rc_cst_v2.png new file mode 100644 index 000000000..c0f0ae881 Binary files /dev/null and b/src/nhttpd/web/images/rc_cst_v2.png differ diff --git a/src/nhttpd/web/images/rc_cst_v3.jpg b/src/nhttpd/web/images/rc_cst_v3.jpg deleted file mode 100644 index 33aba320e..000000000 Binary files a/src/nhttpd/web/images/rc_cst_v3.jpg and /dev/null differ diff --git a/src/nhttpd/web/images/rc_cst_v3.png b/src/nhttpd/web/images/rc_cst_v3.png new file mode 100644 index 000000000..2b1ee9747 Binary files /dev/null and b/src/nhttpd/web/images/rc_cst_v3.png differ diff --git a/src/nhttpd/web/images/rc_cst_v4.jpg b/src/nhttpd/web/images/rc_cst_v4.jpg deleted file mode 100644 index b52e6f1e0..000000000 Binary files a/src/nhttpd/web/images/rc_cst_v4.jpg and /dev/null differ diff --git a/src/nhttpd/web/images/rc_cst_v4.png b/src/nhttpd/web/images/rc_cst_v4.png new file mode 100644 index 000000000..a755ae821 Binary files /dev/null and b/src/nhttpd/web/images/rc_cst_v4.png differ diff --git a/src/nhttpd/web/images/rc_cst_v5.jpg b/src/nhttpd/web/images/rc_cst_v5.jpg deleted file mode 100644 index 5c4997ec1..000000000 Binary files a/src/nhttpd/web/images/rc_cst_v5.jpg and /dev/null differ diff --git a/src/nhttpd/web/images/rc_cst_v5.png b/src/nhttpd/web/images/rc_cst_v5.png new file mode 100644 index 000000000..709d5ebe6 Binary files /dev/null and b/src/nhttpd/web/images/rc_cst_v5.png differ diff --git a/src/nhttpd/web/images/rc_cst_v6.jpg b/src/nhttpd/web/images/rc_cst_v6.jpg deleted file mode 100644 index 5a2b296ec..000000000 Binary files a/src/nhttpd/web/images/rc_cst_v6.jpg and /dev/null differ diff --git a/src/nhttpd/web/images/rc_cst_v6.png b/src/nhttpd/web/images/rc_cst_v6.png new file mode 100644 index 000000000..2a370d0b8 Binary files /dev/null and b/src/nhttpd/web/images/rc_cst_v6.png differ diff --git a/src/nhttpd/web/images/rc_dbox_nokia_old.jpg b/src/nhttpd/web/images/rc_dbox_nokia_old.jpg deleted file mode 100644 index b9138f366..000000000 Binary files a/src/nhttpd/web/images/rc_dbox_nokia_old.jpg and /dev/null differ diff --git a/src/nhttpd/web/images/rc_dbox_nokia_old.png b/src/nhttpd/web/images/rc_dbox_nokia_old.png new file mode 100644 index 000000000..6b400fc8f Binary files /dev/null and b/src/nhttpd/web/images/rc_dbox_nokia_old.png differ diff --git a/src/nhttpd/web/images/rc_dbox_philips.jpg b/src/nhttpd/web/images/rc_dbox_philips.jpg deleted file mode 100644 index 047a24d1f..000000000 Binary files a/src/nhttpd/web/images/rc_dbox_philips.jpg and /dev/null differ diff --git a/src/nhttpd/web/images/rc_dbox_philips.png b/src/nhttpd/web/images/rc_dbox_philips.png new file mode 100644 index 000000000..743004247 Binary files /dev/null and b/src/nhttpd/web/images/rc_dbox_philips.png differ