yWeb/Y_Boxcontrol_Menue: use jquery

Origin commit data
------------------
Branch: ni/coolstream
Commit: 6898811697
Author: vanhofen <vanhofen@gmx.de>
Date: 2023-02-18 (Sat, 18 Feb 2023)

Origin message was:
------------------
- yWeb/Y_Boxcontrol_Menue: use jquery

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit

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=}
 <script type="text/javascript" src="/Y_Baselib.js"></script>
 <script type="text/javascript" src="/Y_yweb.js"></script>
@@ -9,127 +10,128 @@ function epg_plus_popup() {
 }
 
 var g_sig = 100;
-function set_sigbar(_sig){
+function set_sigbar(_sig) {
-	var l = $("sigbar_left");
+	var l = jQuery("#sigbar_left");
-	var r = $("sigbar_right");
+	var r = jQuery("#sigbar_right");
-	/*IE: width=0 -> =""*/
+	if (_sig > 0)
-	if(_sig > 0)
+		l.width(_sig.toString() + "%");
-		l.width = _sig.toString()+"%";
 	else
-		l.width = "";
+		l.width(0);
-	if(_sig >= 100)
+	if (_sig >= 100)
-		r.width = "";
+		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);
+	var __sig = parseInt(__sig_str, 10);
-	if(isNaN(__sig)) __sig=100;
+	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){
+function set_snrbar(_snr) {
-	var l = $("snrbar_left");
+	var l = jQuery("#snrbar_left");
-	var r = $("snrbar_right");
+	var r = jQuery("#snrbar_right");
-	/*IE: width=0 -> =""*/
+	if (_snr > 0)
-	if(_snr > 0)
+		l.width(_snr.toString() + "%");
-		l.width = _snr.toString()+"%";
 	else
-		l.width = "";
+		l.width(0);
-	if(_snr >= 100)
+	if (_snr >= 100)
-		r.width = "";
+		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);
+	var __snr = parseInt(__snr_str, 10);
-	if(isNaN(__snr)) __snr=100;
+	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);
+	var __ber = parseInt(__ber_str, 10);
-	if(isNaN(__ber)) __ber=100;
+	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;
+var g_volume = 100;
-function volumen_set_audiobar(_volumen){
+function set_volumebar(_volume) {
-	var l = $("audiobar_left");
+	var l = jQuery("#volumebar_left");
-	var r = $("audiobar_right");
+	var r = jQuery("#volumebar_right");
-	/*IE: width=0 -> =""*/
+	if (_volume > 0)
-	if(_volumen > 0)
+		l.width(_volume.toString() + "%");
-		l.width = _volumen.toString()+"%";
 	else
-		l.width = "";
+		l.width(0);
-	if(_volumen >= 100)
+	if (_volume >= 100)
-		r.width = "";
+		r.width(0);
 	else
-		r.width = (100-_volumen).toString()+"%";
+		r.width((100 - _volume).toString() + "%");
 }
 
-function volumen_get(){
+function get_volume() {
-	var __volumen_str = loadSyncURL("/control/volume");
+	var __volume_str = loadSyncURL("/control/volume");
-	var __volumen = parseInt(__volumen_str,10);
+	var __volume = parseInt(__volume_str, 10);
-	if(isNaN(__volumen)) __volumen=100;
+	if (isNaN(__volume))
-	volumen_set_audiobar(__volumen);
+		__volume = 100;
-	g_volumen = __volumen;
+	set_volumebar(__volume);
-	return __volumen;
+	g_volume = __volume;
+	return __volume;
 }
 
-function volumen_set(_volumen){
+function set_volume(_volume) {
-	_volumen = Math.min(100, _volumen);
+	_volume = Math.min(100, _volume);
-	_volumen = Math.max(0, _volumen);
+	_volume = Math.max(0, _volume);
-	loadSyncURL("/control/volume?"+_volumen);
+	loadSyncURL("/control/volume?" + _volume);
-	volumen_set_audiobar(_volumen);
+	set_volumebar(_volume);
-	g_volumen = _volumen;
+	g_volume = _volume;
 }
 
-function set_mute_button(){
+function set_mute_button() {
 	var status = loadSyncURL("/control/volume?status");
-	$('btMute').update( (status==1) ? "<img src=\"/images/volumeunmute.png\">" : "<img src=\"/images/volumemute.png\">");
+	jQuery("#mute_button").html((status == 1) ? "<img src=\"/images/volumemute.png\">" : "<img src=\"/images/volumeunmute.png\">");
 	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(){
+function get_data() {
-	volumen_set_audiobar(volumen_get());
+	set_volumebar(get_volume());
-	set_sigbar(sig_get());
+	set_sigbar(get_sig());
-	set_snrbar(snr_get());
+	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(){
 		<center>
 			<table class="y_text_boxcontrol_table" cellspacing="0" cellpadding="0" title="{=L:bc.menue.volumen_display=}">
 			<tr>
-			<td id="audiobar_left" width="100%"><img src="/images/blank.png" height="1" width="0" alt="."/></td>
+			<td id="volumebar_left" width="100%"><img src="/images/blank.png" height="1" width="0" alt="."/></td>
-			<td id="audiobar_right" width="0%"><img src="/images/blank.png" height="1" width="0" alt="."/></td>
+			<td id="volumebar_right" width="0%"><img src="/images/blank.png" height="1" width="0" alt="."/></td>
 			</tr>
 			</table>
 			<br/>
 			<span class="control_icon" title="{=L:bc.menue.decrease_volume=}">
-				<a href="javascript:volumen_set(g_volumen-10);">
+				<a href="javascript:set_volume(g_volume-10);">
 					<img src="/images/volumedown.png">
 				</a>
 			</span>
 			<span class="control_icon" title="{=L:bc.menue.increase_volume=}">
-				<a href="javascript:volumen_set(g_volumen+10);">
+				<a href="javascript:set_volume(g_volume+10);">
 					<img src="/images/volumeup.png">
 				</a>
 			</span>
 			<span class="control_icon" title="{=L:bc.menue.mute_volume=}">
-				<a id="btMute" href="javascript:toggle_mute();">
+				<a id="mute_button" href="javascript:toggle_mute();">
 					<img src="/images/volumemute.png">
 				</a>
 			</span>

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;

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

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 \

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;

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;