yWeb: merge Y_Info_Updates into Y_About_yWeb

Origin commit data
------------------
Branch: ni/coolstream
Commit: f128c777c2
Author: vanhofen <vanhofen@gmx.de>
Date: 2023-03-06 (Mon, 06 Mar 2023)

Origin message was:
------------------
- yWeb: merge Y_Info_Updates into Y_About_yWeb

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

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

data/y-web/Makefile.am

@@ -37,7 +37,6 @@ install_DATA =	extensions.txt \
 		Y_Filemgr_Edit.yhtm \
 		Y_Info_Help.yhtm \
 		Y_Info_Menue.yhtm \
-		Y_Info_Updates.yhtm \
 		Y_Live_EPG.yhtm \
 		Y_Live_EPG_Info.yhtm \
 		Y_Main.css \

data/y-web/Y_About_yWeb.yhtm

@@ -1,5 +1,17 @@
-{=var-set:cancache=yPConf=}
 {=include-block:Y_Blocks.txt;head=}
+{=include-block:Y_Blocks.txt;js_jquery=}
+<script src="/Y_Baselib.js"></script>
+<script>
+function check_updates()
+{
+	loadSyncURL("/control/exec?Y_Tools&get_update_version");
+	location.reload();
+}
+
+jQuery(document).ready(function(){
+	loadSyncURL("/control/exec?Y_Tools&rm_update_version");
+});
+</script>
 {=include-block:Y_Blocks.txt;head_close=}
 {=var-set:alt_httpd={=ini-get:%(CONFIGDIR)/nhttpd.conf;WebsiteMain.override_directory;%(PUBLIC_HTTPDDIR)=}=}
 {=var-set:vf={=if-file-exists:{=var-get:alt_httpd=}/Y_Version.txt~{=var-get:alt_httpd=}/Y_Version.txt~Y_Version.txt=}=}
@@ -8,24 +20,47 @@
 	<div class="work_box_head"><div class="work_box_head_h2">
 	{=var-set:menu={=L:info.about_yweb=}=}{=include-block:Y_Blocks.txt;work_menu=}</div></div>
 	<div class="work_box_body">
-		<table border="0" cellpadding="2" cellspacing="4">
+		<table width="100%" border="0" cellpadding="2" cellspacing="4">
 		<tr>
-			<td valign="bottom" width="144"></td>
+			<td valign="bottom" width="15%"></td>
 			<td valign="bottom"><img border="0" src="images/tux-yweb.png" alt="yWeb by yjogol"/></td>
 		</tr>
 		<tr>
 			<td valign="top">&nbsp;</td>
 			<td valign="top">
-				v{=ini-get:{=var-get:vf=};version=} - {=ini-get:{=var-get:vf=};date=} - {=ini-get:{=var-get:vf=};info=}
-				<br/><br/>
+				<table width="100%" border="0">
+				<tr>
+					<td width="50%">
+						<b>{=L:info.your_version=}</b>
+						<p>
+						v{=ini-get:{=var-get:vf=};version=} - {=ini-get:{=var-get:vf=};date=}<br>
+						{=ini-get:{=var-get:vf=};info=}
+						</p>
+					</td>
+					<td>
+						{=if-file-exists:/tmp/version.txt~
+						<b>{=L:info.actual_version=}</b>
+						<p>
+						v{=ini-get:/tmp/version.txt;version=} - {=ini-get:/tmp/version.txt;date=}<br>
+						{=ini-get:/tmp/version.txt;info=}
+						</p>
+						~
+						<br>
+						<p>
+						<input type="button" onclick="check_updates()" value="{=L:info.check_for_updates=}"/>
+						</p>
+						=}
+					</td>
+				</tr>
+				</table>
 			</td>
 		</tr>
 		<tr>
 			<td valign="top">COPYRIGHTS</td>
 			<td>
-				yWeb (this Web interface) is licensed under the terms of the Open Source GPL 2 license.<br/>
+				yWeb (this Web interface) is licensed under the terms of the Open Source GPL 2 license.<br>
 				<a href="http://www.gnu.org/licenses/gpl.html" target="_new" class="exlink">http://www.gnu.org/licenses/old-licenses/gpl-2.0.html</a>
-				<br/><br/>
+				<br><br>
 				yWeb uses Icons from famfamfam (<a href="http://www.famfamfam.com" target="_new" class="exlink">http://www.famfamfam.com</a>) which are
 				licensed under Creative Common Attribution License 2.5
 			</td>
@@ -33,7 +68,7 @@
 		<tr>
 			<td valign="top">IMPORTANT</td>
 			<td>
-				Do not make yWeb accessible to untrusted networks!<br/>
+				Do not make yWeb accessible to untrusted networks!<br>
 				Otherwise someone else can access your Box.
 			</td>
 		</tr>

data/y-web/Y_Info_Menue.yhtm

@@ -22,11 +22,6 @@ function init(){
 				<li>
 					<a target="work" href="Y_About_yWeb.yhtm">{=L:info.about_yweb=}</a>
 				</li>
-				<li>
-					{=var-set:m_link_href=Y_Info_Updates.yhtm=}
-					{=var-set:m_link_text={=L:info.check_for_updates=}=}
-					{=include-block:Y_Blocks.txt;management_link=}
-				</li>
 				<li>
 					<a target="work" href="Y_Info_Help.yhtm">{=L:info.help=}</a>
 				</li>

data/y-web/Y_Info_Updates.yhtm

@@ -1,48 +0,0 @@
-{=include-block:Y_Blocks.txt;head=}
-<script src="/Y_Baselib.js"></script>
-<script>
-function check_updates()
-{
-	loadSyncURL("/control/exec?Y_Tools&get_update_version");
-	location.reload();
-}
-</script>
-{=include-block:Y_Blocks.txt;head_close=}
-<body>
-<div class="work_box">
-	<div class="work_box_head"><div class="work_box_head_h2">
-	{=var-set:menu={=L:info.check_for_updates=}=}{=include-block:Y_Blocks.txt;work_menu=}</div></div>
-	<div class="work_box_body">
-		<table border="0" cellpadding="2" cellspacing="4">
-		<tr>
-			<td valign="top" width="30%">
-				<b>{=L:info.your_version=}</b>
-				<p>
-				{=ini-get:Y_Version.txt;version=}<br/>
-				{=ini-get:Y_Version.txt;date=}<br/>
-				</br>
-				{=ini-get:Y_Version.txt;info=}<br/>
-				</p>
-			</td>
-			<td valign="top" width="30%">
-				<b>{=L:info.actual_version=}</b>
-				<p>
-				{=ini-get:/tmp/version.txt;version=}<br/>
-				{=ini-get:/tmp/version.txt;date=}<br/>
-				</br>
-				{=ini-get:/tmp/version.txt;info=}<br/>
-				{=if-empty:{=ini-get:/tmp/version.txt;url=}~~
-				<a href="{=ini-get:/tmp/version.txt;url=}" target="_blank">{=L:download=}</a><br/>
-				=}
-				</p>
-			</td>
-		</tr>
-		<tr><td><input type="button" onclick="check_updates()" value="{=L:check=}"/></td></tr>
-		</table>
-	</div>
-</div>
-<script>
-	loadSyncURL("/control/exec?Y_Tools&rm_update_version");
-</script>
-</body>
-</html>

data/y-web/Y_Version.txt

@@ -1,3 +1,3 @@
-version=3.0.54
-date=05.03.2023
+version=3.0.55
+date=06.03.2023
 info=NI-Neutrino-Webinterface