From cce15546b4c4c3cfdf842ce167f8d67811b13b48 Mon Sep 17 00:00:00 2001
From: Cédric Bonhomme <kimble.mandel@gmail.com>
Date: Tue, 22 Jan 2013 11:26:46 +0100
Subject: The notification page indicates if e-mail notification is disabled.

---
 source/pyAggr3g470r.py              | 2 +-
 source/templates/notifications.html | 6 +++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

(limited to 'source')

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>
-- 
cgit