From 1f7890de40938fdcc2e9b794506df83a044f6dc2 Mon Sep 17 00:00:00 2001
From: vanhofen <vanhofen@gmx.de>
Date: Tue, 21 Feb 2023 22:52:10 +0100
Subject: [PATCH] yWeb: move goUrl() and goPort() away from Y_NIlib.js

Origin commit data
------------------
Branch: ni/coolstream
Commit: https://github.com/neutrino-images/ni-neutrino/commit/bc1587019750598e601285127f61124255eb89e5
Author: vanhofen <vanhofen@gmx.de>
Date: 2023-02-21 (Tue, 21 Feb 2023)

Origin message was:
------------------
- yWeb: move goUrl() and goPort() away from Y_NIlib.js

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

------------------
This commit was generated by Migit
---
 data/y-web/Y_Baselib.js                | 25 +++++++++++++++++++++++++
 data/y-web/Y_Blocks.txt                |  1 -
 data/y-web/Y_NI_About.yhtm             |  5 +++--
 data/y-web/Y_NI_Camd-control.yhtm      |  1 +
 data/y-web/Y_NI_Infoicons-control.yhtm |  2 ++
 data/y-web/Y_NI_NetFS-control.yhtm     |  1 +
 data/y-web/Y_NI_NetFS-edit.yhtm        |  1 +
 data/y-web/Y_NI_NetFS-init.yhtm        |  1 +
 data/y-web/Y_NI_PZapit-control.yhtm    |  1 +
 data/y-web/Y_NI_Plugin-control.yhtm    |  1 +
 data/y-web/Y_NIlib.js                  | 21 ---------------------
 data/y-web/Y_Tools_Boxcontrol.yhtm     |  8 --------
 data/y-web/Y_Tools_Info_Menue.yhtm     |  6 ------
 data/y-web/Y_Version.txt               |  4 ++--
 14 files changed, 38 insertions(+), 40 deletions(-)

diff --git a/data/y-web/Y_Baselib.js b/data/y-web/Y_Baselib.js
index 4adddb64e..887e87a80 100644
--- a/data/y-web/Y_Baselib.js
+++ b/data/y-web/Y_Baselib.js
@@ -528,3 +528,28 @@ function saveTextAsFile(content, filename, filetype)
 	}
 	downloadLink.click();
 }
+
+function goUrl(_url)
+{
+	var res = trim(loadSyncURL(_url));
+	switch(res)
+	{
+		case "1": res = "on"; break;
+		case "0": res = "off"; break;
+	}
+	var out = document.getElementById("out");
+	if (out)
+		out.innerHTML = res;
+}
+
+function goPort(_port)
+{
+	if (_port == "")
+		return;
+	var host = self.location.href;
+	var pos1 = host.indexOf('//');
+	var temp = host.substring(pos1 + 2, host.length);
+	var pos2 = temp.indexOf('/');
+	var host = host.substring(0, pos1 + 2 + pos2);
+	window.open(host + ":" + _port, "_blank");
+}
diff --git a/data/y-web/Y_Blocks.txt b/data/y-web/Y_Blocks.txt
index 692d4796b..df5d83bc3 100644
--- a/data/y-web/Y_Blocks.txt
+++ b/data/y-web/Y_Blocks.txt
@@ -299,7 +299,6 @@ start-block~head_ni
 {=include-block:Y_Blocks.txt;js_prototype=}
 {=include-block:Y_Blocks.txt;js_jquery=}
 {=include-block:Y_Blocks.txt;js_jquery_ui=}
-<script src="/Y_Baselib.js"></script>
 <script src="/Y_NIlib.js"></script>
 <script>
 	// Clear y-Cache in our pages
diff --git a/data/y-web/Y_NI_About.yhtm b/data/y-web/Y_NI_About.yhtm
index 13506dd2e..15bda9f13 100644
--- a/data/y-web/Y_NI_About.yhtm
+++ b/data/y-web/Y_NI_About.yhtm
@@ -1,5 +1,3 @@
-{=include-block:Y_Blocks.txt;head_ni=}
-
 {=var-set:_mtd_info_dev={=script:Y_NI_Tools get_mtd_info dev=}=}
 {=var-set:_mtd_info_name={=script:Y_NI_Tools get_mtd_info name=}=}
 
@@ -19,6 +17,9 @@
 {=var-set:_mem_free={=script:Y_NI_Tools get_mem_info free=}=}
 
 {=var-set:boxmodel={=func:get_boxmodel=}=}
+
+{=include-block:Y_Blocks.txt;head_ni=}
+<script src="/Y_Baselib.js"></script>
 <script>
 // taken from http://www.jjam.de/JavaScript/Datum_Uhrzeit/Wochentag.html
 function getWeekDay(dd,mm,yyyy) {
diff --git a/data/y-web/Y_NI_Camd-control.yhtm b/data/y-web/Y_NI_Camd-control.yhtm
index 2cb531e12..5d3019dc9 100644
--- a/data/y-web/Y_NI_Camd-control.yhtm
+++ b/data/y-web/Y_NI_Camd-control.yhtm
@@ -21,6 +21,7 @@
 {=var-set:doscamport={=script:Y_NI_Tools get_doscam_webif_port=}=}
 
 {=include-block:Y_Blocks.txt;head_ni=}
+<script src="/Y_Baselib.js"></script>
 <style>
 input[type="button"], .tools select {
 	width: 100%;
diff --git a/data/y-web/Y_NI_Infoicons-control.yhtm b/data/y-web/Y_NI_Infoicons-control.yhtm
index 502c6f969..ce0ac8feb 100644
--- a/data/y-web/Y_NI_Infoicons-control.yhtm
+++ b/data/y-web/Y_NI_Infoicons-control.yhtm
@@ -7,7 +7,9 @@
 {=var-set:icons_flag6={=ini-get:%(CONFIGDIR)/neutrino.conf;mode_icons_flag6~cache=}=}
 {=var-set:icons_flag7={=ini-get:%(CONFIGDIR)/neutrino.conf;mode_icons_flag7~cache=}=}
 {=var-set:icons_dir=%(ICONSDIR)=}
+
 {=include-block:Y_Blocks.txt;head_ni=}
+<script src="/Y_Baselib.js"></script>
 <script>
 function do_submit()
 {
diff --git a/data/y-web/Y_NI_NetFS-control.yhtm b/data/y-web/Y_NI_NetFS-control.yhtm
index bddef8966..3053ac830 100644
--- a/data/y-web/Y_NI_NetFS-control.yhtm
+++ b/data/y-web/Y_NI_NetFS-control.yhtm
@@ -17,6 +17,7 @@
 {=var-set:nr=7=} {=include-block:Y_Blocks.txt;netfs_is_mount=}
 
 {=include-block:Y_Blocks.txt;head_ni=}
+<script src="/Y_Baselib.js"></script>
 <script>
 function edit_popup()
 {
diff --git a/data/y-web/Y_NI_NetFS-edit.yhtm b/data/y-web/Y_NI_NetFS-edit.yhtm
index 9c6749f90..40e3e6e36 100644
--- a/data/y-web/Y_NI_NetFS-edit.yhtm
+++ b/data/y-web/Y_NI_NetFS-edit.yhtm
@@ -1,4 +1,5 @@
 {=include-block:Y_Blocks.txt;head_ni=}
+<script src="/Y_Baselib.js"></script>
 <script>
 function form_init()
 {
diff --git a/data/y-web/Y_NI_NetFS-init.yhtm b/data/y-web/Y_NI_NetFS-init.yhtm
index 753dee3ca..8a1d9f072 100644
--- a/data/y-web/Y_NI_NetFS-init.yhtm
+++ b/data/y-web/Y_NI_NetFS-init.yhtm
@@ -1,4 +1,5 @@
 {=include-block:Y_Blocks.txt;head_ni=}
+<script src="/Y_Baselib.js"></script>
 <script>
 jQuery(document).ready(function(){
         window.document.location.href='/Y_NI_NetFS-control.yhtm?mount_type={=mount_type=}&mount_type_s={=mount_type_s=}';
diff --git a/data/y-web/Y_NI_PZapit-control.yhtm b/data/y-web/Y_NI_PZapit-control.yhtm
index 93e7fac88..fd55cafa3 100644
--- a/data/y-web/Y_NI_PZapit-control.yhtm
+++ b/data/y-web/Y_NI_PZapit-control.yhtm
@@ -1,4 +1,5 @@
 {=include-block:Y_Blocks.txt;head_ni=}
+<script src="/Y_Baselib.js"></script>
 {=include-block:Y_Blocks.txt;head_close=}
 <body>
 <div class="work_box">
diff --git a/data/y-web/Y_NI_Plugin-control.yhtm b/data/y-web/Y_NI_Plugin-control.yhtm
index 7e3397780..554c27efe 100644
--- a/data/y-web/Y_NI_Plugin-control.yhtm
+++ b/data/y-web/Y_NI_Plugin-control.yhtm
@@ -9,6 +9,7 @@
 {=var-set:xupnpdport={=script:Y_NI_Tools get_xupnpd_webif_port=}=}
 
 {=include-block:Y_Blocks.txt;head_ni=}
+<script src="/Y_Baselib.js"></script>
 {=include-block:Y_Blocks.txt;head_close=}
 <body onload='goUrl("/control/reloadplugins");'>
 {=var-set:wait_text={=L:ni.plugin-control.title=}<br/>=}{=include-block:Y_Blocks.txt;snip_wait=}
diff --git a/data/y-web/Y_NIlib.js b/data/y-web/Y_NIlib.js
index 52959e5ef..952860fea 100644
--- a/data/y-web/Y_NIlib.js
+++ b/data/y-web/Y_NIlib.js
@@ -1,27 +1,6 @@
 /*	yWeb NIlib by NI-Team
 */
 
-//	next function is taken from the original yweb
-//	to make them available in all of our pages
-function goUrl(_url){
-	var res = trim(loadSyncURL(_url));
-	switch(res){
-		case "1": res="on"; break;
-		case "0": res="off"; break;
-	}
-	$("out").update(res);
-}
-
-function goPort(_port) {
-	if (_port == "") return;
-	var host = self.location.href;
-	var pos1 = host.indexOf('//');
-	var temp = host.substring(pos1+2,host.length);
-	var pos2 = temp.indexOf('/');
-	var host = host.substring(0,pos1+2+pos2);
-	window.open(host + ":" + _port,"_blank");
-}
-
 function Y_NI_Tools(_cmd, _tout){
 	$("out").update("");
 	show_waitbox(true);
diff --git a/data/y-web/Y_Tools_Boxcontrol.yhtm b/data/y-web/Y_Tools_Boxcontrol.yhtm
index 81efc61bf..c333dc08a 100644
--- a/data/y-web/Y_Tools_Boxcontrol.yhtm
+++ b/data/y-web/Y_Tools_Boxcontrol.yhtm
@@ -6,14 +6,6 @@
 function goConfirmUrl(_meld, _url){
 	if (confirm(_meld)==true) goUrl(_url);
 }
-function goUrl(_url){
-	var res = trim(loadSyncURL(_url));
-	switch(res){
-		case "1": res="on"; break;
-		case "0": res="off"; break;
-	}
-	jQuery('#out').text(res);
-}
 function set_btn_standby(){
 	var res = trim(loadSyncURL("/control/standby"));
 	var color = "gray";
diff --git a/data/y-web/Y_Tools_Info_Menue.yhtm b/data/y-web/Y_Tools_Info_Menue.yhtm
index c4564dfad..6d6d84adf 100644
--- a/data/y-web/Y_Tools_Info_Menue.yhtm
+++ b/data/y-web/Y_Tools_Info_Menue.yhtm
@@ -1,11 +1,5 @@
 {=include-block:Y_Blocks.txt;head=}
 <script src="/Y_Baselib.js"></script>
-<script>
-function goUrl(_url){
-	var res = loadSyncURL(_url);
-	id("out").innerHTML = res;
-}
-</script>
 {=include-block:Y_Blocks.txt;head_close=}
 <body>
 <div class="work_box">
diff --git a/data/y-web/Y_Version.txt b/data/y-web/Y_Version.txt
index fe5a72f47..8dc034439 100644
--- a/data/y-web/Y_Version.txt
+++ b/data/y-web/Y_Version.txt
@@ -1,3 +1,3 @@
-version=3.0.40
-date=20.02.2023
+version=3.0.41
+date=21.02.2023
 info=NI-Neutrino-Webinterface