From 2bcc090622c0e62dbff94e52bb6892a51b40ba2a Mon Sep 17 00:00:00 2001
From: maTh <1645099+math-GH@users.noreply.github.com>
Date: Wed, 1 Oct 2025 10:48:07 +0200
Subject: configurable notification timeout (#7942)

Ref #7931
Ref #5466
Ref #6409

added configuration in "Display"
<img width="636" height="167" alt="grafik" src="https://github.com/user-attachments/assets/7bbc9f26-d91b-4dd2-b715-1d3f9b7a9ad3" />

* i18n: fr

* Update app/i18n/pl/conf.php

Co-authored-by: Inverle <inverle@proton.me>

* make fix-all

* max()

* Minor whitespace
(I am not a fan of excessive vertical indenting)

---------

Co-authored-by: Alexandre Alapetite <alexandre@alapetite.fr>
Co-authored-by: Inverle <inverle@proton.me>
---
 app/views/configure/display.phtml       | 18 +++++++++++++++++-
 app/views/helpers/javascript_vars.phtml |  5 +++++
 2 files changed, 22 insertions(+), 1 deletion(-)

(limited to 'app/views')

diff --git a/app/views/configure/display.phtml b/app/views/configure/display.phtml
index 27231c2f0..8efc13266 100644
--- a/app/views/configure/display.phtml
+++ b/app/views/configure/display.phtml
@@ -242,11 +242,27 @@
 		<div class="form-group">
 			<label class="group-name" for="html5_notif_timeout"><?= _t('conf.display.notif_html5.timeout') ?></label>
 			<div class="group-controls">
-				<input type="number" id="html5_notif_timeout" name="html5_notif_timeout" value="<?=
+				<input type="number" min="0" max="60" id="html5_notif_timeout" name="html5_notif_timeout" value="<?=
 					FreshRSS_Context::userConf()->html5_notif_timeout ?>" /> <?= _t('conf.display.notif_html5.seconds') ?>
 			</div>
 		</div>
 
+		<div class="form-group">
+			<label class="group-name" for="good_notification_timeout"><?= _t('conf.notification_timeout.good.label') ?></label>
+			<div class="group-controls">
+				<input type="number" min="0" max="60" id="good_notification_timeout" name="good_notification_timeout" value="<?=
+					FreshRSS_Context::userConf()->good_notification_timeout ?>" /> <?= _t('conf.notification_timeout.good.seconds') ?>
+			</div>
+		</div>
+
+		<div class="form-group">
+			<label class="group-name" for="bad_notification_timeout"><?= _t('conf.notification_timeout.bad.label') ?></label>
+			<div class="group-controls">
+				<input type="number" min="1" max="60" id="bad_notification_timeout" name="bad_notification_timeout" value="<?=
+					FreshRSS_Context::userConf()->bad_notification_timeout ?>" />  <?= _t('conf.notification_timeout.bad.seconds') ?>
+			</div>
+		</div>
+
 		<div class="form-group">
 			<div class="group-controls">
 				<label class="checkbox" for="show_nav_buttons">
diff --git a/app/views/helpers/javascript_vars.phtml b/app/views/helpers/javascript_vars.phtml
index 2cedc20c3..96275d51b 100644
--- a/app/views/helpers/javascript_vars.phtml
+++ b/app/views/helpers/javascript_vars.phtml
@@ -25,6 +25,11 @@ echo json_encode([
 		'sides_close_article' => !!FreshRSS_Context::userConf()->sides_close_article,
 		'sticky_post' => !!FreshRSS_Context::isStickyPostEnabled(),
 		'html5_notif_timeout' => FreshRSS_Context::userConf()->html5_notif_timeout,
+		'closeNotification' => [
+			'good' => FreshRSS_Context::userConf()->good_notification_timeout * 1000,
+			'bad' => FreshRSS_Context::userConf()->bad_notification_timeout * 1000,
+			'mouseLeave' => 3000,
+		],
 		'auth_type' => FreshRSS_Context::systemConf()->auth_type,
 		'current_view' => Minz_Request::actionName(),
 		'csrf' => FreshRSS_Auth::csrfToken(),
-- 
cgit v1.2.3