diff --git a/data/y-web/Y_Boxcontrol_Menue.yhtm b/data/y-web/Y_Boxcontrol_Menue.yhtm index fcc7e420d..4fdf6fdff 100644 --- a/data/y-web/Y_Boxcontrol_Menue.yhtm +++ b/data/y-web/Y_Boxcontrol_Menue.yhtm @@ -1,4 +1,5 @@ {=include-block:Y_Blocks.txt;head=} +{=include-block:Y_Blocks.txt;js_jquery=} {=include-block:Y_Blocks.txt;js_prototype=} @@ -9,127 +10,128 @@ function epg_plus_popup() { } 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()+"%"; +function set_sigbar(_sig) { + var l = jQuery("#sigbar_left"); + var r = jQuery("#sigbar_right"); + if (_sig > 0) + l.width(_sig.toString() + "%"); else - l.width = ""; - if(_sig >= 100) - r.width = ""; + l.width(0); + if (_sig >= 100) + r.width(0); else - r.width = (100-_sig).toString()+"%"; + r.width((100 - _sig).toString() + "%"); } -function sig_get(){ +function get_sig() { var __sig_str = loadSyncURL("/control/signal?sig"); - var __sig = parseInt(__sig_str,10); - if(isNaN(__sig)) __sig=100; + var __sig = parseInt(__sig_str, 10); + if (isNaN(__sig)) + __sig = 100; set_sigbar(__sig); g_sig = __sig; - $('sig_value').update(g_sig); + jQuery("#sig_value").html(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()+"%"; +function set_snrbar(_snr) { + var l = jQuery("#snrbar_left"); + var r = jQuery("#snrbar_right"); + if (_snr > 0) + l.width(_snr.toString() + "%"); else - l.width = ""; - if(_snr >= 100) - r.width = ""; + l.width(0); + if (_snr >= 100) + r.width(0); else - r.width = (100-_snr).toString()+"%"; + r.width((100 - _snr).toString() + "%"); } -function snr_get(){ +function get_snr() { var __snr_str = loadSyncURL("/control/signal?snr"); - var __snr = parseInt(__snr_str,10); - if(isNaN(__snr)) __snr=100; + var __snr = parseInt(__snr_str, 10); + if (isNaN(__snr)) + __snr=100; set_snrbar(__snr); g_snr = __snr; - $('snr_value').update(g_snr); + jQuery("#snr_value").html(g_snr); return __snr; } var g_ber = 0; -function ber_get(){ +function ber_get() { var __ber_str = loadSyncURL("/control/signal?ber"); - var __ber = parseInt(__ber_str,10); - if(isNaN(__ber)) __ber=100; + var __ber = parseInt(__ber_str, 10); + if (isNaN(__ber)) + __ber = 100; g_ber = __ber; - $('ber_value').update(g_ber); + jQuery("#ber_value").html(g_ber); //return __ber; } -var g_volumen = 100; -function volumen_set_audiobar(_volumen){ - var l = $("audiobar_left"); - var r = $("audiobar_right"); - /*IE: width=0 -> =""*/ - if(_volumen > 0) - l.width = _volumen.toString()+"%"; +var g_volume = 100; +function set_volumebar(_volume) { + var l = jQuery("#volumebar_left"); + var r = jQuery("#volumebar_right"); + if (_volume > 0) + l.width(_volume.toString() + "%"); else - l.width = ""; - if(_volumen >= 100) - r.width = ""; + l.width(0); + if (_volume >= 100) + r.width(0); else - r.width = (100-_volumen).toString()+"%"; + r.width((100 - _volume).toString() + "%"); } -function volumen_get(){ - var __volumen_str = loadSyncURL("/control/volume"); - var __volumen = parseInt(__volumen_str,10); - if(isNaN(__volumen)) __volumen=100; - volumen_set_audiobar(__volumen); - g_volumen = __volumen; - return __volumen; +function get_volume() { + var __volume_str = loadSyncURL("/control/volume"); + var __volume = parseInt(__volume_str, 10); + if (isNaN(__volume)) + __volume = 100; + set_volumebar(__volume); + g_volume = __volume; + return __volume; } -function volumen_set(_volumen){ - _volumen = Math.min(100, _volumen); - _volumen = Math.max(0, _volumen); - loadSyncURL("/control/volume?"+_volumen); - volumen_set_audiobar(_volumen); - g_volumen = _volumen; +function set_volume(_volume) { + _volume = Math.min(100, _volume); + _volume = Math.max(0, _volume); + loadSyncURL("/control/volume?" + _volume); + set_volumebar(_volume); + g_volume = _volume; } -function set_mute_button(){ +function set_mute_button() { var status = loadSyncURL("/control/volume?status"); - $('btMute').update( (status==1) ? "" : ""); + jQuery("#mute_button").html((status == 1) ? "" : ""); return status; } -function toggle_mute(){ +function toggle_mute() { var status = loadSyncURL("/control/volume?status"); - if(status==0)//aus + if (status == 0) //off loadSyncURL("/control/volume?mute"); else loadSyncURL("/control/volume?unmute"); set_mute_button(); } -function set_mode(_mode){ +function set_mode(_mode) { var actual_mode = loadSyncURL("/control/getmode"); - if(actual_mode != _mode) + if (actual_mode != _mode) loadSyncURL("/control/setmode?" + _mode); parent.work.location.reload(); } -function get_data(){ - volumen_set_audiobar(volumen_get()); - set_sigbar(sig_get()); - set_snrbar(snr_get()); +function get_data() { + set_volumebar(get_volume()); + set_sigbar(get_sig()); + set_snrbar(get_snr()); ber_get(); } -function init(){ +function init() { get_data(); set_mute_button(); add_yExtensions('boxcontrol', 'secmenu_boxcontrol'); @@ -199,23 +201,23 @@ function init(){
- - + +
....

- + - + - + diff --git a/data/y-web/Y_Main.css b/data/y-web/Y_Main.css index 302b14325..1610caab1 100644 --- a/data/y-web/Y_Main.css +++ b/data/y-web/Y_Main.css @@ -620,7 +620,7 @@ tr { .y_text_boxcontrol_table { width:114px; height: 23px; - background: url('/images/audiobar.png') no-repeat 1px 1px; + background: url('/images/volumebar.png') no-repeat 1px 1px; padding: 1px; margin-top: 10px; border: #FD6D13 solid 1px; @@ -649,7 +649,7 @@ tr { margin-top: 5px; margin-bottom: -1px; } -#audiobar_right, +#volumebar_right, #sigbar_right, #snrbar_right { background-color: #ffffff; diff --git a/data/y-web/Y_Version.txt b/data/y-web/Y_Version.txt index 663b6877b..9f56eadde 100644 --- a/data/y-web/Y_Version.txt +++ b/data/y-web/Y_Version.txt @@ -1,3 +1,3 @@ -version=3.0.24 +version=3.0.25 date=17.02.2023 info=NI-Neutrino-Webinterface diff --git a/data/y-web/images/Makefile.am b/data/y-web/images/Makefile.am index f744def02..4f353a604 100644 --- a/data/y-web/images/Makefile.am +++ b/data/y-web/images/Makefile.am @@ -7,7 +7,6 @@ images_DATA = \ arrowleft.png \ arrowright.png \ arrowup.png \ - audiobar.png \ blank.png \ check_green.png \ comment.png \ @@ -43,6 +42,7 @@ images_DATA = \ unlock.png \ visible.png \ vlc.png \ + volumebar.png \ volumedown.png \ volumemute.png \ volumeunmute.png \ diff --git a/data/y-web/images/audiobar.png b/data/y-web/images/volumebar.png similarity index 100% rename from data/y-web/images/audiobar.png rename to data/y-web/images/volumebar.png diff --git a/data/y-web/styles/Y_Dist-GreyBlue.css b/data/y-web/styles/Y_Dist-GreyBlue.css index d8e7b5af3..07b298ad1 100644 --- a/data/y-web/styles/Y_Dist-GreyBlue.css +++ b/data/y-web/styles/Y_Dist-GreyBlue.css @@ -234,7 +234,7 @@ hr { .y_text_boxcontrol_div_progress { border-color: #303030; } -#audiobar_right, +#volumebar_right, #sigbar_right, #snrbar_right { background-color: #272525; diff --git a/data/y-web/styles/Y_Dist-NI_dark.css b/data/y-web/styles/Y_Dist-NI_dark.css index 60670296c..e907bc43d 100644 --- a/data/y-web/styles/Y_Dist-NI_dark.css +++ b/data/y-web/styles/Y_Dist-NI_dark.css @@ -190,7 +190,7 @@ textarea { .y_text_boxcontrol_div_progress { border-color: #3b3b3b; } -#audiobar_right, +#volumebar_right, #sigbar_right, #snrbar_right { background-color: #151515;