diff --git a/app/Controllers/configureController.php b/app/Controllers/configureController.php
index bb96bfae3..b1cd45014 100755
--- a/app/Controllers/configureController.php
+++ b/app/Controllers/configureController.php
@@ -157,6 +157,7 @@ class FreshRSS_configure_Controller extends Minz_ActionController {
$this->view->conf->_bottomline_tags(Minz_Request::param('bottomline_tags', false));
$this->view->conf->_bottomline_date(Minz_Request::param('bottomline_date', false));
$this->view->conf->_bottomline_link(Minz_Request::param('bottomline_link', false));
+ $this->view->conf->_html5_notif_timeout(Minz_Request::param('html5_notif_timeout', 0));
$this->view->conf->save();
Minz_Session::_param('language', $this->view->conf->language);
diff --git a/app/Models/Configuration.php b/app/Models/Configuration.php
index 352e70f4f..f94d82402 100644
--- a/app/Models/Configuration.php
+++ b/app/Models/Configuration.php
@@ -60,6 +60,7 @@ class FreshRSS_Configuration {
'bottomline_link' => true,
'sharing' => array(),
'queries' => array(),
+ 'html5_notif_timeout' => 0,
);
private $available_languages = array(
@@ -280,6 +281,12 @@ class FreshRSS_Configuration {
$this->data['content_width'] = 'thin';
}
}
+
+ public function _html5_notif_timeout ($value) {
+ $value = intval($value);
+ $this->data['html5_notif_timeout'] = $value >= 0 ? $value : 0;
+ }
+
public function _token($value) {
$this->data['token'] = $value;
}
diff --git a/app/i18n/de.php b/app/i18n/de.php
index 4301a8b6d..3dc1536de 100644
--- a/app/i18n/de.php
+++ b/app/i18n/de.php
@@ -212,6 +212,8 @@ return array (
'reading_icons' => 'Lese Symbol',
'top_line' => 'Kopfzeile',
'bottom_line' => 'Fusszeile',
+ 'html5_notif_timeout' => 'HTML5 notification timeout',
+ 'seconds_(0_means_no_timeout)' => 'seconds (0 means no timeout)',
'img_with_lazyload' => 'Verwende die "träge laden" Methode zum laden von Bildern',
'auto_read_when' => 'Artikel als gelesen markieren…',
'article_selected' => 'wenn der Artikel ausgewählt ist',
diff --git a/app/i18n/en.php b/app/i18n/en.php
index b14b36b32..e59b0f04f 100644
--- a/app/i18n/en.php
+++ b/app/i18n/en.php
@@ -283,6 +283,8 @@ return array (
'article_icons' => 'Article icons',
'top_line' => 'Top line',
'bottom_line' => 'Bottom line',
+ 'html5_notif_timeout' => 'HTML5 notification timeout',
+ 'seconds_(0_means_no_timeout)' => 'seconds (0 means no timeout)',
'img_with_lazyload' => 'Use "lazy load" mode to load pictures',
'sticky_post' => 'Stick the article to the top when opened',
'reading_confirm' => 'Display a confirmation dialog on “mark all as read” actions',
diff --git a/app/i18n/fr.php b/app/i18n/fr.php
index 3dc429bbb..591a16f58 100644
--- a/app/i18n/fr.php
+++ b/app/i18n/fr.php
@@ -283,6 +283,8 @@ return array (
'article_icons' => 'Icônes d’article',
'top_line' => 'Ligne du haut',
'bottom_line' => 'Ligne du bas',
+ 'html5_notif_timeout' => 'Temps d\'affichage de la notification HTML5',
+ 'seconds_(0_means_no_timeout)' => 'secondes (0 signifie aucun timeout ) ',
'img_with_lazyload' => 'Utiliser le mode “chargement différé” pour les images',
'sticky_post' => 'Aligner l’article en haut quand il est ouvert',
'reading_confirm' => 'Afficher une confirmation lors des actions “marquer tout comme lu”',
diff --git a/app/views/configure/display.phtml b/app/views/configure/display.phtml
index 955fc6747..8eb3a156b 100644
--- a/app/views/configure/display.phtml
+++ b/app/views/configure/display.phtml
@@ -91,6 +91,13 @@
+
+