diff --git a/data/y-web/Y_Blocks.txt b/data/y-web/Y_Blocks.txt
index d48143c43..80cd5e7fc 100644
--- a/data/y-web/Y_Blocks.txt
+++ b/data/y-web/Y_Blocks.txt
@@ -545,9 +545,12 @@ start-block~remote
{=if-equal:{=var-get:boxtype=}~VU+ ZERO4K~ {=include-block:Y_Blocks.txt;rc_vuplus=}~
{=if-equal:{=var-get:boxtype=}~VU+ DUO~ {=include-block:Y_Blocks.txt;rc_vuplus=}~
{=if-equal:{=var-get:boxtype=}~AirDigital Zgemma H7C/S~ {=include-block:Y_Blocks.txt;rc_zgemma_h7=}~
+ {=if-equal:{=var-get:boxtype=}~AX-Technologies HD60~{=include-block:Y_Blocks.txt;rc_ax_hd51=}~
+ {=if-equal:{=var-get:boxtype=}~Mutant HD60~ {=include-block:Y_Blocks.txt;rc_mutant_hd51=}~
+ {=if-equal:{=var-get:boxtype=}~AX-Technologies HD61~{=include-block:Y_Blocks.txt;rc_ax_hd51=}~
{=comment:fallback~=} {=include-block:Y_Blocks.txt;rc_cst_v1=}
- =}=}=}=}=}=}=}=}=}=}=}=}=}=}=}=}=}=}=}=}
+ =}=}=}=}=}=}=}=}=}=}=}=}=}=}=}=}=}=}=}=}=}=}=}
=}=}
~
{=if-equal:{=var-get:yfbtype=}~-2~ {=include-block:Y_Blocks.txt;rc_dbox_philips=}~
@@ -572,9 +575,12 @@ start-block~remote
{=if-equal:{=var-get:yfbtype=}~18~ {=include-block:Y_Blocks.txt;rc_vuplus=}~
{=if-equal:{=var-get:yfbtype=}~19~ {=include-block:Y_Blocks.txt;rc_vuplus=}~
{=if-equal:{=var-get:yfbtype=}~20~ {=include-block:Y_Blocks.txt;rc_zgemma_h7=}~
+ {=if-equal:{=var-get:yfbtype=}~21~ {=include-block:Y_Blocks.txt;rc_ax_hd51=}~
+ {=if-equal:{=var-get:yfbtype=}~22~ {=include-block:Y_Blocks.txt;rc_mutant_hd51=}~
+ {=if-equal:{=var-get:yfbtype=}~23~ {=include-block:Y_Blocks.txt;rc_ax_hd51=}~
{=comment:fallback~=} {=include-block:Y_Blocks.txt;rc_cst_v1=}
- =}=}=}=}=}=}=}=}=}=}=}=}=}=}=}=}=}=}=}=}=}=}
+ =}=}=}=}=}=}=}=}=}=}=}=}=}=}=}=}=}=}=}=}=}=}=}=}=}
=}
end-block~remote
diff --git a/data/y-web/Y_Settings_yWeb.yhtm b/data/y-web/Y_Settings_yWeb.yhtm
index d0c9e0d1e..2ceb9f6de 100644
--- a/data/y-web/Y_Settings_yWeb.yhtm
+++ b/data/y-web/Y_Settings_yWeb.yhtm
@@ -44,21 +44,58 @@ function do_init(){
case "10": // mutant hd51
case "11": // wwio bre2ze4k
case "12": // vu solo4k
- case "13": // zgemma h7
+ case "13": // vu duo4k
+ case "14": // vu duo4kse
+ case "15": // vu ultimo4k
+ case "16": // vu uno4k
+ case "17": // vu uno4kse
+ case "18": // vu zero4k
+ case "19": // vu duo
+ case "20": // zgemma h7
+ case "21": // ax hd60
+ case "22": // mutant hd60
+ case "23": // ax hd61
sel=(sel*1+val*1);
break;
default:
break;
}
document.f.fb.selectedIndex = sel;
+ obj_set_radio_value('screenshot_rc', "{=ini-get:%(CONFIGDIR)/Y-Web.conf;screenshot_rc;false~cache=}");
val = "{=ini-get:%(CONFIGDIR)/Y-Web.conf;start_page;bouquets~cache=}";
- var sel=2;
+ 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:%(CONFIGDIR)/Y-Web.conf;style~cache=}";
+
+ if ("{=ini-get:%(CONFIGDIR)/Y-Web.conf;yweb_box_name=}" == "${HOSTNAME}") {
+ document.f.hostname.checked = true;
+ document.f.yweb_box_name.value = "${HOSTNAME}";
+ document.f.yweb_box_name.readOnly = true;
+ document.f.yweb_box_name.style.color='#aaaaaa'
+ }
+}
+//NI
+function do_switch_hostname()
+{
+ if(document.f.hostname.checked == true)
+ {
+ document.f.yweb_box_name.value = "${HOSTNAME}";
+ document.f.yweb_box_name.readOnly = true;
+ document.f.yweb_box_name.style.color='#aaaaaa'
+ }
+ else
+ {
+ document.f.yweb_box_name.value = "";
+ document.f.yweb_box_name.readOnly = false;
+ document.f.yweb_box_name.style.color='#555555'
+ document.f.yweb_box_name.focus();
+ }
}
//]]>
@@ -108,8 +145,11 @@ select {
|
| {=L:set.yweb.box_tag=} |
- |
+
+
+ Hostname
+ |
| {=L:set.yweb.box_color=} |
@@ -119,7 +159,7 @@ select {
|
| {=L:set.yweb.remote=} |
-
+ |
|
+ {=L:set.yweb.screenshot_rc=} |
+
+ {=L:off=}
+ {=L:on=}
+ |
| {=L:set.yweb.start_page=} |
@@ -146,6 +201,8 @@ select {
diff --git a/data/y-web/images/Makefile.am b/data/y-web/images/Makefile.am
index e713cc377..d8e5626ee 100644
--- a/data/y-web/images/Makefile.am
+++ b/data/y-web/images/Makefile.am
@@ -82,8 +82,11 @@ install_DATA = accept.png \
x_red.png \
zap.png
+# fallback rc
+install_DATA += rc_cst_v1.jpg
+
if BOXTYPE_CST
-install_DATA += rc_cst_v1.jpg \
+install_DATA += #rc_cst_v1.jpg \
rc_cst_v2.png \
rc_cst_v3.png \
rc_cst_v4.png \
@@ -96,6 +99,16 @@ install_DATA += rc_ax_hd51.png \
rc_mutant_hd51.png
endif
+if BOXMODEL_HD60
+install_DATA += rc_ax_hd51.png \
+ rc_mutant_hd51.png
+endif
+
+if BOXMODEL_HD61
+install_DATA += rc_ax_hd51.png \
+ rc_mutant_hd51.png
+endif
+
if BOXMODEL_BRE2ZE4K
install_DATA += rc_wwio_bre2ze4k.png
endif