From b9d92abc00c5680f4e15dc78b0c2b8248d2b553c Mon Sep 17 00:00:00 2001
From: vanhofen <vanhofen@gmx.de>
Date: Fri, 23 Dec 2016 23:40:24 +0100
Subject: [PATCH] NIyWeb: fix display of imageinfo ...

and disable online check; needs several fixes


Origin commit data
------------------
Branch: ni/coolstream
Commit: https://github.com/neutrino-images/ni-neutrino/commit/477c394f293fafb6f2afe42f558a31b6308ae082
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-12-23 (Fri, 23 Dec 2016)

Origin message was:
------------------
- NIyWeb: fix display of imageinfo ...

and disable online check; needs several fixes


------------------
This commit was generated by Migit
---
 data/y-web/Y_NI_About.yhtm       | 18 +++++++++++-------
 data/y-web/scripts/Y_NI_Tools.sh | 11 ++++++-----
 2 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/data/y-web/Y_NI_About.yhtm b/data/y-web/Y_NI_About.yhtm
index 7a592aa8f..4267b782e 100644
--- a/data/y-web/Y_NI_About.yhtm
+++ b/data/y-web/Y_NI_About.yhtm
@@ -69,7 +69,8 @@ jQuery(document).ready(function(){
 			<td valign="top" width="10%">
 				<b>Image</b>:<br/>
 				Version:<br/>
-				Commits:<br/>
+				Branch:<br/>
+				Commit:<br/>
 				Datum:<br/>
 				Ersteller:<br/>
 			</td>
@@ -77,28 +78,31 @@ jQuery(document).ready(function(){
 				{=ini-get:/.version;imagename=}<br/>
 				<abbr class="version" title="{=L:ni.about.your_image=}">
 				<script type="text/javascript">getVersion("{=ini-get:/.version;version=}");</script><br/>
-				NI: <a href="https://bitbucket.org/neutrino-images/ni-neutrino-hd/commits/{=ini-get:/.version;origin-commit=}" class="exlink" target="_blank" title="NI-Neutrino-HD Sources">{=ini-get:/.version;origin-commit=}</a>;
-				CST: <a href="http://git.c00lstreamtech.de/?p=cst-public-gui-neutrino.git;a=commit;h={=ini-get:/.version;remote-commit=}" class="exlink" target="_blank" title="Coolstream GIT repositories">{=ini-get:/.version;remote-commit=}</a><br/>
+				{=ini-get:/.version;branch=}<br/>
+				<a href="https://bitbucket.org/neutrino-images/ni-neutrino-hd/commits/{=ini-get:/.version;commit=}" class="exlink" target="_blank" title="NI-Neutrino-HD Sources">{=ini-get:/.version;commit=}</a><br/>
 				<script type="text/javascript">getBuild("{=ini-get:/.version;version=}");</script><br/>
 				</abbr>
 				{=ini-get:/.version;creator=}<br/>
 			</td>
+			<!--
 			<td valign="top" width="38%">
-				{=if-file-exists:/tmp/NI_update.txt~
-				<script type="text/javascript">compareVersion("{=ini-get:/.version;version=}", "{=ini-get:/tmp/NI_update.txt;version=}");</script>
+				{=if-file-exists:/tmp/update.txt~
+				<script type="text/javascript">compareVersion("{=ini-get:/.version;version=}", "{=ini-get:/tmp/update.txt;version=}");</script>
 				<span class="upd_no">{=L:ni.about.image_upd_no=}</span>
 				<span class="upd_yes">{=L:ni.about.image_upd_yes=}</span>
 				<br/>
 				<abbr class="version" title="{=L:ni.about.actual_image=}">
-				<script type="text/javascript">getVersion("{=ini-get:/tmp/NI_update.txt;version=}");</script><br/>
+				<script type="text/javascript">getVersion("{=ini-get:/tmp/update.txt;version=}");</script>
 				<br/>
-				<script type="text/javascript">getBuild("{=ini-get:/tmp/NI_update.txt;version=}");</script><br/>
+				<br/>
+				<script type="text/javascript">getBuild("{=ini-get:/tmp/update.txt;version=}");</script><br/>
 				</abbr>
 				<br/>
 				~
 				<input type="button" onclick='get_update_txt();' value="{=L:info.check_for_updates=}" />
 				=}
 			</td>
+			-->
 		</tr>
 		<tr>
 			<td colspan="4">
diff --git a/data/y-web/scripts/Y_NI_Tools.sh b/data/y-web/scripts/Y_NI_Tools.sh
index cde554ffb..35296e119 100644
--- a/data/y-web/scripts/Y_NI_Tools.sh
+++ b/data/y-web/scripts/Y_NI_Tools.sh
@@ -139,13 +139,14 @@ case "$action" in
 	;;
 	get_update_txt)
 		version="n/a"
-		wget -O /tmp/NI_release.txt "http://neutrino-images.de/neutrino-images/release/release.txt"
-		test -e /tmp/NI_release.txt && version=$(cat /tmp/NI_release.txt | grep ".img" | cut -d" " -f2)
-		echo "version=${version// /}" > /tmp/NI_update.txt
-		rm -f /tmp/NI_release.txt
+		#FIXME align url to box specs
+		wget -O /tmp/release.txt "http://neutrino-images.de/neutrino-images/update.php"
+		test -e /tmp/release.txt && version=$(cat /tmp/release.txt | grep ".img" | cut -d" " -f2)
+		echo "version=${version// /}" > /tmp/update.txt
+		rm -f /tmp/release.txt
 	;;
 	rm_update_txt)
-		rm -f /tmp/NI_update.txt
+		rm -f /tmp/update.txt
 	;;
 	get_flash_info)
 		MTPT=""