redoing conf gathering and using it in templates

4 files changed, 9 insertions, 11 deletions

diff --git a/pyaggr3g470r/templates/home.html b/pyaggr3g470r/templates/home.html
index 98b12e25..461b6928 100644
--- a/pyaggr3g470r/templates/home.html
+++ b/pyaggr3g470r/templates/home.html
@@ -17,7 +17,7 @@
             <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] > default_max_error -1 else "orange" }} ;" class="badge pull-right" title="Some errors occured while trying to retrieve that feed.">{{ in_error[fid] }} {{ _("error") }}{% if in_error[fid] > 1 %}s{% endif %}</span>
+                        <span style="background-color: {{ "red" if in_error[fid] > conf.DEFAULT_MAX_ERROR -1 else "orange" }} ;" class="badge pull-right" title="Some errors occured while trying to retrieve that feed.">{{ in_error[fid] }} {{ _("error") }}{% if in_error[fid] > 1 %}s{% endif %}</span>
                     {% endif %}
                     <span id="unread-{{ fid }}" class="badge pull-right">{{ nbunread }}</span>
                     {{ feeds[fid]|safe }}
@@ -35,7 +35,7 @@
         {% 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] > default_max_error - 1 else "orange" }} ;" class="badge pull-right" title="Some errors occured while trying to retrieve that feed.">{{ in_error[fid] }} {{ _("error") }}{% if in_error[fid] > 1 %}s{% endif %}</span>
+                    <span style="background-color: {{ "red" if in_error[fid] > conf.DEFAULT_MAX_ERROR - 1 else "orange" }} ;" class="badge pull-right" title="Some errors occured while trying to retrieve that feed.">{{ in_error[fid] }} {{ _("error") }}{% if in_error[fid] > 1 %}s{% endif %}</span>
                 {% endif %}
                 {% if feed_id == fid %}<b>{% endif %}
                     {{ ftitle|safe }}
diff --git a/pyaggr3g470r/templates/layout.html b/pyaggr3g470r/templates/layout.html
index e3d3be38..484bbdc7 100644
--- a/pyaggr3g470r/templates/layout.html
+++ b/pyaggr3g470r/templates/layout.html
@@ -65,7 +65,7 @@
                 {% else %}
                 <li><a accesskey="f" href="{{ url_for("favorites") }}"><span class="glyphicon glyphicon-star"></span> {{ _('Favorites') }}</a></li>
                 {% endif %}
-                {% if not on_heroku or g.user.is_admin() %}
+                {% if conf.CRAWLING_METHOD == "classic" and (not conf.ON_HEROKU or g.user.is_admin()) %}
                 <li><a accesskey="r" href="/fetch"><span class="glyphicon glyphicon-import"></span> {{ _('Fetch') }}</a></li>
                 {% endif %}
                 <li class="dropdown">
@@ -94,7 +94,7 @@
                     </ul>
                 </li>
 
-                {% if not on_heroku %}
+                {% if not conf.ON_HEROKU %}
                 <li class="dropdown">
                     <a href="#" class="dropdown-toggle" data-toggle="dropdown">
                         <div><span class="glyphicon glyphicon-search"></span>&nbsp;<b class="caret"></b></div>
diff --git a/pyaggr3g470r/views/feed.py b/pyaggr3g470r/views/feed.py
index 846df06d..11d14ac2 100644
--- a/pyaggr3g470r/views/feed.py
+++ b/pyaggr3g470r/views/feed.py
@@ -175,9 +175,8 @@ def form(feed_id=None):
         form = AddFeedForm(obj=feed)
         return render_template('edit_feed.html',
                                action=gettext("Edit the feed"),
-                               form=form, feed=feed,
-                               not_on_heroku=not conf.ON_HEROKU)
+                               form=form, feed=feed)
 
     # Return an empty form in order to create a new feed
     return render_template('edit_feed.html', action=gettext("Add a feed"),
-                            form=form, not_on_heroku=not conf.ON_HEROKU)
+                           form=form)
diff --git a/pyaggr3g470r/views/views.py b/pyaggr3g470r/views/views.py
index 1918b1b5..e70a8c6f 100644
--- a/pyaggr3g470r/views/views.py
+++ b/pyaggr3g470r/views/views.py
@@ -139,6 +139,7 @@ def get_timezone():
     except:
         return conf.TIME_ZONE["en"]
 
+
 @app.context_processor
 def inject_feed_form():
     """
@@ -147,8 +148,7 @@ def inject_feed_form():
     Context processors run before the template is rendered and have the
     ability to inject new values into the template context.
     """
-    return dict(create_feed_form=AddFeedForm(),
-                on_heroku=conf.ON_HEROKU)
+    return dict(create_feed_form=AddFeedForm())
 
 #
 # Views.
@@ -285,8 +285,7 @@ def home(favorites=False):
     return render_template('home.html', gen_url=gen_url, feed_id=feed_id,
                            filter_=filter_, limit=limit, feeds=feeds,
                            unread=unread, articles=articles, in_error=in_error,
-                           head_title=head_title, favorites=favorites,
-                           default_max_error = conf.DEFAULT_MAX_ERROR)
+                           head_title=head_title, favorites=favorites)
 
 
 @app.route('/favorites')