yweb: settings webserver, yweb: change naming convention & disable threading in settings for coolstream

git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@441 e54a6e83-5905-42d5-8d5c-058d10e6a962


Origin commit data
------------------
Branch: ni/coolstream
Commit: fddcc55224
Author: yjogol <yjogol2@online.de>
Date: 2010-03-01 (Mon, 01 Mar 2010)



------------------
This commit was generated by Migit
This commit is contained in:
yjogol
2010-03-01 07:02:54 +00:00
parent 64d6183f71
commit fd9c6ccc07
6 changed files with 105 additions and 94 deletions

View File

@@ -1,4 +1,3 @@
# ------- Timer iFrame
start-block~timer
{=include-block:Y_Blocks.txt;head=}
</head>
@@ -353,8 +352,8 @@ function do_submit()
</select>
</tr>
<tr>
<td>{=L:start_page=}</td>
<td> <select name="start_page" title="{=L:start_page=}">
<td>{=L:set.yweb.start_page=}</td>
<td> <select name="start_page" title="{=L:set.yweb.start_page=}">
<option value="bouquets" selected="selected">{=L:bouquets=}</option>
<option value="control">{=L:control=}</option>
<option value="none">{=L:empty=}</option>

View File

@@ -48,16 +48,16 @@ function init(){
<ul id="secmenu_general">
{=if-empty:{=var-get:management=}~
<li class="disabled" title="{=L:restriced_by_management_ip=}">yWeb</li>
<li class="disabled" title="{=L:restriced_by_management_ip=}">{=L:webserver=}</li>
<li class="disabled" title="{=L:restriced_by_management_ip=}">{=L:set.menue.webserver=}</li>
<li class="disabled" title="{=L:restriced_by_management_ip=}">{=L:zapit=}</li>
{=if-not-equal:{=global-var-get:boxtype=}~coolstream~
<li class="disabled" title="{=L:restriced_by_management_ip=}">{=L:ucodes=}</li>
<li class="disabled" title="{=L:restriced_by_management_ip=}">{=L:boot_logo=}</li>
<li class="disabled" title="{=L:restriced_by_management_ip=}">{=L:timer_settings=}</a></li>
~=}
<li class="disabled" title="{=L:restriced_by_management_ip=}">{=timer_settings=}</a></li>
~
<li><a target="work" href="Y_Settings_yWeb.yhtm">yWeb</a></li>
<li><a target="work" href="Y_Settings_nhttpd.yhtm">{=L:webserver=}</a></li>
<li><a target="work" href="Y_Settings_nhttpd.yhtm">{=L:set.menue.webserver=}</a></li>
{=if-not-equal:{=global-var-get:boxtype=}~coolstream~
<li><a target="work" href="Y_Settings_zapit.yhtm">{=L:zapit=}</a></li>
<li><a target="work" href="Y_Settings_ucodes.yhtm">{=L:ucodes=}</a></li>
@@ -65,8 +65,8 @@ function init(){
~=}
{=if-not-equal:{=global-var-get:boxtype=}~coolstream~
<li><a target="work" href="Y_Settings_Backup.yhtm">{=L:backup_restore=}</a></li>
<li><a target="work" href="Y_Settings_Timer.yhtm">{=L:timer_settings=}</a></li>
~=}
<li><a target="work" href="Y_Settings_Timer.yhtm">{=timer_settings=}</a></li>
=}
<!--<li><a title="change layout skin" target="work" href="Y_Settings_Skin.yhtm">Skins</a></li>-->
</ul>

View File

@@ -29,11 +29,11 @@ function do_submit()
{=var-set:wait_text={=L:save_values=}=}{=include-block:Y_Blocks.txt;snip_wait=}
<div class="work_box">
<div class="work_box_head"><div class="work_box_head_h2">
{=var-set:help_url=Help-Settings-WebServer=}{=var-set:menu={=L:webserver=}=}{=include-block:Y_Blocks.txt;work_menu=}</div></div>
{=var-set:help_url=Help-Settings-WebServer=}{=var-set:menu={=L:set.nhttpd.webserver=}=}{=include-block:Y_Blocks.txt;work_menu=}</div></div>
<div class="work_box_body">
<form name="f" class="y_form" action="/y/cgi">
<table border="0" width="100%">
<tr><td colspan="2" class="y_form_header">{=L:authentication=}</td></tr>
<tr><td colspan="2" class="y_form_header">{=L:set.nhttpd.authentication=}</td></tr>
<tr>
<td>{=L:user=}</td>
<td><input type="text" name="authuser" size="20" value="{=ini-get:/var/tuxbox/config/nhttpd.conf;mod_auth.username;root~open=}" title="{=L:user=}"/></td>
@@ -43,11 +43,11 @@ function do_submit()
<td><input type="password" name="authpassword" size="20" value="{=ini-get:/var/tuxbox/config/nhttpd.conf;mod_auth.password;dbox2~cache=}" title="{=L:password=}"/></td>
</tr>
<tr>
<td>{=L:client_without_authentication=}</td>
<td><input type="text" name="noauthclient" size="20" value="{=ini-get:/var/tuxbox/config/nhttpd.conf;mod_auth.no_auth_client~cache=}" title="{=L:client_without_authentication_desc=}"/></td>
<td>{=L:set.nhttpd.client_without_authentication=}</td>
<td><input type="text" name="noauthclient" size="20" value="{=ini-get:/var/tuxbox/config/nhttpd.conf;mod_auth.no_auth_client~cache=}" title="{=L:set.nhttpd.client_without_authentication_desc=}"/></td>
</tr>
<tr>
<td>{=L:authentication=}</td>
<td>{=L:set.nhttpd.authentication=}</td>
<td>
<input type="radio" name="authenticate" value="false" />{=L:off=}&nbsp;
<input type="radio" name="authenticate" value="true" />{=L:on=}
@@ -61,26 +61,30 @@ function do_submit()
</select>
</tr>
<tr>
<td>{=L:port=}</td>
<td>{=L:set.nhttpd.port=}</td>
<td><input type="text" name="port" size="20" value="{=ini-get:/var/tuxbox/config/nhttpd.conf;WebsiteMain.port;80~cache=}" title="{=L:port=}"/>&nbsp;{=L:active_after_boot=}
</td>
</tr>
<td>{=L:threading=}</td>
{=if-not-equal:{=global-var-get:boxtype=}~coolstream~
<tr>
<td>{=L:set.nhttpd.threading=}</td>
<td>
<input type="radio" name="threading" value="false" />{=L:off=}&nbsp;
<input type="radio" name="threading" value="true" />{=L:on=}
</td>
</tr>
=}
<tr>
<td>{=L:alternate_web_folder=}</td>
<td>{=L:set.nhttpd.alternate_web_folder=}</td>
<td><input type="text" name="override_directory" size="20" value="{=ini-get:/var/tuxbox/config/nhttpd.conf;WebsiteMain.override_directory~cache=}" title="{=L:alternate_web_folder=}"/>&nbsp;{=L:active_after_boot=}
<input type="hidden" name="HostedDocRoot" size="60" value="{=ini-get:/var/tuxbox/config/nhttpd.conf;WebsiteMain.hosted_directory~cache=}" title="Root of hosted Web. Enter mount directory."/></td>
</tr>
<tr>
<td>{=L:allowed_file_extensions=}</td>
<td>{=L:set.nhttpd.allowed_file_extensions=}</td>
<td><input type="text" name="mod_sendfile_mime_types" size="60" value="{=ini-get:/var/tuxbox/config/nhttpd.conf;mod_sendfile.mime_types~cache=}" "/></td>
</tr>
<tr>
<td>{=L:allow_all_file_extensions=}</td>
<td>{=L:set.nhttpd.allow_all_file_extensions=}</td>
<td>
<input type="radio" name="mod_sendfile_sendAll" value="false" />{=L:off=}&nbsp;
<input type="radio" name="mod_sendfile_sendAll" value="true" />{=L:on=}
@@ -88,22 +92,22 @@ function do_submit()
</tr>
<tr><td colspan="2" class="y_form_header">{=L:logos=}</td></tr>
<tr>
<td>{=L:url=}</td>
<td><input type="text" name="Tuxbox_LogosURL" size="60" value="{=ini-get:/var/tuxbox/config/nhttpd.conf;Tuxbox.LogosURL~cache=}" title="{=L:url_of_logos_desc=}"/></td>
<td>{=L:set.nhttpd.url_of_logos=}</td>
<td><input type="text" name="Tuxbox_LogosURL" size="60" value="{=ini-get:/var/tuxbox/config/nhttpd.conf;Tuxbox.LogosURL~cache=}" title="{=L:set.nhttpd.url_of_logos_desc=}"/></td>
</tr>
<tr><td colspan="2" class="y_form_header">{=L:server=}</td></tr>
<tr><td colspan="2" class="y_form_header">{=L:set.nhttpd.server=}</td></tr>
<tr>
<td>{=L:ips_without_keep_alive=}<br/>{=L:ips_without_keep_alive_desc=} </td>
<td>{=L:set.nhttpd.ips_without_keep_alive=}<br/>{=L:set.nhttpd.ips_without_keep_alive_desc=} </td>
<td><input type="text" name="no_keep_alive_ips" size="30" maxsize="254" value="{=ini-get:/var/tuxbox/config/nhttpd.conf;server.no_keep-alive_ips;~cache=}" "/>
</td>
</tr>
<tr>
<td>{=L:cache=}</td>
<td><a href="/y/cache-info" target="_blank"><u>{=L:cache_info=}</u>&nbsp;</a><button type="button" ytype="clear" name="clearcache" onclick="javascript:yhttpd_cache_clear('');">{=L:clear_cache=}</button></td>
<td>{=L:set.nhttpd.cache=}</td>
<td><a href="/y/cache-info" target="_blank"><u>{=L:set.nhttpd.cache_info=}</u>&nbsp;</a><button type="button" ytype="clear" name="clearcache" onclick="javascript:yhttpd_cache_clear('');">{=L:set.nhttpd.clear_cache=}</button></td>
</tr>
<tr>
<td>{=L:server_configuration=}</td>
<td><a href="/y/server-config" target="_blank"><u>{=L:server_configuration=}</u></a></td>
<td>{=L:set.nhttpd.server_configuration=}</td>
<td><a href="/y/server-config" target="_blank"><u>{=L:set.nhttpd.server_configuration=}</u></a></td>
</tr>
</table>
<br/>

View File

@@ -36,42 +36,42 @@ function do_init(){
<div class="work_box_body">
<form name="f" class="y_form" action="/y/cgi">
<table border="0" class="y_form_table">
<tr><td class="y_form_header" colspan="4">{=L:management_IPs=}</td></tr>
<tr><td class="y_form_header" colspan="4">{=L:set.yweb.management_IPs=}</td></tr>
<tr>
<td>IP 1</td>
<td colspan="3"><input type="text" name="managementIP" size="15" value="{=ini-get:/var/tuxbox/config/Y-Web.conf;management_ip=}" title="{=L:enter_ip_desc=}"/></td>
<td colspan="3"><input type="text" name="managementIP" size="15" value="{=ini-get:/var/tuxbox/config/Y-Web.conf;management_ip=}" title="{=L:set.yweb.enter_ip_desc=}"/></td>
</tr>
<tr>
<td>IP 2</td>
<td colspan="3"><input type="text" name="managementIP2" size="15" value="{=ini-get:/var/tuxbox/config/Y-Web.conf;management_ip2=}" title="{=L:enter_ip_desc=}"/></td>
<td colspan="3"><input type="text" name="managementIP2" size="15" value="{=ini-get:/var/tuxbox/config/Y-Web.conf;management_ip2=}" title="{=L:set.yweb.enter_ip_desc=}"/></td>
</tr>
<tr><td class="y_form_header" colspan="4">{=L:wake_on_lan=}</td></tr>
<tr><td class="y_form_header" colspan="4">{=L:set.yweb.wake_on_lan=}</td></tr>
<tr>
<td>MAC 1</td>
<td><input type="text" name="wol_mac_1" size="17" value="{=ini-get:/var/tuxbox/config/Y-Web.conf;wol_mac_1=}" title="{=L:enter_mac_desc=}"/></td>
<td>{=L:description=}</td>
<td><input type="text" name="wol_desc_1" size="17" value="{=ini-get:/var/tuxbox/config/Y-Web.conf;wol_desc_1=}" title="{=L:enter_description_desc=}"/></td>
<td><input type="text" name="wol_mac_1" size="17" value="{=ini-get:/var/tuxbox/config/Y-Web.conf;wol_mac_1=}" title="{=L:set.yweb.enter_mac_desc=}"/></td>
<td>{=L:set.yweb.description=}</td>
<td><input type="text" name="wol_desc_1" size="17" value="{=ini-get:/var/tuxbox/config/Y-Web.conf;wol_desc_1=}" title="{=L:set.yweb.enter_description_desc=}"/></td>
</tr>
<tr>
<td>MAC 2</td>
<td><input type="text" name="wol_mac_2" size="17" value="{=ini-get:/var/tuxbox/config/Y-Web.conf;wol_mac_2=}" title="{=L:enter_mac_desc=}"/></td>
<td>{=L:description=}</td>
<td><input type="text" name="wol_desc_2" size="17" value="{=ini-get:/var/tuxbox/config/Y-Web.conf;wol_desc_2=}" title="{=L:enter_description_desc=}"/></td>
<td><input type="text" name="wol_mac_2" size="17" value="{=ini-get:/var/tuxbox/config/Y-Web.conf;wol_mac_2=}" title="{=L:set.yweb.enter_mac_desc=}"/></td>
<td>{=L:dset.yweb.escription=}</td>
<td><input type="text" name="wol_desc_2" size="17" value="{=ini-get:/var/tuxbox/config/Y-Web.conf;wol_desc_2=}" title="{=L:set.yweb.enter_description_desc=}"/></td>
</tr>
<tr>
<td>MAC 3</td>
<td><input type="text" name="wol_mac_3" size="17" value="{=ini-get:/var/tuxbox/config/Y-Web.conf;wol_mac_3=}" title="{=L:enter_mac_desc=}"/></td>
<td>{=L:description=}</td>
<td><input type="text" name="wol_desc_3" size="17" value="{=ini-get:/var/tuxbox/config/Y-Web.conf;wol_desc_3=}" title="{=L:enter_description_desc=}"/></td>
<td><input type="text" name="wol_mac_3" size="17" value="{=ini-get:/var/tuxbox/config/Y-Web.conf;wol_mac_3=}" title="{=L:set.yweb.enter_mac_desc=}"/></td>
<td>{=L:set.yweb.description=}</td>
<td><input type="text" name="wol_desc_3" size="17" value="{=ini-get:/var/tuxbox/config/Y-Web.conf;wol_desc_3=}" title="{=L:set.yweb.enter_description_desc=}"/></td>
</tr>
<tr><td class="y_form_header" colspan="4">{=L:box_tag=}</td></tr>
<tr><td class="y_form_header" colspan="4">{=L:set.yweb.box_tag=}</td></tr>
<tr>
<td>{=L:tag=}</td>
<td>{=L:set.yweb.box_tag=}</td>
<td colspan="3"><input type="text" name="yweb_box_name" size="8" value="{=ini-get:/var/tuxbox/config/Y-Web.conf;yweb_box_name=}"
title="{=L:box_tag_desc=}"/></td>
</tr>
<tr>
<td>{=L:color=}</td>
<td>{=L:set.yweb.box_color=}</td>
<td colspan="3"><input type="text" name="yweb_box_color" size="8" value="{=ini-get:/var/tuxbox/config/Y-Web.conf;yweb_box_color=}"
title="{=L:box_color_desc=}"/></td>
</tr>
@@ -85,7 +85,7 @@ function do_init(){
<option value="Coolstream">Coolstream</option>
</tr>
<tr>
<td>{=L:start_page=}</td>
<td>{=L:set.yweb.start_page=}</td>
<td colspan="3"> <select name="start_page" title="{=L:start_page=}">
<option value="bouquets" selected="selected">{=L:bouquets=}</option>
<option value="control">{=L:control=}</option>

View File

@@ -82,6 +82,8 @@ set.reload_neutrino=Neutrino neuladen
set.reboot_required=Neustart notwendig
set.sync_with_neutrino_desc=After changing settings via yWeb: <br/>Choose on TV "Main Menu->Service->Soft restart", to accept the changes within neutrino.<br/><br/>After changing settings within Neutrino: <br/>Choose on TV "Main Menu->Settings->Save settings now", to accept these changes and reload this page.
set.sync_with_neutrino=Zur Synchronisation mit Neutrino
========Settings Menue
set.menue.webserver=Webserver
========Neutrino Settings - Recording
set.rec.rec_dest=Aufnahmeziel
set.rec.device=Aufnahmeger&auml;t
@@ -147,33 +149,35 @@ set.parental.type.preset=Vorsperre
set.parental.minimum_age=Mindestalter
set.parental.pin=PIN
========Settings NHTTP
webserver=Webserver
authentication=Authentifikation
client_without_authentication_desc=Rechner ohne Authentifikation. IP des Rechners eingeben.
client_without_authentication=Rechner ohne Authentifikation
active_after_boot=Nach Neustart aktiv
port=Port
threading=Threading
alternate_web_folder=Alternativer Web-Ordner
allowed_file_extensions=Erlaubte Dateiendungen / MIME
allow_all_file_extensions=Alle Dateiendungen erlauben
url_of_logos_desc=URL der Logos eingeben
ips_without_keep_alive_desc=(z.B. JtG Server, Mit Kommas trennen)
ips_without_keep_alive=IPs mit No keep-alive
cache=Cache
cache_info=Cache Informationen
clear_cache=Cache löschen
server_configuration=Server Konfiguration
set.nhttpd.webserver=Webserver
set.nhttpd.authentication=Authentifikation
set.nhttpd.client_without_authentication_desc=Rechner ohne Authentifikation. IP des Rechners eingeben.
set.nhttpd.client_without_authentication=Rechner ohne Authentifikation
set.nhttpd.active_after_boot=Nach Neustart aktiv
set.nhttpd.port=Port
set.nhttpd.threading=Threading
set.nhttpd.alternate_web_folder=Alternativer Web-Ordner
set.nhttpd.allowed_file_extensions=Erlaubte Dateiendungen / MIME
set.nhttpd.allow_all_file_extensions=Alle Dateiendungen erlauben
set.nhttpd.url_of_logos_desc=URL bzw. Verzeichnis der Logos eingeben
set.nhttpd.url_of_logos=URL bzw. Verzeichnis der Logos
set.nhttpd.ips_without_keep_alive_desc=(z.B. JtG Server, Mit Kommas trennen)
set.nhttpd.ips_without_keep_alive=IPs mit No keep-alive
set.nhttpd.cache=Cache
set.nhttpd.cache_info=Cache Informationen
set.nhttpd.clear_cache=Cache löschen
set.nhttpd.server_configuration=Server Konfiguration
=========Settings yWeb
enter_ip_desc=IP Adresse eingeben (xxx.xxx.xxx.xxx)
enter_mac_desc=MAC Adresse eingeben (xx:xx:xx:xx:xx:xx)
enter_description_desc=Beschreibung eingeben
management_IPs=Management IPs
wake_on_lan=Wake on Lan
box_tag_desc=Box Name im Top-Menue.
box_tag=Box Bezeichnung
box_color_desc=Farbe der Box Bezeichnung im Top-Menue. z.B. 2188e0 eingeben ohne #
start_page=Startseite
set.yweb.enter_ip_desc=IP Adresse eingeben (xxx.xxx.xxx.xxx)
set.yweb.enter_mac_desc=MAC Adresse eingeben (xx:xx:xx:xx:xx:xx)
set.yweb.enter_description_desc=Beschreibung eingeben
set.yweb.management_IPs=Management IPs
set.yweb.wake_on_lan=Wake on Lan
set.yweb.box_tag_desc=Box Name im Top-Menue.
set.yweb.box_tag=Box Bezeichnung
set.yweb.box_color_desc=Farbe der Box Bezeichnung im Top-Menue. z.B. 2188e0 eingeben ohne #
set.yweb.box_color=Farbe
set.yweb.start_page=Startseite
=======Settings general
ucodes=Ucodes
boot_logo=Boot Logo

View File

@@ -84,6 +84,8 @@ set.reload_neutrino=reload Neutrino
set.reboot_required=reboot required
set.sync_with_neutrino_desc=After changing settings via yWeb: <br/>Choose on TV "Main Menu->Service->Soft restart", to accept the changes within neutrino.<br/><br/>After changing settings within Neutrino: <br/>Choose on TV "Main Menu->Settings->Save settings now", to accept these changes and reload this page.
set.sync_with_neutrino=Synchronization with Neutrino
========Settings Menue
set.menue.webserver=Webserver
========Neutrino Settings - Recording
set.rec.rec_dest=Recoring destination
set.rec.device=Recording device
@@ -149,33 +151,35 @@ set.parental.type.preset=Preset
set.parental.minimum_age=Minimum Age
set.parental.pin=PIN
========Settings NHTTP
webserver=Webserver
authentication=Authentication
client_without_authentication_desc=Client with no authentication check. Enter IP.
client_without_authentication=Client without Authentication
active_after_boot=active after boot
port=Port
threading=Threading
alternate_web_folder=Alternate Web-Folder
allowed_file_extensions=Allowed File Extensions / MIME
allow_all_file_extensions=Allow all File Extensions
url_of_logos_desc=Enter URL of Logos
ips_without_keep_alive_desc=(e.g. JtG Server, separate with commas)
ips_without_keep_alive=IPs with No keep-alive
cache=Cache
cache_info=Cache info
clear_cache=clear cache
server_configuration=Server Configuration
set.nhttpd.webserver=Webserver
set.nhttpd.authentication=Authentication
set.nhttpd.client_without_authentication_desc=Client with no authentication check. Enter IP.
set.nhttpd.client_without_authentication=Client without Authentication
set.nhttpd.active_after_boot=active after boot
set.nhttpd.port=Port
set.nhttpd.threading=Threading
set.nhttpd.alternate_web_folder=Alternate Web-Folder
set.nhttpd.allowed_file_extensions=Allowed File Extensions / MIME
set.nhttpd.allow_all_file_extensions=Allow all File Extensions
set.nhttpd.url_of_logos_desc=Enter URL or directory of Logos
set.nhttpd.url_of_logos=URL or directory of Logos
set.nhttpd.ips_without_keep_alive_desc=(e.g. JtG Server, separate with commas)
set.nhttpd.ips_without_keep_alive=IPs with No keep-alive
set.nhttpd.cache=Cache
set.nhttpd.cache_info=Cache info
set.nhttpd.clear_cache=clear cache
set.nhttpd.server_configuration=Server Configuration
=========Settings yWeb
enter_ip_desc=enter IP (xxx.xxx.xxx.xxx)
enter_mac_desc=enter MAC Adress (xx:xx:xx:xx:xx:xx)
enter_description_desc=enter description
management_IPs=Management IPs
wake_on_lan=Wake on Lan
box_tag_desc=Box Name in Top-Menue.
box_tag=Box Tag
box_color_desc=Box Name color in Top-Menue. e.g. enter 2188e0 without #
start_page=Start page
set.yweb.enter_ip_desc=enter IP (xxx.xxx.xxx.xxx)
set.yweb.enter_mac_desc=enter MAC Adress (xx:xx:xx:xx:xx:xx)
set.yweb.enter_description_desc=enter description
set.yweb.management_IPs=Management IPs
set.yweb.wake_on_lan=Wake on Lan
set.yweb.box_tag_desc=Box Name in Top-Menue.
set.yweb.box_tag=Box Tag
set.yweb.box_color_desc=Box Name color in Top-Menue. e.g. enter 2188e0 without #
set.yweb.box_color=Color
set.yweb.start_page=Start page
=======Settings general
ucodes=Ucodes
boot_logo=Boot Logo