diff options
| author |  Marien Fressinaud <dev@marienfressinaud.fr>
| 2014-09-18 15:42:00 +0200 |
|---|---|---|
| committer | Marien Fressinaud <dev@marienfressinaud.fr>
| 2014-09-18 15:42:00 +0200 |
| commit | 0947b780c94da2761180387e51ff17940f0080cb (patch) | |
| tree | 62fd182875f225da752e5f6bca26465f6da8914b /app/views | |
| parent | 70df99c1fcd88b30a6a9d71954af1e31dfade489 (diff) | |
| parent | ca74b2fca3711ef80542cc69269b2d9a654e3e5a (diff) | |
Merge branch 'dev' of github.com:marienfressinaud/FreshRSS into dev
Diffstat (limited to 'app/views')
| -rw-r--r-- | app/views/configure/display.phtml | 7 | ||||
| -rw-r--r-- | app/views/helpers/javascript_vars.phtml | 2 |
2 files changed, 9 insertions, 0 deletions
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 @@ </tbody> </table><br /> </div> + + <div class="form-group"> + <label class="group-name" for="posts_per_page"><?php echo Minz_Translate::t ('html5_notif_timeout'); ?></label> + <div class="group-controls"> + <input type="number" id="html5_notif_timeout" name="html5_notif_timeout" value="<?php echo $this->conf->html5_notif_timeout; ?>" /> <?php echo Minz_Translate::t ('seconds_(0_means_no_timeout)'); ?> + </div> + </div> <div class="form-group form-actions"> <div class="group-controls"> diff --git a/app/views/helpers/javascript_vars.phtml b/app/views/helpers/javascript_vars.phtml index 2144f1576..bf0ffdb76 100644 --- a/app/views/helpers/javascript_vars.phtml +++ b/app/views/helpers/javascript_vars.phtml @@ -54,6 +54,8 @@ echo 'authType="', $authType, '",', echo 'str_confirmation="', Minz_Translate::t('confirm_action'), '"', ",\n"; echo 'str_notif_title_articles="', Minz_Translate::t('notif_title_new_articles'), '"', ",\n"; echo 'str_notif_body_articles="', Minz_Translate::t('notif_body_new_articles'), '"', ",\n"; +echo 'html5_notif_timeout=', $this->conf->html5_notif_timeout,",\n"; + $autoActualise = Minz_Session::param('actualize_feeds', false); echo 'auto_actualize_feeds=', $autoActualise ? 'true' : 'false', ";\n"; |