From b4aca3a5b196b0a8c68fc49d4ccb38c9d56d244b Mon Sep 17 00:00:00 2001 From: yjogol Date: Mon, 1 Mar 2010 08:33:59 +0000 Subject: [PATCH] yweb: deactivate not supported settings for coolstream git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@444 e54a6e83-5905-42d5-8d5c-058d10e6a962 --- src/nhttpd/web/Y_Settings_Menue.yhtm | 12 ++++++++---- src/nhttpd/web/Y_neutrino_Blocks.txt | 27 ++++++++++++++++++++------- 2 files changed, 28 insertions(+), 11 deletions(-) diff --git a/src/nhttpd/web/Y_Settings_Menue.yhtm b/src/nhttpd/web/Y_Settings_Menue.yhtm index 2e856a40f..59fede898 100644 --- a/src/nhttpd/web/Y_Settings_Menue.yhtm +++ b/src/nhttpd/web/Y_Settings_Menue.yhtm @@ -81,12 +81,14 @@ function init(){ ~=}
  • {=L:parental=}
  • {=L:recording=}
    • + {=if-not-equal:{=global-var-get:boxtype=}~coolstream~
  • {=L:direct_recording=}
    • + =}
  • {=L:audio_player=}
    • {=if-not-equal:{=global-var-get:boxtype=}~coolstream~
  • {=L:esound_server=}
    • - ~=}
  • {=L:movieplayer=}
    • + ~=}
  • {=L:pictureviewer=}
    • {=if-not-equal:{=global-var-get:boxtype=}~coolstream~
  • {=L:lcd_display=}
    • @@ -94,8 +96,8 @@ function init(){
  • {=L:key_settings=}
    • {=if-not-equal:{=global-var-get:boxtype=}~coolstream~
  • {=L:boot_options=}
    • - ~=}
  • {=L:others=}
    • + ~=}
  • {=L:peronalization=}
    • ~
  • {=L:bouquet_editor=}
    • @@ -104,12 +106,14 @@ function init(){ ~=}
  • {=L:parental=}
  • {=L:recording=}
    • + {=if-not-equal:{=global-var-get:boxtype=}~coolstream~
  • {=L:direct_recording=}
    • + =}
  • {=L:audio_player=}
    • {=if-not-equal:{=global-var-get:boxtype=}~coolstream~
  • {=L:esound_server=}
    • - ~=}
  • {=L:movieplayer=}
    • + ~=}
  • {=L:pictureviewer=}
    • {=if-not-equal:{=global-var-get:boxtype=}~coolstream~
  • {=L:lcd_display=}
    • @@ -119,8 +123,8 @@ function init(){ ~=} {=if-not-equal:{=global-var-get:boxtype=}~coolstream~
  • {=L:boot_options=}
    • - ~=}
  • {=L:others=}
    • + ~=} {=if-not-equal:{=global-var-get:boxtype=}~coolstream~
  • {=L:peronalization=}
    • ~=} diff --git a/src/nhttpd/web/Y_neutrino_Blocks.txt b/src/nhttpd/web/Y_neutrino_Blocks.txt index 9d9630985..6148feb27 100644 --- a/src/nhttpd/web/Y_neutrino_Blocks.txt +++ b/src/nhttpd/web/Y_neutrino_Blocks.txt @@ -38,6 +38,7 @@ start-block~neutrino_form-data_record
    + {=if-not-equal:{=global-var-get:boxtype=}~coolstream~ @@ -106,6 +107,7 @@ start-block~neutrino_form-data_record {=L:on=} + =} {=if-not-equal:{=global-var-get:boxtype=}~coolstream~ @@ -202,6 +204,7 @@ start-block~neutrino_form-data_record function form_init() { var val = ""; +{=if-not-equal:{=global-var-get:boxtype=}~coolstream~ val = "{=ini-get:/var/tuxbox/config/neutrino.conf;recording_server_ip;10.10.10.10=}"; document.f.ip.value = val; val = "{=ini-get:/var/tuxbox/config/neutrino.conf;recording_server_port;4000=}"; @@ -214,13 +217,17 @@ function form_init() obj_set_radio_value('vcr_no_scart', "{=ini-get:/var/tuxbox/config/neutrino.conf;recording_vcr_no_scart;0=}"); obj_set_radio_value('in_spts_mode', "{=ini-get:/var/tuxbox/config/neutrino.conf;recording_in_spts_mode;true=}"); + val = "{=ini-get:/var/tuxbox/config/neutrino.conf;recording_stopsectionsd;0~cache=}"; + document.f.stopsectionsd.selectedIndex = val; + + val = "{=ini-get:/var/tuxbox/config/neutrino.conf;recording_type;0=}"; + document.f.rec_type.selectedIndex = val; + change_rec_type(); +=} obj_set_radio_value('timeshift_pause', "{=ini-get:/var/tuxbox/config/neutrino.conf;timeshift_pause;0=}"); obj_set_radio_value('auto_delete', "{=ini-get:/var/tuxbox/config/neutrino.conf;auto_delete;true=}"); obj_set_radio_value('temp_timeshift', "{=ini-get:/var/tuxbox/config/neutrino.conf;temp_timeshift;0=}"); - val = "{=ini-get:/var/tuxbox/config/neutrino.conf;recording_stopsectionsd;0~cache=}"; - document.f.stopsectionsd.selectedIndex = val; - val = "{=ini-get:/var/tuxbox/config/neutrino.conf;recording_audio_pids_default;true=}"; val = parseInt(val); if(val & 1) @@ -235,12 +242,10 @@ function form_init() document.f.audio_ac3[1].checked = true; else document.f.audio_ac3[0].checked = true; - val = "{=ini-get:/var/tuxbox/config/neutrino.conf;recording_type;0=}"; - document.f.rec_type.selectedIndex = val; - change_rec_type(); } function change_rec_type() { +{=if-not-equal:{=global-var-get:boxtype=}~coolstream~ if(document.f.rec_type.selectedIndex != 1) $('ip','port', 'mac', 'wol0', 'wol1').invoke('disable'); else @@ -258,13 +263,16 @@ function change_rec_type() $$('.audio').invoke('enable'); } change_mac(); +=} } function change_mac() { +{=if-not-equal:{=global-var-get:boxtype=}~coolstream~ var vis = document.f.wol[0].checked; if(document.f.rec_type.selectedIndex == 1) document.f.mac.disabled = vis; +=} } function do_submit() { @@ -282,6 +290,7 @@ end-block~neutrino_form-data_record # ------- yWeb save Settings start-block~neutrino_record_save_settings +{=if-not-equal:{=global-var-get:boxtype=}~coolstream~ {=ini-set:/var/tuxbox/config/neutrino.conf;recording_server_ip;{=ip=}~open=} {=ini-set:/var/tuxbox/config/neutrino.conf;recording_server_port;{=port=}~cache=} {=ini-set:/var/tuxbox/config/neutrino.conf;recording_server_mac;{=mac=}~cache=} @@ -292,13 +301,15 @@ start-block~neutrino_record_save_settings {=ini-set:/var/tuxbox/config/neutrino.conf;recording_zap_on_announce;{=zap_on_announce=}~cache=} {=ini-set:/var/tuxbox/config/neutrino.conf;recording_vcr_no_scart;{=vcr_no_scart=}~cache=} {=ini-set:/var/tuxbox/config/neutrino.conf;recording_in_spts_mode;{=in_spts_mode=}~cache=} -{=ini-set:/var/tuxbox/config/neutrino.conf;timeshiftdir;{=timeshiftdir=}~cache=} +~ +{=ini-set:/var/tuxbox/config/neutrino.conf;timeshiftdir;{=timeshiftdir=}~open=} {=ini-set:/var/tuxbox/config/neutrino.conf;record_hours;{=record_hours=}~cache=} {=ini-set:/var/tuxbox/config/neutrino.conf;timeshift_pause;{=timeshift_pause=}~cache=} {=ini-set:/var/tuxbox/config/neutrino.conf;auto_timeshift;{=auto_timeshift=}~cache=} {=ini-set:/var/tuxbox/config/neutrino.conf;auto_delete;{=auto_delete=}~cache=} {=ini-set:/var/tuxbox/config/neutrino.conf;temp_timeshift;{=temp_timeshift=}~cache=} {=ini-set:/var/tuxbox/config/neutrino.conf;recording_audio_pids_default;{=recording_audio_pids_default=}~save=} +=} {=ini-set:/var/tuxbox/config/timerd.conf;EXTRA_TIME_START;{=EXTRA_TIME_START=}=} {=ini-set:/var/tuxbox/config/timerd.conf;EXTRA_TIME_END;{=EXTRA_TIME_END=}=} {=ini-set:/var/tuxbox/config/timerd.conf;ZAPTO_EXTRA_TIME_START;{=ZAPTO_EXTRA_TIME_START=}=} @@ -1178,6 +1189,7 @@ start-block~neutrino_form-data_pictureviewer + {=if-not-equal:{=global-var-get:boxtype=}~coolstream~ @@ -1186,6 +1198,7 @@ start-block~neutrino_form-data_pictureviewer + =}
    {=L:set.rec.rec_dest=}
    {=L:set.rec.device=}
    {=L:set.rec.spts=}{=L:set.pv.start_dir=}
    {=L:set.pv.decoding_server_ip=} {=L:set.pv.decoding_server_port=}