[Commits] : Tuxbox-GIT: apps branch master updated. CVS-Final-521-gcc5531d
Tuxbox Sources
Brought to you by:
dbt1
Menu
▾
▴
[Commits] : Tuxbox-GIT: apps branch master updated. CVS-Final-521-gcc5531d
|
From: GetAway <tux...@ne...> - 2015-04-12 19:27:21
|
Project "Tuxbox-GIT: apps":
The branch, master has been updated
via cc5531dfe4aadce6fd23fbdf1e8a48a90f2a92c4 (commit)
from fe3d32c7d4017a98a85147cefe5c425381768557 (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 cc5531dfe4aadce6fd23fbdf1e8a48a90f2a92c4
Author: svenhoefer <sve...@sv...>
Date: Sun Apr 12 21:24:56 2015 +0200
yWeb: add signal strength to boxcontrol menu
port from N-HD
fix translation in Y_Settings_nhttpd.yhtm
yWeb version bump 2.8.1.8
Signed-off-by: GetAway <get...@t-...>
diff --git a/tuxbox/neutrino/daemons/nhttpd/web/Y_Boxcontrol_Menue.yhtm b/tuxbox/neutrino/daemons/nhttpd/web/Y_Boxcontrol_Menue.yhtm
index 0bf6010..4fcfa0b 100644
--- a/tuxbox/neutrino/daemons/nhttpd/web/Y_Boxcontrol_Menue.yhtm
+++ b/tuxbox/neutrino/daemons/nhttpd/web/Y_Boxcontrol_Menue.yhtm
@@ -5,6 +5,64 @@
<script type="text/javascript" src="/Y_yweb.js"></script>
<script type="text/javascript">
//<![CDATA[
+var g_sig = 100;
+function set_sigbar(_sig){
+ var l = $("sigbar_left");
+ var r = $("sigbar_right");
+ /*IE: width=0 -> =""*/
+ if(_sig > 0)
+ l.width = _sig.toString()+"%";
+ else
+ l.width = "";
+ if(_sig >= 100)
+ r.width = "";
+ else
+ r.width = (100-_sig).toString()+"%";
+}
+function sig_get(){
+ var __sig_str = loadSyncURL("/control/signal?sig");
+ var __sig = parseInt(__sig_str,10);
+ if(isNaN(__sig)) __sig=100;
+ set_sigbar(__sig);
+ g_sig = __sig;
+ $('sig_value').update(g_sig);
+ return __sig;
+}
+
+var g_snr = 100;
+function set_snrbar(_snr){
+ var l = $("snrbar_left");
+ var r = $("snrbar_right");
+ /*IE: width=0 -> =""*/
+ if(_snr > 0)
+ l.width = _snr.toString()+"%";
+ else
+ l.width = "";
+ if(_snr >= 100)
+ r.width = "";
+ else
+ r.width = (100-_snr).toString()+"%";
+}
+function snr_get(){
+ var __snr_str = loadSyncURL("/control/signal?snr");
+ var __snr = parseInt(__snr_str,10);
+ if(isNaN(__snr)) __snr=100;
+ set_snrbar(__snr);
+ g_snr = __snr;
+ $('snr_value').update(g_snr);
+ return __snr;
+}
+
+var g_ber = 0;
+function ber_get(){
+ var __ber_str = loadSyncURL("/control/signal?ber");
+ var __ber = parseInt(__ber_str,10);
+ if(isNaN(__ber)) __ber=100;
+ g_ber = __ber;
+ $('ber_value').update(g_ber);
+ //return __ber;
+}
+
var g_volumen = 100;
function volumen_set_audiobar(_volumen)
{
@@ -64,9 +122,16 @@ function init(){
volumen_set_audiobar(volumen_get());
set_mute_button();
add_yExtensions('boxcontrol', 'secmenu_boxcontrol');
+
+ set_sigbar(sig_get());
+ set_snrbar(snr_get());
+ ber_get();
}
function get_data(){
volumen_set_audiobar(volumen_get());
+ set_sigbar(sig_get());
+ set_snrbar(snr_get());
+ ber_get();
}
//]]>
</script>
@@ -120,12 +185,37 @@ function get_data(){
<a href="javascript:volumen_set(g_volumen+10);"><img src="/images/volumeup.png"></a></span>
<span title="{=L:0217=}">
<a id="btMute" href="javascript:toggle_mute();"> <img src="/images/volumemute.png"> </a></span>
-<!-- <br/><br/>-->
<span title="{=L:0218=}"><a href="javascript:set_mode('tv');"><img src="/images/live.gif"> </a></span>
<span title="{=L:0219=}"><a href="javascript:set_mode('radio');"> <img src="/images/radio.png"></a></span>
</center>
</div>
</div>
+<div class="y_menu_sec_box">
+ <div class="y_menu_sec_box_head"><h2>{=L:0224=}</h2></div>
+ <div class="y_menu_sec_box_body">
+ <center>
+ <div class="y_text_boxcontrol_div_progress">SIG <span id="sig_value"></span>%</div>
+ <table class="y_text_boxcontrol_table_progress" cellspacing="0" cellpadding="0" title="{=L:0225=}">
+ <tr>
+ <td id="sigbar_left" width="100%"><img src="/images/blank.gif" height="1" width="0" alt="." /></td>
+ <td id="sigbar_right" width="0%"><img src="/images/blank.gif" height="1" width="0" alt="." /></td>
+ </tr>
+ </table>
+ </center>
+ <center>
+ <div class="y_text_boxcontrol_div_progress">SNR <span id="snr_value"></span>%</div>
+ <table class="y_text_boxcontrol_table_progress" cellspacing="0" cellpadding="0" title="{=L:0226=}">
+ <tr>
+ <td id="snrbar_left" width="100%"><img src="/images/blank.gif" height="1" width="0" alt="." /></td>
+ <td id="snrbar_right" width="0%"><img src="/images/blank.gif" height="1" width="0" alt="." /></td>
+ </tr>
+ </table>
+ </center>
+ <center>
+ <div class="y_text_boxcontrol_div_progress" title="{=L:0227=}">BER <span id="ber_value"></span></div>
+ </center>
+ </div>
+</div>
{=if-empty:{=ini-get:/var/tuxbox/config/Y-Web.conf;slavebox=}~~
<div class="y_menu_sec_box">
<div class="y_menu_sec_box_head"><h2>{=L:0223=}</h2></div>
diff --git a/tuxbox/neutrino/daemons/nhttpd/web/Y_Settings_nhttpd.yhtm b/tuxbox/neutrino/daemons/nhttpd/web/Y_Settings_nhttpd.yhtm
index b183900..db8d7a7 100644
--- a/tuxbox/neutrino/daemons/nhttpd/web/Y_Settings_nhttpd.yhtm
+++ b/tuxbox/neutrino/daemons/nhttpd/web/Y_Settings_nhttpd.yhtm
@@ -80,7 +80,7 @@ function do_submit()
<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:1510=}</td>
+ <td>{=L:1511=}</td>
<td>
<input type="radio" name="mod_sendfile_sendAll" value="false" />{=L:0032=}
<input type="radio" name="mod_sendfile_sendAll" value="true" />{=L:0031=}
diff --git a/tuxbox/neutrino/daemons/nhttpd/web/Y_Version.txt b/tuxbox/neutrino/daemons/nhttpd/web/Y_Version.txt
index cc193f4..002e258 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.1.7
-date=11.04.2015
+version=2.8.1.8
+date=12.04.2015
type=Release
info=Tuxbox
diff --git a/tuxbox/neutrino/daemons/nhttpd/web/languages/Deutsch b/tuxbox/neutrino/daemons/nhttpd/web/languages/Deutsch
index d14628e..0fdb530 100644
--- a/tuxbox/neutrino/daemons/nhttpd/web/languages/Deutsch
+++ b/tuxbox/neutrino/daemons/nhttpd/web/languages/Deutsch
@@ -119,6 +119,10 @@
0221=Lautstärke Anzeige
0222=dboxshot nicht installiert in
0223=Wechseln zu
+0224=Signalstärke
+0225=Signalstärkepegel anzeigen
+0226=Signal-Rausch-Verhältnis anzeigen
+0227=Bitfehlerverhältnis anzeigen
#======== Boxcontrol - fbshot - lcshot
0300=Schnappschuss
diff --git a/tuxbox/neutrino/daemons/nhttpd/web/languages/English b/tuxbox/neutrino/daemons/nhttpd/web/languages/English
index 0ea7c06..0f8548b 100644
--- a/tuxbox/neutrino/daemons/nhttpd/web/languages/English
+++ b/tuxbox/neutrino/daemons/nhttpd/web/languages/English
@@ -119,6 +119,10 @@
0221=volumen display
0222=dboxshot not installed at
0223=Switch to
+0224=Signal strength
+0225=Show signal strength level
+0226=Show signal to noise ratio
+0227=Show bit error ratio
#======== Boxcontrol - snapshot - fbshot
0300=snapshot
-----------------------------------------------------------------------
Summary of changes:
.../daemons/nhttpd/web/Y_Boxcontrol_Menue.yhtm | 92 +++++++++++++++++++-
.../daemons/nhttpd/web/Y_Settings_nhttpd.yhtm | 2 +-
tuxbox/neutrino/daemons/nhttpd/web/Y_Version.txt | 4 +-
.../neutrino/daemons/nhttpd/web/languages/Deutsch | 4 +
.../neutrino/daemons/nhttpd/web/languages/English | 4 +
5 files changed, 102 insertions(+), 4 deletions(-)
--
Tuxbox-GIT: apps
|
