From 643f4590445928b7ac568b922f1edb6f52765b68 Mon Sep 17 00:00:00 2001
From: François Schmidts <francois.schmidts@gmail.com>
Date: Tue, 3 Mar 2015 00:02:09 +0100
Subject: displaying feed errors in ui

---
 pyaggr3g470r/templates/feed.html | 10 ++++++++++
 pyaggr3g470r/templates/home.html |  6 ++++++
 2 files changed, 16 insertions(+)

(limited to 'pyaggr3g470r/templates')

diff --git a/pyaggr3g470r/templates/feed.html b/pyaggr3g470r/templates/feed.html
index 21db7ebe..9910ccf7 100644
--- a/pyaggr3g470r/templates/feed.html
+++ b/pyaggr3g470r/templates/feed.html
@@ -14,6 +14,16 @@
             ({{ ((feed.articles.all()|count * 100 ) / nb_articles) | round(2, 'floor') }}% {{ _('of the database') }})
         {% endif %}
         .<br />
+        {% if feed.error_count > 2 %}
+            <b>{{ _("That feed has encountered too much consecutive errors and won't be retreived anymore") }}</b>
+        {% elif feed.error_count > 0 %}
+            {{ _("That feed has encountered some errors but that counter will be reinitialized at the next successful retreiving") }}
+        {% endif %}
+        .<br />
+        {% if feed.last_error %}
+            {{ _("Here's the last error encountered while retreiving this feed:") }} <pre>{{ feed.last_error }}</pre>
+        {% endif %}
+
         {{ _('Address of the feed') }}: <a href="{{ feed.link }}">{{ feed.link }}</a><br />
         {% if feed.site_link != "" %}
             {{ _('Address of the site') }}: <a href="{{ feed.site_link }}">{{ feed.site_link }}</a>
diff --git a/pyaggr3g470r/templates/home.html b/pyaggr3g470r/templates/home.html
index a00f962e..8170a99d 100644
--- a/pyaggr3g470r/templates/home.html
+++ b/pyaggr3g470r/templates/home.html
@@ -21,6 +21,9 @@
         {% for fid, nbunread in unread|dictsort(by='value')|reverse %}
             <li class="feed-menu"><a href="{{ gen_url(feed=fid) }}">
                 {% if feed_id == fid %}<b>{% endif %}
+                    {% if in_error.get(fid, 0) > 0 %}
+                        <span style="background-color: {{ "red" if in_error[fid] > 2 else "orange" }} ;" class="badge pull-right" title="some errors occured while trying to retreive that feed">{{ in_error[fid] }}</span>
+                    {% endif %}
                     <span id="unread-{{ fid }}" class="badge pull-right">{{ nbunread }}</span>
                     {{ feeds[fid]|safe }}
                 {% if feed_id == fid %}</b>{% endif %}
@@ -36,6 +39,9 @@
         {% endfor %}
         {% for fid, ftitle in feeds|dictsort(case_sensitive=False, by='value') if not fid in unread %}
             <li class="feed-menu"><a href="{{ gen_url(feed=fid) }}">
+                {% if in_error.get(fid, 0) > 0 %}
+                    <span style="background-color: {{ "red" if in_error[fid] > 2 else "orange" }} ;" class="badge pull-right" title="some errors occured while trying to retreive that feed">{{ in_error[fid] }}</span>
+                {% endif %}
                 {% if feed_id == fid %}<b>{% endif %}
                     {{ ftitle|safe }}
                 {% if feed_id == fid %}</b>{% endif %}
-- 
cgit