From f1fc099e34cdaf68b872ff1116e8f92c58a81c5e Mon Sep 17 00:00:00 2001
From: Cédric Bonhomme <kimble.mandel@gmail.com>
Date: Tue, 22 Jan 2013 09:06:28 +0100
Subject: The /feed page now indicates if e-mail notification is activated in
 the pyAggr3g470r configuration file.

---
 source/pyAggr3g470r.py     | 4 +++-
 source/templates/feed.html | 9 +++++++--
 2 files changed, 10 insertions(+), 3 deletions(-)

(limited to 'source')

diff --git a/source/pyAggr3g470r.py b/source/pyAggr3g470r.py
index 2120a171..6f991e51 100755
--- a/source/pyAggr3g470r.py
+++ b/source/pyAggr3g470r.py
@@ -269,6 +269,8 @@ class pyAggr3g470r(object):
         except KeyError:
             return self.error("<p>This feed do not exists.</p>")
 
+        mail_notification_enabled = conf.MAIL_ENABLED
+
         if articles != []:
             today = datetime.datetime.now()
             last_article = articles[0]["article_date"]
@@ -285,7 +287,7 @@ class pyAggr3g470r(object):
                             nb_articles_feed=nb_articles_feed, nb_articles_total=nb_articles_total, nb_unread_articles_feed=nb_unread_articles_feed, \
                             nb_favorites = nb_favorites, first_post_date=first_article, end_post_date=last_article, \
                             average=average, delta=delta, elapsed=elapsed, \
-                            tag_cloud=tag_cloud, word_size=word_size, mail_to=conf.mail_to)
+                            tag_cloud=tag_cloud, word_size=word_size, mail_to=conf.mail_to, mail_notification_enabled=mail_notification_enabled)
 
     feed.exposed = True
 
diff --git a/source/templates/feed.html b/source/templates/feed.html
index ebe4b2fa..f4079cc0 100644
--- a/source/templates/feed.html
+++ b/source/templates/feed.html
@@ -16,8 +16,13 @@ import utils
     %endif
 
     %if feed["mail"] == True:
-        <p>You are receiving articles from this feed to the address: <a href="mail:${mail_to}">${mail_to}</a>.
-        <a href="/mail_notification/0:${feed['feed_id']}">Stop</a> receiving articles from this feed.</p>
+        <p>
+        You are receiving articles from this feed to the address: <a href="mail:${mail_to}">${mail_to}</a>.
+        <a href="/mail_notification/0:${feed['feed_id']}">Stop</a> receiving articles from this feed.
+        %if not mail_notification_enabled:
+            <br />But e-mail notification is not enabled in your configuration file!
+        %endif
+        </p>
     %endif
 
     %if articles != []:
-- 
cgit