From 6b2d7c1a921694a45f1d6e52457e08df596a2c2d Mon Sep 17 00:00:00 2001
From: vanhofen <vanhofen@gmx.de>
Date: Tue, 14 Feb 2023 23:56:16 +0100
Subject: [PATCH] yWeb: use prototype blocks

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

Origin message was:
------------------
- yWeb: use prototype blocks

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

------------------
This commit was generated by Migit
---
 data/y-web/Y_Blocks.txt              | 12 +++++++++---
 data/y-web/Y_Blocks_Neutrino.txt     |  2 +-
 data/y-web/Y_Boxcontrol_Menue.yhtm   |  2 +-
 data/y-web/Y_EPG_Plus.yhtm           |  2 +-
 data/y-web/Y_Ext_Menue.yhtm          |  2 +-
 data/y-web/Y_Ext_Settings.yhtm       |  2 +-
 data/y-web/Y_Ext_Uninstall.yhtm      |  2 +-
 data/y-web/Y_Ext_Update.yhtm         |  2 +-
 data/y-web/Y_Ext_Update_refresh.yhtm |  2 +-
 data/y-web/Y_Filemgr.yhtm            |  4 ++--
 data/y-web/Y_Filemgr_Edit.yhtm       |  2 +-
 data/y-web/Y_Info_Menue.yhtm         |  2 +-
 data/y-web/Y_Menue.yhtm              |  2 +-
 data/y-web/Y_Settings_Menue.yhtm     |  2 +-
 data/y-web/Y_Tools_Menue.yhtm        |  2 +-
 data/y-web/Y_Version.txt             |  4 ++--
 16 files changed, 26 insertions(+), 20 deletions(-)

diff --git a/data/y-web/Y_Blocks.txt b/data/y-web/Y_Blocks.txt
index 5c7ff0abf..2de82bf92 100644
--- a/data/y-web/Y_Blocks.txt
+++ b/data/y-web/Y_Blocks.txt
@@ -301,8 +301,10 @@ start-block~head_ni
 <link rel="stylesheet" type="text/css" href="/Y_NI.css" />
 <link rel="stylesheet" type="text/css" href="/Y_Dist.css" />
 <link rel="stylesheet" type="text/css" href="/Y_User.css" />
+{=include-block:Y_Blocks.txt;js_prototype=}
+{=include-block:Y_Blocks.txt;js_jquery=}
+{=include-block:Y_Blocks.txt;js_jquery_ui=}
 <script type="text/javascript" src="/Y_Baselib.js"></script>
-<script type="text/javascript" src="/prototype.js"></script>
 <script type="text/javascript" src="/Y_NIlib.js"></script>
 <script type="text/javascript">
 //<![CDATA[
@@ -310,8 +312,6 @@ start-block~head_ni
 	yhttpd_cache_clear('');
 //]]>
 </script>
-{=include-block:Y_Blocks.txt;js_jquery=}
-{=include-block:Y_Blocks.txt;js_jquery_ui=}
 end-block~head_ni
 
 # ------- Lay-HEAD close
@@ -319,6 +319,12 @@ start-block~head_close
 </head>
 end-block~head_close
 
+# ============= prototypejs
+# ------- prototype library
+start-block~js_prototype
+<script type="text/javascript" src="/prototype.js"></script>
+end-block~js_prototype
+
 # ============= jQuery
 # ------- jQuery library
 start-block~js_jquery
diff --git a/data/y-web/Y_Blocks_Neutrino.txt b/data/y-web/Y_Blocks_Neutrino.txt
index 633e5ec3c..5ded63e57 100644
--- a/data/y-web/Y_Blocks_Neutrino.txt
+++ b/data/y-web/Y_Blocks_Neutrino.txt
@@ -4,8 +4,8 @@ start-block~neutrino_form
 
 {=include-block:Y_Blocks.txt;management_check_top=}
 {=include-block:Y_Blocks.txt;head=}
+{=include-block:Y_Blocks.txt;js_prototype=}
 <script type="text/javascript" src="/Y_Baselib.js"></script>
-<script type="text/javascript" src="/prototype.js"></script>
 <style type="text/css">
 /*<![CDATA[*/
 .line {border-top: 1px solid #6D96A9;}
diff --git a/data/y-web/Y_Boxcontrol_Menue.yhtm b/data/y-web/Y_Boxcontrol_Menue.yhtm
index 0e0eeb77c..1d7cceda0 100644
--- a/data/y-web/Y_Boxcontrol_Menue.yhtm
+++ b/data/y-web/Y_Boxcontrol_Menue.yhtm
@@ -1,5 +1,5 @@
 {=include-block:Y_Blocks.txt;head=}
-<script type="text/javascript" src="/prototype.js"></script>
+{=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>
 <script type="text/javascript">
diff --git a/data/y-web/Y_EPG_Plus.yhtm b/data/y-web/Y_EPG_Plus.yhtm
index f2dcbacf7..176ca422d 100644
--- a/data/y-web/Y_EPG_Plus.yhtm
+++ b/data/y-web/Y_EPG_Plus.yhtm
@@ -1,8 +1,8 @@
 {=include-block:Y_Blocks.txt;head_no_charset=}
 <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"/>
 <link rel="stylesheet" type="text/css" href="/Y_NI.css" />
+{=include-block:Y_Blocks.txt;js_prototype=}
 <script type="text/javascript" src="/Y_Baselib.js"></script>
-<script type="text/javascript" src="/prototype.js"></script>
 <script type="text/javascript" src="/Y_EPG.js"></script>
 <script type="text/javascript">
 </script>
diff --git a/data/y-web/Y_Ext_Menue.yhtm b/data/y-web/Y_Ext_Menue.yhtm
index aabf4f7a2..e05dcb4d2 100644
--- a/data/y-web/Y_Ext_Menue.yhtm
+++ b/data/y-web/Y_Ext_Menue.yhtm
@@ -1,7 +1,7 @@
 {=var-set:extension={=if-file-exists:%(CONFIGDIR)/extensions.txt~%(CONFIGDIR)/extensions.txt~{=if-file-exists:%(PUBLIC_HTTPDDIR)/extensions.txt~%(PUBLIC_HTTPDDIR)/extensions.txt~%(PRIVATE_HTTPDDIR)/extensions.txt=}=}=}
 {=var-set:management={=if-equal:{=func:get_request_data client_addr=}~{=ini-get:%(CONFIGDIR)/Y-Web.conf;management_ip;{=func:get_request_data client_addr=}=}~1~=}{=if-equal:{=func:get_request_data client_addr=}~{=ini-get:%(CONFIGDIR)/Y-Web.conf;management_ip2=}~1~=}=}
 {=include-block:Y_Blocks.txt;head=}
-<script type="text/javascript" src="/prototype.js"></script>
+{=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>
 <script type="text/javascript">
diff --git a/data/y-web/Y_Ext_Settings.yhtm b/data/y-web/Y_Ext_Settings.yhtm
index b0a8275f9..1df06b533 100644
--- a/data/y-web/Y_Ext_Settings.yhtm
+++ b/data/y-web/Y_Ext_Settings.yhtm
@@ -1,6 +1,6 @@
 {=include-block:Y_Blocks.txt;management_check_top=}
 {=include-block:Y_Blocks.txt;head=}
-<script type="text/javascript" src="/prototype.js"></script>
+{=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>
 <script type="text/javascript" src="/Y_Ext_Update.js"></script>
diff --git a/data/y-web/Y_Ext_Uninstall.yhtm b/data/y-web/Y_Ext_Uninstall.yhtm
index c2908f6c2..0fc0f1827 100644
--- a/data/y-web/Y_Ext_Uninstall.yhtm
+++ b/data/y-web/Y_Ext_Uninstall.yhtm
@@ -1,6 +1,6 @@
 {=include-block:Y_Blocks.txt;management_check_top=}
 {=include-block:Y_Blocks.txt;head=}
-<script type="text/javascript" src="/prototype.js"></script>
+{=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>
 <script type="text/javascript" src="/Y_Ext_Update.js"></script>
diff --git a/data/y-web/Y_Ext_Update.yhtm b/data/y-web/Y_Ext_Update.yhtm
index b539a717a..28413a95a 100644
--- a/data/y-web/Y_Ext_Update.yhtm
+++ b/data/y-web/Y_Ext_Update.yhtm
@@ -1,6 +1,6 @@
 {=include-block:Y_Blocks.txt;management_check_top=}
 {=include-block:Y_Blocks.txt;head=}
-<script type="text/javascript" src="/prototype.js"></script>
+{=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>
 <script type="text/javascript" src="/Y_Ext_Update.js"></script>
diff --git a/data/y-web/Y_Ext_Update_refresh.yhtm b/data/y-web/Y_Ext_Update_refresh.yhtm
index 5b3ca4003..556a1b5d4 100644
--- a/data/y-web/Y_Ext_Update_refresh.yhtm
+++ b/data/y-web/Y_Ext_Update_refresh.yhtm
@@ -1,5 +1,5 @@
 {=include-block:Y_Blocks.txt;head=}
-<script type="text/javascript" src="/prototype.js"></script>
+{=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>
 <script type="text/javascript">
diff --git a/data/y-web/Y_Filemgr.yhtm b/data/y-web/Y_Filemgr.yhtm
index 78ba9313b..02ece4324 100644
--- a/data/y-web/Y_Filemgr.yhtm
+++ b/data/y-web/Y_Filemgr.yhtm
@@ -1,8 +1,8 @@
 {=include-block:Y_Blocks.txt;head=}
-<script type="text/javascript" src="/Y_Baselib.js"></script>
-<script type="text/javascript" src="/prototype.js"></script>
+{=include-block:Y_Blocks.txt;js_prototype=}
 <script type="text/javascript" src="/effects.js"></script>
 <script type="text/javascript" src="/accordion.js"></script>
+<script type="text/javascript" src="/Y_Baselib.js"></script>
 <script type="text/javascript">
 //<![CDATA[
 /* yWeb Extension: Filemgr (by yjogol)
diff --git a/data/y-web/Y_Filemgr_Edit.yhtm b/data/y-web/Y_Filemgr_Edit.yhtm
index a7aff190f..d0ca20358 100644
--- a/data/y-web/Y_Filemgr_Edit.yhtm
+++ b/data/y-web/Y_Filemgr_Edit.yhtm
@@ -1,6 +1,6 @@
 {=include-block:Y_Blocks.txt;head=}
+{=include-block:Y_Blocks.txt;js_prototype=}
 <script type="text/javascript" src="/Y_Baselib.js"></script>
-<script type="text/javascript" src="/prototype.js"></script>
 <script type="text/javascript">
 //<![CDATA[
 /* yWeb Extension: Filemgr (by yjogol)
diff --git a/data/y-web/Y_Info_Menue.yhtm b/data/y-web/Y_Info_Menue.yhtm
index f8a6fc111..4f3dbca06 100644
--- a/data/y-web/Y_Info_Menue.yhtm
+++ b/data/y-web/Y_Info_Menue.yhtm
@@ -1,6 +1,6 @@
 {=var-set:cancache=yPConf=}
 {=include-block:Y_Blocks.txt;head=}
-<script type="text/javascript" src="/prototype.js"></script>
+{=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>
 <script type="text/javascript">
diff --git a/data/y-web/Y_Menue.yhtm b/data/y-web/Y_Menue.yhtm
index 19a2698e1..7c4e9c486 100644
--- a/data/y-web/Y_Menue.yhtm
+++ b/data/y-web/Y_Menue.yhtm
@@ -1,6 +1,6 @@
 {=global-var-set:alpha=true=}
 {=include-block:Y_Blocks.txt;head=}
-<script type="text/javascript" src="/prototype.js"></script>
+{=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>
 <script type="text/javascript">
diff --git a/data/y-web/Y_Settings_Menue.yhtm b/data/y-web/Y_Settings_Menue.yhtm
index 9e8209c89..132fa4b00 100644
--- a/data/y-web/Y_Settings_Menue.yhtm
+++ b/data/y-web/Y_Settings_Menue.yhtm
@@ -1,6 +1,6 @@
 {=var-set:cancache=yPConf=}
 {=include-block:Y_Blocks.txt;head=}
-<script type="text/javascript" src="/prototype.js"></script>
+{=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>
 <script type="text/javascript">
diff --git a/data/y-web/Y_Tools_Menue.yhtm b/data/y-web/Y_Tools_Menue.yhtm
index b303ab071..575d8a32c 100644
--- a/data/y-web/Y_Tools_Menue.yhtm
+++ b/data/y-web/Y_Tools_Menue.yhtm
@@ -1,5 +1,5 @@
 {=include-block:Y_Blocks.txt;head=}
-<script type="text/javascript" src="/prototype.js"></script>
+{=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>
 <script type="text/javascript">
diff --git a/data/y-web/Y_Version.txt b/data/y-web/Y_Version.txt
index 35172a441..cfcfa8bd3 100644
--- a/data/y-web/Y_Version.txt
+++ b/data/y-web/Y_Version.txt
@@ -1,3 +1,3 @@
-version=3.0.12
-date=09.02.2023
+version=3.0.14
+date=14.02.2023
 info=NI-Neutrino-Webinterface