mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-08-31 01:11:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

- yWeb: (re)add EPG settings menu

Browse Source
This commit is contained in:
svenhoefer
2014-12-05 14:29:35 +01:00
parent ec219cc2a7
commit 1bf97d21f1
6 changed files with 148 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/nhttpd/web/Y_Baselib.js
View File

@@ -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);
}

5
src/nhttpd/web/Y_Settings_Menue.yhtm
View File

@@ -60,6 +60,11 @@ function init(){
{=var-set:m_link_text={=L:set.menue.parental=}=}
{=include-block:Y_Blocks.txt;management_link=}
</li>
<li>
{=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=}
</li>
<li>
{=var-set:m_link_href=Y_Settings_neutrino_forms.yhtm?form=neutrino_form-data_record=}
{=var-set:m_link_text={=L:set.menue.recording=}=}

2
src/nhttpd/web/Y_Version.txt
View File

@@ -1,4 +1,4 @@
version=2.8.0.63
version=2.8.0.64
date=05.12.2014
type=Release
info=Port CST

164
src/nhttpd/web/Y_neutrino_Blocks.txt
View File

@@ -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
<div class="work_box">
<div class="work_box_head"><div class="work_box_head_h2">
{=var-set:help_url=Help-Settings-EPG=}{=var-set:menu={=L:set.menue.epg=}=}{=include-block:Y_Blocks.txt;work_menu=}</div></div>
<div class="work_box_body">
<form name="f" action="/y/cgi" class="y_form">
<table cellspacing="0" border="0" cellpadding="2" width="100%">
<tr>
<td colspan="2" width="35%" class="y_form_header">{=L:miscsettings.epg_head=}</td>
</tr>
<tr>
<td>{=L:miscsettings.epg_save=}</td>
<td>
<input type="radio" name="epg_save" value="false"/>{=L:off=}&nbsp;
<input type="radio" name="epg_save" value="true"/>{=L:on=}
</td>
</tr>
<tr>
<td>{=L:miscsettings.epg_save_standby=}</td>
<td>
<input type="radio" name="epg_save_standby" value="false"/>{=L:off=}&nbsp;
<input type="radio" name="epg_save_standby" value="true"/>{=L:on=}
</td>
</tr>
<tr>
<td>{=L:miscsettings.epg_save_frequently=}</td>
<td>
<input type="radio" name="epg_save_frequently" value="0"/>{=L:off=}&nbsp;
<input type="radio" name="epg_save_frequently" value="1"/>{=L:on=}
</td>
</tr>
<tr>
<td>{=L:miscsettings.epg_read=}</td>
<td>
<input type="radio" name="epg_read" value="false"/>{=L:off=}&nbsp;
<input type="radio" name="epg_read" value="true"/>{=L:on=}
</td>
</tr>
<tr>
<td>{=L:miscsettings.epg_dir=}</td>
<td><input type="text" name="epg_dir" size="40" value="{=ini-get:/var/tuxbox/config/neutrino.conf;epg_dir~open=}" title="" />&nbsp;e.g. /media/sda1/epg/</td>
</tr>
<tr>
<td colspan="2"><br/></td>
</tr>
<tr>
<td>{=L:miscsettings.epg_cache=}</td>
<td><input type="text" name="epg_cache_time" size="5" value="{=ini-get:/var/tuxbox/config/neutrino.conf;epg_cache_time~cache=}" title="" /></td>
</tr>
<tr>
<td>{=L:miscsettings.epg_extendedcache=}</td>
<td><input type="text" name="epg_extendedcache_time" size="5" value="{=ini-get:/var/tuxbox/config/neutrino.conf;epg_extendedcache_time~cache=}" title="" /></td>
</tr>
<tr>
<td>{=L:miscsettings.epg_old_events=}</td>
<td><input type="text" name="epg_old_events" size="5" value="{=ini-get:/var/tuxbox/config/neutrino.conf;epg_old_events~cache=}" title="" /></td>
</tr>
<tr>
<td>{=L:miscsettings.epg_max_events=}</td>
<td><input type="text" name="epg_max_events" size="5" value="{=ini-get:/var/tuxbox/config/neutrino.conf;epg_max_events~cache=}" title="" /></td>
</tr>
<tr>
<td colspan="2"><br/></td>
</tr>
<tr>
<td>{=L:miscsettings.epg_scan=}</td>
<td>
<select name="epg_scan_mode" title="">
<option value="0" selected="selected">{=L:off=}</option>
<option value="1">{=L:miscsettings.epg_scan_live=}</option>
<option value="2">{=L:miscsettings.epg_scan_standby=}</option>
<option value="3">{=L:miscsettings.epg_scan_always=}</option>
</select>
</td>
</tr>
<tr>
<td>{=L:miscsettings.epg_scan_bouquets=}</td>
<td>
<select name="epg_scan" title="">
<option value="1" selected="selected">{=L:miscsettings.epg_scan_bq=}</option>
<option value="2">{=L:miscsettings.epg_scan_fav=}</option>
<option value="3">{=L:miscsettings.epg_scan_sel=}</option>
</select>
</td>
</tr>
</table>
<br/>
<input type="hidden" name="tmpl" value="Y_Settings_neutrino_forms.yhtm"/>
<input type="hidden" name="execute" value="include-block:Y_neutrino_Blocks.txt;neutrino_epg_save_settings;nix"/>
<input type="hidden" name="form" value="{=form=}"/>
<button type="button" ytype="save" title="{=L:save_values_desc=}" onclick="do_submit()">{=L:save=}</button>
&nbsp;<button type="button" ytype="refresh" onclick="reload_neutrino_conf()">{=L:apply=}</button>
</form>
</div>
</div>
<script type="text/javascript">
//<![CDATA[
function form_init()
{
obj_set_radio_value('epg_save', "{=ini-get:/var/tuxbox/config/neutrino.conf;epg_save;false=}");
obj_set_radio_value('epg_save_standby', "{=ini-get:/var/tuxbox/config/neutrino.conf;epg_save_standby;false~cache=}");
obj_set_radio_value('epg_save_frequently', "{=ini-get:/var/tuxbox/config/neutrino.conf;epg_save_frequently;0~cache=}");
obj_set_radio_value('epg_read', "{=ini-get:/var/tuxbox/config/neutrino.conf;epg_read;false~cache=}");
val = "{=ini-get:/var/tuxbox/config/neutrino.conf;epg_scan_mode;0~cache=}";
document.f.epg_scan_mode.selectedIndex = val;
val = "{=ini-get:/var/tuxbox/config/neutrino.conf;epg_scan;1~cache=}";
document.f.epg_scan.selectedIndex = (val-1);
}
function do_submit()
{
show_waitbox(true);
document.f.submit();
}
form_init();
//]]>
</script>
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
<div class="work_box">
@@ -490,29 +625,6 @@ start-block~neutrino_form-data_diverse
<input type="radio" name="channellist_extended" value="true"/>{=L:on=}
</td>
</tr>
<tr>
<td colspan="2" width="35%" class="y_form_header">EPG-Einstellungen</td>
</tr>
<tr>
<td>EPG-Cache (Tage)</td>
<td><input type="text" name="epg_cache_time" size="5" value="{=ini-get:/var/tuxbox/config/neutrino.conf;epg_cache_time~cache=}" title="EPG cache"/></td>
</tr>
<tr>
<td>EPG-Langtext (Stunden)</td>
<td><input type="text" name="epg_extendedcache_time" size="5" value="{=ini-get:/var/tuxbox/config/neutrino.conf;epg_extendedcache_time~cache=}" title="EPG extended cache"/></td>
</tr>
<tr>
<td>EPG verwerfen nach (Std.)</td>
<td><input type="text" name="epg_old_events" size="5" value="{=ini-get:/var/tuxbox/config/neutrino.conf;epg_old_events~cache=}" title=""/></td>
</tr>
<tr>
<td>Max. Events</td>
<td><input type="text" name="epg_max_events" size="5" value="{=ini-get:/var/tuxbox/config/neutrino.conf;epg_max_events~cache=}" title=""/></td>
</tr>
<tr>
<td>EPG Verzeichnis</td>
<td><input type="text" name="epg_dir" size="40" value="{=ini-get:/var/tuxbox/config/neutrino.conf;epg_dir~cache=}" title="epg dircetory"/>&nbsp;e.g. /mnt/mmc/epg/</td>
</tr>
<tr>
<td colspan="2" width="35%" class="y_form_header">Zapit (Hinweis: pzapit -kill vorm Speichern ausf&uuml;hren)</td>
</tr>
@@ -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

2
src/nhttpd/web/languages/Deutsch
View File

@@ -29,6 +29,7 @@ send=Senden
save=Speichern
save_all=Alle &Auml;nderungen speichern
cancel=Abbrechen
apply=&Auml;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

2
src/nhttpd/web/languages/English
View File

@@ -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 &amp; Restore