From 1002511962c0e0db635c351d60eb891cd3f14596 Mon Sep 17 00:00:00 2001
From: vanhofen <vanhofen@gmx.de>
Date: Sun, 12 Mar 2023 20:09:11 +0100
Subject: [PATCH] yWeb: fix yinfo.yhtm and ylcd4linux.yhtm

Origin commit data
------------------
Branch: ni/coolstream
Commit: https://github.com/neutrino-images/ni-neutrino/commit/60a7ae8789a683958a0881a212ef4cde10c3d492
Author: vanhofen <vanhofen@gmx.de>
Date: 2023-03-12 (Sun, 12 Mar 2023)

Origin message was:
------------------
- yWeb: fix yinfo.yhtm and ylcd4linux.yhtm

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

------------------
This commit was generated by Migit
---
 data/y-web/Y_Version.txt             | 2 +-
 data/y-web/info/manifest.json        | 2 +-
 data/y-web/info/yinfo.yhtm           | 1 +
 data/y-web/lcd4linux/manifest.json   | 2 +-
 data/y-web/lcd4linux/ylcd4linux.yhtm | 3 ++-
 5 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/data/y-web/Y_Version.txt b/data/y-web/Y_Version.txt
index a46dea88e..f006ad169 100644
--- a/data/y-web/Y_Version.txt
+++ b/data/y-web/Y_Version.txt
@@ -1,3 +1,3 @@
-version=3.1.1
+version=3.1.2
 date=12.03.2023
 info=NI-Neutrino-Webinterface
diff --git a/data/y-web/info/manifest.json b/data/y-web/info/manifest.json
index 5880ec1a1..8e9979bcd 100644
--- a/data/y-web/info/manifest.json
+++ b/data/y-web/info/manifest.json
@@ -1,5 +1,5 @@
 {
-    "name": "NI - yInfo",
+    "name": "yInfo",
     "icons": [
         {
             "src": "/favicon/android-chrome-192x192.png",
diff --git a/data/y-web/info/yinfo.yhtm b/data/y-web/info/yinfo.yhtm
index 1b8f3e7c4..93f8bba3c 100644
--- a/data/y-web/info/yinfo.yhtm
+++ b/data/y-web/info/yinfo.yhtm
@@ -16,6 +16,7 @@
 {=var-set:volume={=script:Y_Tools getline /tmp/lcd/volume=}=}
 
 {=include-block:Y_Blocks.txt;head=}
+{=include-block:Y_Blocks.txt;js_jquery=}
 <meta http-equiv="refresh" content="15; URL=yinfo.yhtm">
 
 <link rel="apple-touch-icon" sizes="180x180" href="/favicon/apple-touch-icon.png">
diff --git a/data/y-web/lcd4linux/manifest.json b/data/y-web/lcd4linux/manifest.json
index 062715694..8ba00a98d 100644
--- a/data/y-web/lcd4linux/manifest.json
+++ b/data/y-web/lcd4linux/manifest.json
@@ -1,5 +1,5 @@
 {
-    "name": "NI - yLCD4Linux",
+    "name": "yLCD4Linux",
     "icons": [
         {
             "src": "/favicon/android-chrome-192x192.png",
diff --git a/data/y-web/lcd4linux/ylcd4linux.yhtm b/data/y-web/lcd4linux/ylcd4linux.yhtm
index 01103e968..94a39ed84 100644
--- a/data/y-web/lcd4linux/ylcd4linux.yhtm
+++ b/data/y-web/lcd4linux/ylcd4linux.yhtm
@@ -1,7 +1,8 @@
 {=var-set:lcd4linux_png=/tmp/lcd4linux.png=}
 
 {=include-block:Y_Blocks.txt;head=}
-<meta http-equiv="refresh" content="15; URL=ylcd4linux.yhtm">
+{=include-block:Y_Blocks.txt;js_jquery=}
+<meta http-equiv="refresh" content="{=ini-get:%(CONFIGDIR)/yWeb.conf;screenshot_timeout;15=}; URL=ylcd4linux.yhtm">
 
 <link rel="apple-touch-icon" sizes="180x180" href="/favicon/apple-touch-icon.png">
 <link rel="icon" type="image/png" href="/favicon/favicon-32x32.png" sizes="32x32">