From a4882fe982a827b6c001eb82d90620ccbf582580 Mon Sep 17 00:00:00 2001 From: vanhofen Date: Sat, 18 Mar 2023 09:56:55 +0100 Subject: [PATCH] yWeb/Y_About_Image: add waitbox; minor formatting fixes Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/aeb9f845f958c747121173c31e0b9145444c00f6 Author: vanhofen Date: 2023-03-18 (Sat, 18 Mar 2023) Origin message was: ------------------ - yWeb/Y_About_Image: add waitbox; minor formatting fixes ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- data/y-web/Y_About_Image.yhtm | 15 ++++++++++----- data/y-web/Y_Baselib.js | 2 +- data/y-web/Y_Version.txt | 4 ++-- 3 files changed, 13 insertions(+), 8 deletions(-) diff --git a/data/y-web/Y_About_Image.yhtm b/data/y-web/Y_About_Image.yhtm index 870a8a108..0299988c7 100644 --- a/data/y-web/Y_About_Image.yhtm +++ b/data/y-web/Y_About_Image.yhtm @@ -44,15 +44,19 @@ function getWeekDay(dd,mm,yyyy) { function compareVersion(_vi, _vo) { - if (_vi == "" || _vo == "") return; + if (_vi == "" || _vo == "") + return; - if (_vi >= _vo) jQuery(document).ready(function(){jQuery('.upd_no').show().css('color', '#c0c0c0')}); - else jQuery(document).ready(function(){jQuery('.upd_yes').show().css('color', '#008000')}); + if (_vi >= _vo) + jQuery(document).ready(function(){jQuery('.upd_no').show().css('color', '#c0c0c0')}); + else + jQuery(document).ready(function(){jQuery('.upd_yes').show().css('color', '#008000')}); } function getVersion(_version) { - if (_version == "") return; + if (_version == "") + return; var Vmajor = _version.substr(1, 1); var Vminor = _version.substr(2, 2); @@ -89,7 +93,7 @@ function getBuild(_version) function get_update_txt() { - //show_waitbox(true); + show_waitbox(true); loadSyncURL("/control/exec?Y_Tools&get_update_txt&{=func:get_revision=}&\"{=func:get_boxname=}\"&{=func:get_chip_type=}&nightly"); window.document.location.href="/Y_About_Image.yhtm?ani=false"; } @@ -114,6 +118,7 @@ jQuery(document).ready(function() {=include-block:Y_Blocks.txt;head_close=} +{=var-set:wait_text={=L:info.check_for_updates=}=}{=include-block:Y_Blocks.txt;snip_wait=}
{=var-set:menu={=L:info.about_image=}=}{=include-block:Y_Blocks.txt;work_menu=} diff --git a/data/y-web/Y_Baselib.js b/data/y-web/Y_Baselib.js index 215638b84..1bb1a9453 100644 --- a/data/y-web/Y_Baselib.js +++ b/data/y-web/Y_Baselib.js @@ -281,7 +281,7 @@ function obj_enable(_obj_name, _disable) function show_obj(_obj_name, _show) { var __obj = document.getElementById(_obj_name); - __obj.style.visibility= (_show) ? "visible" : "hidden"; + __obj.style.visibility = (_show) ? "visible" : "hidden"; } function display_obj(_obj_name, _display) diff --git a/data/y-web/Y_Version.txt b/data/y-web/Y_Version.txt index d893d4e6d..bdccbcc31 100644 --- a/data/y-web/Y_Version.txt +++ b/data/y-web/Y_Version.txt @@ -1,3 +1,3 @@ -version=3.1.3 -date=17.03.2023 +version=3.1.4 +date=18.03.2023 info=NI-Neutrino-Webinterface