aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCédric Bonhomme <kimble.mandel@gmail.com>2013-01-22 11:26:46 +0100
committerCédric Bonhomme <kimble.mandel@gmail.com>2013-01-22 11:26:46 +0100
commitcce15546b4c4c3cfdf842ce167f8d67811b13b48 (patch)
tree1d32fba75054c230f832743531f118c02355a282
parentRemoved a duplicate line in the template of the management page. (diff)
downloadnewspipe-cce15546b4c4c3cfdf842ce167f8d67811b13b48.tar.gz
newspipe-cce15546b4c4c3cfdf842ce167f8d67811b13b48.tar.bz2
newspipe-cce15546b4c4c3cfdf842ce167f8d67811b13b48.zip
The notification page indicates if e-mail notification is disabled.
-rwxr-xr-xsource/pyAggr3g470r.py2
-rw-r--r--source/templates/notifications.html6
2 files changed, 6 insertions, 2 deletions
diff --git a/source/pyAggr3g470r.py b/source/pyAggr3g470r.py
index 33507adc..2e8f4c8a 100755
--- a/source/pyAggr3g470r.py
+++ b/source/pyAggr3g470r.py
@@ -385,7 +385,7 @@ class pyAggr3g470r(object):
"""
feeds = self.mongo.get_all_feeds(condition=("mail",True))
tmpl = lookup.get_template("notifications.html")
- return tmpl.render(feeds=feeds, mail_to=conf.mail_to)
+ return tmpl.render(feeds=feeds, mail_to=conf.mail_to, mail_notification_enabled=conf.MAIL_ENABLED)
notifications.exposed = True
diff --git a/source/templates/notifications.html b/source/templates/notifications.html
index 35aa72a6..88558b05 100644
--- a/source/templates/notifications.html
+++ b/source/templates/notifications.html
@@ -11,4 +11,8 @@
%else:
<p>No active notifications.<p>
%endif
- <p>Notifications are sent to: <a href="mail:${mail_to}">${mail_to}</a></p>
+ <p>Notifications are sent to: <a href="mail:${mail_to}">${mail_to}</a>.
+ %if not mail_notification_enabled:
+ However e-mail notification is disabled in the configuration file.
+ %endif
+ </p>
bgstack15