diff options
| -rw-r--r-- | pyaggr3g470r/templates/layout.html | 4 | ||||
| -rw-r--r-- | pyaggr3g470r/templates/management.html | 2 | ||||
| -rw-r--r-- | pyaggr3g470r/views/views.py | 7 |
3 files changed, 8 insertions, 5 deletions
diff --git a/pyaggr3g470r/templates/layout.html b/pyaggr3g470r/templates/layout.html index 5aa62c3e..b5259d3b 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 conf.ON_HEROKU or g.user.is_admin() %} + {% if not 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"> @@ -89,6 +89,7 @@ </ul> </li> <li><a href="{{ url_for("logout") }}"><span class="glyphicon glyphicon-log-out"></span> {{ _('Logout') }}</a></li> + {% if not ON_HEROKU %} <li class="dropdown"> <a href="#" class="dropdown-toggle" data-toggle="dropdown"> <div><span class="glyphicon glyphicon-search"></span> <b class="caret"></b></div> @@ -103,6 +104,7 @@ </li> </ul> </li> + {% endif %} {% else %} <li><a href="{{ url_for("about") }}"><span class="glyphicon glyphicon-question-sign"></span> {{ _('About') }}</a></li> {% endif %} diff --git a/pyaggr3g470r/templates/management.html b/pyaggr3g470r/templates/management.html index b9d02de5..b28267f8 100644 --- a/pyaggr3g470r/templates/management.html +++ b/pyaggr3g470r/templates/management.html @@ -5,7 +5,7 @@ <h1>{{ _('Your subscriptions') }}</h1> <p>{{ _('You are subscribed to') }} {{ nb_feeds }} <a href="/feeds">{{ _('feeds') }}</a>. {{ _('Add a') }} <a href="{{ url_for("feed.form") }}">{{ _('feed') }}</a>.</p> <p>{{ nb_articles }} {{ _('articles are stored in the database with') }} {{ nb_unread_articles }} <a href="/unread">{{ _('unread articles') }}</a>.</p> - {% if not_on_heroku %} + {% if not conf.ON_HEROKU %} <a href="/index_database" class="btn btn-default">{{ _('Index database') }}</a> {% endif %} <a href="/expire_articles?weeks=10" class="btn btn-default" onclick="return confirm('{{ _('You are going to delete old articles.') }}');">{{ _('Delete articles older than 10 weeks') }}</a> diff --git a/pyaggr3g470r/views/views.py b/pyaggr3g470r/views/views.py index 06b234cd..fa6bd2a0 100644 --- a/pyaggr3g470r/views/views.py +++ b/pyaggr3g470r/views/views.py @@ -146,7 +146,8 @@ 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()) + return dict(create_feed_form=AddFeedForm(), + on_HEROKU=conf.ON_HEROKU) # # Views. @@ -539,8 +540,8 @@ def management(): nb_articles = articles.count() nb_unread_articles = articles.filter(Article.readed == False).count() return render_template('management.html', user=g.user, form=form, - nb_feeds=nb_feeds, nb_articles=nb_articles, nb_unread_articles=nb_unread_articles, - not_on_heroku = not conf.ON_HEROKU) + nb_feeds=nb_feeds, nb_articles=nb_articles, + nb_unread_articles=nb_unread_articles) @app.route('/history', methods=['GET']) @app.route('/history/<int:year>', methods=['GET']) |