diff --git a/src/nhttpd/web/Y_Baselib.js b/src/nhttpd/web/Y_Baselib.js index 79402b8b9..a9c208648 100644 --- a/src/nhttpd/web/Y_Baselib.js +++ b/src/nhttpd/web/Y_Baselib.js @@ -373,6 +373,9 @@ function bt_set_value(_bt_name, _text) } /*dbox*/ /*expermental*/ +function reload_neutrino_conf() { + loadSyncURL("/control/reloadsetup"); +} function dbox_rcsim(_key){ loadSyncURL("/control/rcem?" + _key); } diff --git a/src/nhttpd/web/Y_Settings_Menue.yhtm b/src/nhttpd/web/Y_Settings_Menue.yhtm index 72d4f9f20..d009c55b9 100644 --- a/src/nhttpd/web/Y_Settings_Menue.yhtm +++ b/src/nhttpd/web/Y_Settings_Menue.yhtm @@ -60,6 +60,11 @@ function init(){ {=var-set:m_link_text={=L:set.menue.parental=}=} {=include-block:Y_Blocks.txt;management_link=} +
  • + {=var-set:m_link_href=Y_Settings_neutrino_forms.yhtm?form=neutrino_form-data_epg=} + {=var-set:m_link_text={=L:set.menue.epg=}=} + {=include-block:Y_Blocks.txt;management_link=} +
  • {=var-set:m_link_href=Y_Settings_neutrino_forms.yhtm?form=neutrino_form-data_record=} {=var-set:m_link_text={=L:set.menue.recording=}=} diff --git a/src/nhttpd/web/Y_Version.txt b/src/nhttpd/web/Y_Version.txt index ebcb7a439..11e991a9c 100644 --- a/src/nhttpd/web/Y_Version.txt +++ b/src/nhttpd/web/Y_Version.txt @@ -1,4 +1,4 @@ -version=2.8.0.63 +version=2.8.0.64 date=05.12.2014 type=Release info=Port CST diff --git a/src/nhttpd/web/Y_neutrino_Blocks.txt b/src/nhttpd/web/Y_neutrino_Blocks.txt index 9c55ab772..9269e9199 100644 --- a/src/nhttpd/web/Y_neutrino_Blocks.txt +++ b/src/nhttpd/web/Y_neutrino_Blocks.txt @@ -333,6 +333,141 @@ start-block~neutrino_parental_save_settings {=ini-set:/var/tuxbox/config/neutrino.conf;parentallock_pincode;{=parentallock_pincode=}~save=} end-block~neutrino_parental_save_settings +# ------- Neutrino form-data: EPG ------------------------------- +start-block~neutrino_form-data_epg +
    +
    + {=var-set:help_url=Help-Settings-EPG=}{=var-set:menu={=L:set.menue.epg=}=}{=include-block:Y_Blocks.txt;work_menu=}
    +
    +
    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    {=L:miscsettings.epg_head=}
    {=L:miscsettings.epg_save=} + {=L:off=}  + {=L:on=} +
    {=L:miscsettings.epg_save_standby=} + {=L:off=}  + {=L:on=} +
    {=L:miscsettings.epg_save_frequently=} + {=L:off=}  + {=L:on=} +
    {=L:miscsettings.epg_read=} + {=L:off=}  + {=L:on=} +
    {=L:miscsettings.epg_dir=} e.g. /media/sda1/epg/

    {=L:miscsettings.epg_cache=}
    {=L:miscsettings.epg_extendedcache=}
    {=L:miscsettings.epg_old_events=}
    {=L:miscsettings.epg_max_events=}

    {=L:miscsettings.epg_scan=} + +
    {=L:miscsettings.epg_scan_bouquets=} + +
    +
    + + + + +   +
    +
    +
    + +end-block~neutrino_form-data_epg + +# ------- yWeb save EPG +start-block~neutrino_epg_save_settings +{=ini-set:/var/tuxbox/config/neutrino.conf;epg_save;{=epg_save=}~open=} +{=ini-set:/var/tuxbox/config/neutrino.conf;epg_save_standby;{=epg_save_standby=}~cache=} +{=ini-set:/var/tuxbox/config/neutrino.conf;epg_save_frequently;{=epg_save_frequently=}~cache=} +{=ini-set:/var/tuxbox/config/neutrino.conf;epg_read;{=epg_read=}~cache=} +{=ini-set:/var/tuxbox/config/neutrino.conf;epg_dir;{=epg_dir=}~cache=} +{=ini-set:/var/tuxbox/config/neutrino.conf;epg_cache_time;{=epg_cache_time=}~cache=} +{=ini-set:/var/tuxbox/config/neutrino.conf;epg_extendedcache_time;{=epg_extendedcache_time=}~cache=} +{=ini-set:/var/tuxbox/config/neutrino.conf;epg_max_events;{=epg_max_events=}~cache=} +{=ini-set:/var/tuxbox/config/neutrino.conf;epg_old_events;{=epg_old_events=}~cache=} +{=ini-set:/var/tuxbox/config/neutrino.conf;epg_scan_mode;{=epg_scan_mode=}~cache=} +{=ini-set:/var/tuxbox/config/neutrino.conf;epg_scan;{=epg_scan=}~save=} +end-block~neutrino_epg_save_settings + # ------- Neutrino form-data: diverse ------------------------------- start-block~neutrino_form-data_diverse
    @@ -490,29 +625,6 @@ start-block~neutrino_form-data_diverse {=L:on=} - - EPG-Einstellungen - - - EPG-Cache (Tage) - - - - EPG-Langtext (Stunden) - - - - EPG verwerfen nach (Std.) - - - - Max. Events - - - - EPG Verzeichnis -  e.g. /mnt/mmc/epg/ - Zapit (Hinweis: pzapit -kill vorm Speichern ausführen) @@ -651,11 +763,6 @@ end-block~neutrino_form-data_diverse start-block~neutrino_diverse_save_settings {=ini-set:/var/tuxbox/config/neutrino.conf;channellist_epgtext_align_right;{=epgtext_align_right=}~open=} {=ini-set:/var/tuxbox/config/neutrino.conf;channellist_extended;{=channellist_extended=}~cache=} -{=ini-set:/var/tuxbox/config/neutrino.conf;epg_cache_time;{=epg_cache_time=}~cache=} -{=ini-set:/var/tuxbox/config/neutrino.conf;epg_dir;{=epg_dir=}~cache=} -{=ini-set:/var/tuxbox/config/neutrino.conf;epg_extendedcache_time;{=epg_extendedcache_time=}~cache=} -{=ini-set:/var/tuxbox/config/neutrino.conf;epg_max_events;{=epg_max_events=}~cache=} -{=ini-set:/var/tuxbox/config/neutrino.conf;epg_old_events;{=epg_old_events=}~cache=} {=ini-set:/var/tuxbox/config/neutrino.conf;filebrowser_showrights;{=filebrowser_showrights=}~cache=} {=ini-set:/var/tuxbox/config/neutrino.conf;filebrowser_denydirectoryleave;{=filebrowser_denydirectoryleave=}~cache=} {=ini-set:/var/tuxbox/config/neutrino.conf;filesystem_is_utf8;{=filesystem_is_utf8=}~cache=} @@ -1249,7 +1356,6 @@ end-block~neutrino_form-data_esound # ------- yWeb save Settings start-block~neutrino_esound_save_settings {=ini-set:/var/tuxbox/config/neutrino.conf;esound_port;{=esound_port=}=} - end-block~neutrino_esound_save_settings # ------- list possible directorys for records diff --git a/src/nhttpd/web/languages/Deutsch b/src/nhttpd/web/languages/Deutsch index af16357b0..aa70dcb8f 100644 --- a/src/nhttpd/web/languages/Deutsch +++ b/src/nhttpd/web/languages/Deutsch @@ -29,6 +29,7 @@ send=Senden save=Speichern save_all=Alle Änderungen speichern cancel=Abbrechen +apply=Änderungen anwenden answer=Antwort reboot=Neustart shutdown=Ausschalten @@ -212,6 +213,7 @@ set.sync_with_neutrino=Zur Synchronisation mit Neutrino ========Settings General & Menue set.menue.webserver=Webserver +set.menue.epg=EPG set.menue.timer_settings=Timer Einstellungen set.menue.zapit=Zapit set.menue.backup_restore=Sichern und Wiederherstellen diff --git a/src/nhttpd/web/languages/English b/src/nhttpd/web/languages/English index 1faa29a56..dd5f760e7 100644 --- a/src/nhttpd/web/languages/English +++ b/src/nhttpd/web/languages/English @@ -29,6 +29,7 @@ management=Management uninstaller=Uninstaller send=send cancel=cancel +apply=Apply changes answer=Answer reboot=reboot shutdown=shutdown @@ -215,6 +216,7 @@ set.sync_with_neutrino=Synchronization with Neutrino =======Settings General & Menue set.menue.webserver=Webserver +set.menue.epg=EPG set.menue.timer_settings=Timer Settings set.menue.zapit=Zapit set.menue.backup_restore=Backup & Restore