[Commits] : Tuxbox-GIT: apps branch master updated. CVS-Final-533-g5437543
Tuxbox Sources
Brought to you by:
dbt1
Menu
▾
▴
[Commits] : Tuxbox-GIT: apps branch master updated. CVS-Final-533-g5437543
|
From: GetAway <tux...@ne...> - 2015-04-18 17:57:12
|
Project "Tuxbox-GIT: apps":
The branch, master has been updated
via 54375439063a140a74b6d9aee5854de6750d01d1 (commit)
from dbefdbf5bfd0644e17687fadfe2540891cedbc2d (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 54375439063a140a74b6d9aee5854de6750d01d1
Author: GetAway <get...@t-...>
Date: Sat Apr 18 19:56:11 2015 +0200
yWeb: fix Y_live.yhtm tags
fix deinterlace default setting
more appropriate symbol for live settings
Signed-off-by: GetAway <get...@t-...>
diff --git a/tuxbox/neutrino/daemons/nhttpd/web/Y_Live.yhtm b/tuxbox/neutrino/daemons/nhttpd/web/Y_Live.yhtm
index 5a1b6be..33aa50d 100644
--- a/tuxbox/neutrino/daemons/nhttpd/web/Y_Live.yhtm
+++ b/tuxbox/neutrino/daemons/nhttpd/web/Y_Live.yhtm
@@ -57,7 +57,7 @@ function view_transcode_mode()
<table class="y_live_table" cellspacing="0" cellpadding="0" style="margin:0">
<tr><td>
<div id="bouquets_div"><div class="y_live_channels" style="border:1px solid #555555;">
- <img src="/images/smallwait.gif"> {=L:2501=}</div>
+ <img src="/images/smallwait.gif" /> {=L:2501=}</div>
</div>
</td><td>
{=if-equal:{=typ=}~popup~
@@ -72,22 +72,22 @@ function view_transcode_mode()
</td></tr>
<tr><td>
<div id="channels_div"><div class="y_live_bouquets" style="border:1px solid #555555;">
- <img src="/images/smallwait.gif"> {=L:2502=}</div>
+ <img src="/images/smallwait.gif" /> {=L:2502=}</div>
</div>
</td><td>
<button id="go" class="y_live_button" type="button" title="{=L:2504=}" onclick="change_channel()" disabled="disabled">
- <img src="/images/play.png"></button>
+ <img src="/images/play.png" /></button>
<button id="epg" class="y_live_button" type="button" title="{=L:2505=}" onclick="view_epg()" disabled="disabled">
- <img src="/images/epg.png"></button>
+ <img src="/images/epg.png" /></button>
</td></tr>
<tr id="subsRow" style="display:none">
<td>
<div id="subs_div"><div class="y_live_channels" style="border:1px solid #555555;">
- <img src="/images/smallwait.gif"> {=L:2507=}</div>
+ <img src="/images/smallwait.gif" /> {=L:2507=}</div>
</div>
</td><td>
<button id="go" class="y_live_button" type="button" title="{=L:2504=}" onclick="change_sub_channel()">
- <img src="/images/play.png"></button>
+ <img src="/images/play.png" /></button>
</td>
</tr>
@@ -100,40 +100,40 @@ function view_transcode_mode()
<div id="live_controls">
<form name="v" action="" method="get">
<button id="PlayOrPause" class="y_live_button" type="button" title="{=L:2508=}"
- onclick="do_play_or_pause()"><img src="/images/pause.png"></button>
+ onclick="do_play_or_pause()"><img src="/images/pause.png" /></button>
<button id="stop" type="button" title="{=L:2509=}" onclick="do_stop()" class="y_live_button">
- <img src="/images/stop.png"></button>
+ <img src="/images/stop.png" /></button>
<button id="mute" class="y_live_button" type="button" value="Mute" title="{=L:2510=}" onclick="do_mute_toggle()">
- <img src="/images/volumemute.png"></button>
+ <img src="/images/volumemute.png" /></button>
<button id="volumedown" class="y_live_button" type="button" value="-" title="{=L:2511=}" onclick="V2.set_volume_delta(-10);">
- <img src="/images/volumedown.png"></button>
+ <img src="/images/volumedown.png" /></button>
<button id="volumeup" class="y_live_button" type="button" value="+" title="{=L:2512=}" onclick="V2.set_volume_delta(+10);">
- <img src="/images/volumeup.png"></button>
+ <img src="/images/volumeup.png" /></button>
{=if-equal:{=mode=}~tv~
<button id="fullscreen" class="y_live_button" type="button" value="F"
title="{=L:2513=}" onclick="V2.toggle_fullscreen()">
- <img src="/images/fullscreen.png"></button>
+ <img src="/images/fullscreen.png" /></button>
=}
<button id="livelock" class="y_live_button" type="button" value="Lock" title="{=L:2514=}" name="lock" onclick="do_lock_toggle()">
- <img src="/images/livelock.png"></button>
+ <img src="/images/livelock.png" /></button>
{=if-equal:{=mode=}~tv~
<button class="y_live_button" type="button" value="set" title="{=L:2515=}" id="udp" onclick="do_udp_toggle()" style="visibility:hidden">
- <img src="/images/udp_switch_on.png"/></button>
+ <img src="/images/udp_switch_on.png" /></button>
<button class="y_live_button" type="button" value="set" title="{=L:2516=}" id="settings" onclick="view_settings_mode()">
- <img src="/images/properties.png"></button>
+ <img src="/images/properties.png" /></button>
<button class="y_live_button" type="button" value="S" title="{=L:2517=}" id="snapshot" onclick="V2.snapshot()" style="visibility:hidden">
- <img src="/images/snapshot.png"></button>
+ <img src="/images/snapshot.png" /></button>
=}
{=if-equal:{=typ=}~popup~~
{=if-equal:{=typ=}~transcode~~
<button id="rec" class="y_live_button" type="button" value="Rec" title="{=L:2518=}" name="record_mode" onclick="view_record_mode()" style="visibility:hidden">
- <img src="/images/record.png"></button>
+ <img src="/images/record.png" /></button>
=}
<button id="transcode" class="y_live_button" type="button" value="Transcode" title="{=L:2519=}" onclick="view_transcode_mode()" style="visibility:hidden">
- <img src="/images/transcode.png"></button>
+ <img src="/images/transcode.png" /></button>
=}
- <span id="audio_pid_list"></span>
+ <br /><span id="audio_pid_list"></span>
</form>
</div>
<script type="text/javascript">
@@ -144,7 +144,7 @@ function view_transcode_mode()
LiveTyp = "{=typ=}";
ClientAddr = "{=func:get_request_data clientaddr=}";
insert_message_control("{=L:2520=}");
- isDeinterlace = ("{=ini-get:/var/tuxbox/config/Y-Web.conf;deinterlace;true=}" == "true");
+ isDeinterlace = ("{=ini-get:/var/tuxbox/config/Y-Web.conf;deinterlace;false=}" == "true");
cachetime = {=ini-get:/var/tuxbox/config/Y-Web.conf;http_caching;1000=};
/* {=if-equal:{=typ=}~popup~
always_on_top();
diff --git a/tuxbox/neutrino/daemons/nhttpd/web/Y_Version.txt b/tuxbox/neutrino/daemons/nhttpd/web/Y_Version.txt
index 240e189..abd70c0 100644
--- a/tuxbox/neutrino/daemons/nhttpd/web/Y_Version.txt
+++ b/tuxbox/neutrino/daemons/nhttpd/web/Y_Version.txt
@@ -1,4 +1,4 @@
-version=2.8.2.21
+version=2.8.2.22
date=18.04.2015
type=Release
info=Tuxbox
diff --git a/tuxbox/neutrino/daemons/nhttpd/web/images/properties.gif b/tuxbox/neutrino/daemons/nhttpd/web/images/properties.gif
deleted file mode 100755
index 963ead1..0000000
Binary files a/tuxbox/neutrino/daemons/nhttpd/web/images/properties.gif and /dev/null differ
diff --git a/tuxbox/neutrino/daemons/nhttpd/web/images/properties.png b/tuxbox/neutrino/daemons/nhttpd/web/images/properties.png
old mode 100755
new mode 100644
index 046811e..47b75a4
Binary files a/tuxbox/neutrino/daemons/nhttpd/web/images/properties.png and b/tuxbox/neutrino/daemons/nhttpd/web/images/properties.png differ
-----------------------------------------------------------------------
Summary of changes:
tuxbox/neutrino/daemons/nhttpd/web/Y_Live.yhtm | 40 ++++++++++----------
tuxbox/neutrino/daemons/nhttpd/web/Y_Version.txt | 2 +-
.../daemons/nhttpd/web/images/properties.gif | Bin 214 -> 0 bytes
.../daemons/nhttpd/web/images/properties.png | Bin 807 -> 865 bytes
4 files changed, 21 insertions(+), 21 deletions(-)
delete mode 100755 tuxbox/neutrino/daemons/nhttpd/web/images/properties.gif
mode change 100755 => 100644 tuxbox/neutrino/daemons/nhttpd/web/images/properties.png
--
Tuxbox-GIT: apps
|
