diff --git a/src/nhttpd/web/Y_Version.txt b/src/nhttpd/web/Y_Version.txt index e0a9c0f78..20397ef88 100644 --- a/src/nhttpd/web/Y_Version.txt +++ b/src/nhttpd/web/Y_Version.txt @@ -1,4 +1,4 @@ -version=2.8.0.16 +version=2.8.0.17 date=23.07.2012 type=Release info=Port Coolstream diff --git a/src/nhttpd/web/Y_neutrino_Blocks.txt b/src/nhttpd/web/Y_neutrino_Blocks.txt index 81cc238ca..714a573cc 100644 --- a/src/nhttpd/web/Y_neutrino_Blocks.txt +++ b/src/nhttpd/web/Y_neutrino_Blocks.txt @@ -38,85 +38,59 @@ start-block~neutrino_form-data_record
- {=if-not-equal:{=global-var-get:boxtype=}~coolstream~ - - - - - - - - - - - - - - - - - - - - - - + + + + + - + - + + + + + + + + + + - - + + - =} - {=if-not-equal:{=global-var-get:boxtype=}~coolstream~ - + + + + + - ~=} @@ -126,6 +100,13 @@ start-block~neutrino_form-data_record + + + + @@ -153,41 +134,6 @@ start-block~neutrino_form-data_record - - - - - - - - - - - - - - - - - - - - - - - - - -
{=L:set.rec.rec_dest=}
{=L:set.rec.device=} - -
{=L:set.rec.recserver_ip=} -
{=L:set.rec.recserver_port=} - -
{=L:set.rec.recserver_wol=} - {=L:off=}  - {=L:on=} -
{=L:set.rec.mac_adress=} - -
{=L:set.rec.rec_behavior=}
{=L:set.rec.stop_playback=}{=L:directory=}
{=L:set.rec.channeldir=} - {=L:off=}  - {=L:on=} + {=L:off=}  + {=L:on=}
{=L:set.rec.epg_sectionsd=}{=L:set.rec.epg_end=} - + {=L:off=}  + {=L:on=}
{=L:set.rec.zap=}{=L:set.rec.recordtime=}
{=L:set.rec.timeshift_desc=}
{=L:directory=}
{=L:set.rec.timeshift.pause=} - {=L:off=}  - {=L:on=} + {=L:off=}  + {=L:on=}
{=L:set.rec.scart=} - {=L:off=}  - {=L:on=} - {=L:set.rec.timeshift.auto_record=}
{=L:set.rec.spts=}{=L:set.rec.timeshift.auto_delete=} - {=L:off=}  - {=L:on=} + {=L:off=}  + {=L:on=} +
{=L:set.rec.timeshift.tmp_timeshift=} + {=L:off=}  + {=L:on=}
{=L:set.rec.timer_settings=}
{=L:set.rec.start_delay=}{=L:set.rec.stop_delay=}  {=L:set.reboot_required=}
{=L:set.rec.zap=} + {=L:off=}  + {=L:on=} +
{=L:set.rec.zap_delay=}  {=L:set.reboot_required=}
{=L:set.rec.timeshift_desc=}
{=L:set.rec.timeshift.directory=}
{=L:set.rec.timeshift.recordtime=}
{=L:set.rec.timeshift.pause=} - {=L:off=}  - {=L:on=} -
{=L:set.rec.timeshift.auto_record=}
{=L:set.rec.timeshift.auto_delete=} - {=L:off=}  - {=L:on=} -
{=L:set.rec.timeshift.tmp_timeshift=} - {=L:off=}  - {=L:on=} -

@@ -204,26 +150,10 @@ 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=}"; - document.f.port.value = val; - obj_set_radio_value('wol', "{=ini-get:/var/tuxbox/config/neutrino.conf;recording_server_wakeup;0=}"); - val = "{=ini-get:/var/tuxbox/config/neutrino.conf;recording_server_mac;11:22:33:44:55:66=}"; - document.f.mac.value = val; - obj_set_radio_value('stopplayback', "{=ini-get:/var/tuxbox/config/neutrino.conf;recording_stopplayback;false=}"); - obj_set_radio_value('zap_on_announce', "{=ini-get:/var/tuxbox/config/neutrino.conf;recording_zap_on_announce;false=}"); - 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('recording_zap_on_announce', "{=ini-get:/var/tuxbox/config/neutrino.conf;recording_zap_on_announce;false=}"); + obj_set_radio_value('recording_epg_for_end', "{=ini-get:/var/tuxbox/config/neutrino.conf;recording_epg_for_end;false=}"); + obj_set_radio_value('recording_save_in_channeldir', "{=ini-get:/var/tuxbox/config/neutrino.conf;recording_save_in_channeldir;false=}"); 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=}"); @@ -243,37 +173,7 @@ function form_init() else document.f.audio_ac3[0].checked = true; } -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 - $('ip','port', 'mac', 'wol0', 'wol1').invoke('enable'); - if(document.f.rec_type.selectedIndex != 2) - $('vcr0','vcr1').invoke('disable'); - else - $('vcr0','vcr1').invoke('enable') - if(document.f.rec_type.selectedIndex != 1 && document.f.rec_type.selectedIndex != 3){ - $('spts0','spts1', 'sp0', 'sp1', 'ss').invoke('disable'); - $$('.audio').invoke('disable'); - } - else{ - $('spts0','spts1', 'sp0', 'sp1', 'ss').invoke('enable'); - $$('.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() { show_waitbox(true); @@ -290,26 +190,17 @@ 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=} -{=ini-set:/var/tuxbox/config/neutrino.conf;recording_server_wakeup;{=wol=}~cache=} -{=ini-set:/var/tuxbox/config/neutrino.conf;recording_type;{=rec_type=}~cache=} -{=ini-set:/var/tuxbox/config/neutrino.conf;recording_stopplayback;{=stopplayback=}~cache=} -{=ini-set:/var/tuxbox/config/neutrino.conf;recording_stopsectionsd;{=stopsectionsd=}~cache=} -{=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=}~open=} +{=ini-set:/var/tuxbox/config/neutrino.conf;network_nfs_recordingdir;{=network_nfs_recordingdir=}~open=} +{=ini-set:/var/tuxbox/config/neutrino.conf;recording_save_in_channeldir;{=recording_save_in_channeldir=}~cache=} +{=ini-set:/var/tuxbox/config/neutrino.conf;recording_zap_on_announce;{=recording_zap_on_announce=}~cache=} +{=ini-set:/var/tuxbox/config/neutrino.conf;recording_epg_for_end;{=recording_epg_for_end=}~cache=} +{=ini-set:/var/tuxbox/config/neutrino.conf;timeshiftdir;{=timeshiftdir=}~cache=} {=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=}=} diff --git a/src/nhttpd/web/languages/Deutsch b/src/nhttpd/web/languages/Deutsch index 27b7e08d4..cb6471e44 100644 --- a/src/nhttpd/web/languages/Deutsch +++ b/src/nhttpd/web/languages/Deutsch @@ -50,6 +50,7 @@ empty=leer check=prüfen help=Hilfe attention=Achtung! +directory=Verzeichnis restriced_by_management_ip=Zugriff verwehrt wg. ManagementIP # ==========Main Menue @@ -264,10 +265,11 @@ set.rec.audio_channels=Tonspuren set.rec.audio_standard=Standard Tonspur aufnehmen set.rec.audio_alternate=Alternative Tonspur aufnehmen set.rec.audio_ac3=AC3 Tonspuren aufnehmen +set.rec.channeldir=Speichere im Kanalverzeichnis +set.rec.epg_end=Aufnahme nur bis EPG-Ende +set.rec.recordtime=Aufnahmezeit in Stunden set.rec.timeshift_desc=Timeshift -set.rec.timeshift.directory=Verzeichnis -set.rec.timeshift.recordtime=Aufnahmezeit in Stunden -set.rec.timeshift.pause=Pause +set.rec.timeshift.pause=Start mit Pause-Taste set.rec.timeshift.auto_record=Autom. Aufnahme (in Sek, 0=deaktiviert) set.rec.timeshift.auto_delete=Automatisches Löschen set.rec.timeshift.tmp_timeshift=Temporäres timeshift diff --git a/src/nhttpd/web/languages/English b/src/nhttpd/web/languages/English index 3d8803063..2dc94fcb8 100644 --- a/src/nhttpd/web/languages/English +++ b/src/nhttpd/web/languages/English @@ -50,6 +50,7 @@ empty=empty check=check help=Help attention=Attention! +directory=Directory restriced_by_management_ip=restricted by ManagementIP #========= MAIN Menue @@ -267,10 +268,11 @@ set.rec.audio_channels=Audio channels set.rec.audio_standard=Record standard audio channel set.rec.audio_alternate=Record alternate audio channel set.rec.audio_ac3=Record ac3 audio channel +set.rec.channeldir=Save in channeldir +set.rec.epg_end=Recording until end of EPG-time +set.rec.recordtime=Recording time in hours set.rec.timeshift_desc=Timeshift -set.rec.timeshift.directory=Directory -set.rec.timeshift.recordtime=Recording time in hours -set.rec.timeshift.pause=Pause +set.rec.timeshift.pause=Start with pause-key set.rec.timeshift.auto_record=Autom. Recording (in Sec, 0=deactivate) set.rec.timeshift.auto_delete=Automatic deletion set.rec.timeshift.tmp_timeshift=Temporaly timeshift diff --git a/src/nhttpd/web/languages/Portuguese b/src/nhttpd/web/languages/Portuguese index 36cb93211..0dd50d71c 100644 --- a/src/nhttpd/web/languages/Portuguese +++ b/src/nhttpd/web/languages/Portuguese @@ -50,6 +50,7 @@ empty=vazio check=verificar help=Ajuda attention=Attention! +directory=Diretório restriced_by_management_ip=restringido pela Gestão de IP #========= Menu Principal @@ -272,10 +273,11 @@ set.rec.audio_channels=Canais Audio set.rec.audio_standard=Gravar audio em modo standard set.rec.audio_alternate=Gravar audio em modo alternativo set.rec.audio_ac3=Gravar audio ac3 +set.rec.channeldir=Save in channeldir +set.rec.epg_end=Recording until end of EPG-time +set.rec.recordtime=Tempo de gravação na hora set.rec.timeshift_desc=Timeshift(pausar Tv ao vivo) -set.rec.timeshift.directory=Diretório -set.rec.timeshift.recordtime=Tempo de gravação na hora -set.rec.timeshift.pause=Pausa +set.rec.timeshift.pause=Start with pause-key set.rec.timeshift.auto_record=Gravação automática (em Sec, 0=desactivada) set.rec.timeshift.auto_delete=Eliminação automática set.rec.timeshift.tmp_timeshift=Timeshift temporário