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

- yWeb: port "Tuxbox.DisplayLogos" from martii

Browse Source
This commit is contained in:
svenhoefer
2015-04-05 23:30:10 +02:00
parent 90277c9982
commit dbc4d110fb
9 changed files with 32 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/nhttpd/web/Y_Blocks.txt
View File

@@ -59,6 +59,7 @@ start-block~nhttpd_save_settings
{=ini-set:/var/tuxbox/config/nhttpd.conf;mod_sendfile.mime_types;{=mod_sendfile_mime_types=}~cache=}
{=ini-set:/var/tuxbox/config/nhttpd.conf;mod_sendfile.sendAll;{=mod_sendfile_sendAll=}~cache=}
{=ini-set:/var/tuxbox/config/nhttpd.conf;Language.selected;{=language=}~cache=}
{=ini-set:/var/tuxbox/config/nhttpd.conf;Tuxbox.DisplayLogos;{=Tuxbox_DisplayLogos=}~cache=}
{=ini-set:/var/tuxbox/config/nhttpd.conf;Tuxbox.LogosURL;{=Tuxbox_LogosURL=}~save=}
{=func:do_reload_httpd_config=}
end-block~nhttpd_save_settings

2
src/nhttpd/web/Y_Live_EPG.yhtm
View File

@@ -106,7 +106,7 @@ function _show_epg()
<table id="epglist" class="y_invisible_table" cellpadding="4" cellspacing="0" width="100%">
<thead align="left">
<tr>
<th colspan="2"><img id="logo" src="{=ini-get:/var/tuxbox/config/nhttpd.conf;Tuxbox.LogosURL=}/{=logoid=}.png" style="visibility:hidden; max-width: 50px;"/>&nbsp;</th>
<th colspan="2"><img id="logo" src="{=func:get_logo_name {=channel=}=}" style="visibility:hidden; max-width: 50px;"/></th>
<th>{=L:date=}</th><th>{=L:from=}</th><th>{=L:to=}</th><th>{=L:program=}</th>
</tr>
</thead>

8
src/nhttpd/web/Y_Settings_nhttpd.yhtm
View File

@@ -8,6 +8,7 @@ function form_init()
obj_set_radio_value('authenticate', "{=ini-get:/var/tuxbox/config/nhttpd.conf;mod_auth.authenticate;false=}");
obj_set_radio_value('threading', "{=ini-get:/var/tuxbox/config/nhttpd.conf;webserver.threading;false=}");
obj_set_radio_value('mod_sendfile_sendAll', "{=ini-get:/var/tuxbox/config/nhttpd.conf;mod_sendfile.sendAll;false=}");
obj_set_radio_value('Tuxbox_DisplayLogos', "{=ini-get:/var/tuxbox/config/nhttpd.conf;Tuxbox.DisplayLogos;true=}"); // MARTII
}
function do_submit()
{
@@ -98,6 +99,13 @@ function do_submit()
</td>
</tr>
<tr><td colspan="2" class="y_form_header">{=L:logos=}</td></tr>
<tr>
<td>{=L:set.nhttpd.display_logos=}</td>
<td>
<input type="radio" name="Tuxbox_DisplayLogos" value="false" />{=L:off=}&nbsp;
<input type="radio" name="Tuxbox_DisplayLogos" value="true" />{=L:on=}
</td>
</tr>
<tr>
<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>

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

@@ -1,4 +1,4 @@
version=2.9.0.16
date=31.03.2015
version=2.9.0.17
date=05.04.2015
type=Release
info=Port CST

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

@@ -312,6 +312,7 @@ set.nhttpd.alternate_web_folder=Alternativer Web-Ordner
set.nhttpd.hosted_folder=Eingebundenes Verzeichnis
set.nhttpd.allowed_file_extensions=Erlaubte Dateiendungen / MIME
set.nhttpd.allow_all_file_extensions=Alle Dateiendungen erlauben
set.nhttpd.display_logos=Logos anzeigen
set.nhttpd.url_of_logos_desc=URL bzw. Verzeichnis der Logos eingeben
set.nhttpd.url_of_logos=URL bzw. Verzeichnis der Logos
set.nhttpd.server=Server

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

@@ -315,6 +315,7 @@ set.nhttpd.alternate_web_folder=Alternate Web-Folder
set.nhttpd.hosted_folder=Mounted directory
set.nhttpd.allowed_file_extensions=Allowed File Extensions / MIME
set.nhttpd.allow_all_file_extensions=Allow all File Extensions
set.nhttpd.display_logos=Display Logos
set.nhttpd.url_of_logos_desc=Enter URL or directory of Logos
set.nhttpd.url_of_logos=URL or directory of Logos
set.nhttpd.server=Server