diff options
| -rw-r--r-- | pyaggr3g470r/templates/layout.html | 1 | ||||
| -rw-r--r-- | pyaggr3g470r/templates/unread.html | 51 | ||||
| -rw-r--r-- | pyaggr3g470r/views/views.py | 18 |
3 files changed, 0 insertions, 70 deletions
diff --git a/pyaggr3g470r/templates/layout.html b/pyaggr3g470r/templates/layout.html index 7f8288f8..90263fb8 100644 --- a/pyaggr3g470r/templates/layout.html +++ b/pyaggr3g470r/templates/layout.html @@ -44,7 +44,6 @@ <li class="dropdown"> <a href="#" class="dropdown-toggle" data-toggle="dropdown"><span class="glyphicon glyphicon-filter"></span> {{ _('Filter') }} <b class="caret"></b></a> <ul class="dropdown-menu"> - <li><a accesskey="u" href="/unread">{{ _('Unread') }}</a></li> <li><a accesskey="f" href="/favorites">{{ _('Favorites') }}</a></li> <li><a accesskey="i" href="/inactives">{{ _('Inactive feeds') }}</a></li> <li><a href="{{ url_for("feeds.feeds") }}">{{ _('All feeds') }}</a></li> diff --git a/pyaggr3g470r/templates/unread.html b/pyaggr3g470r/templates/unread.html deleted file mode 100644 index d6f51bff..00000000 --- a/pyaggr3g470r/templates/unread.html +++ /dev/null @@ -1,51 +0,0 @@ - {% extends "layout.html" %} -{% block content %} -<div class="container"> - {% if feeds|count == 0 %} - <div class="page-header"> - <h1>{{ _('No unread articles') }}</h1> - </div> - {% else %} - <div class="page-header"> - <h1>{{ _('Unread articles') }} <small>{{ nb_unread }}</small></h1> - </div> - {% for feed in feeds|sort(attribute="title") %} - <div class="row"> - <div class="col-md-6 col-md-offset-3"> - <h1>{{ feed.title|safe }}</h1> - <a href="/articles/{{ feed.id }}/100"><i class="glyphicon glyphicon-th-list" title="{{ _('More articles') }}"></i></a> - <a href="/feed/{{ feed.id }}"><i class="glyphicon glyphicon-info-sign" title="{{ _('Details') }}"></i></a> - <a href="/edit_feed/{{ feed.id }}"><i class="glyphicon glyphicon-edit" title="{{ _('Edit this feed') }}"></i></a> - <a href="{{ url_for("feed.update", feed_id=fid, action="read") }}"><i class="glyphicon glyphicon-check" title="{{ _('Mark all feed as read') }}"></i></a> - <a href="{{ url_for("feed.update", feed_id=fid, action="unread") }}"><i class="glyphicon glyphicon-unchecked" title="{{ _('Mark all feed as unread') }}"></i></a> - <h3>{{ feed.articles|length }} {{ _('unread articles') }}.</h3> - </div> - </div> - {% for number in range(0, feed.articles|length-(feed.articles|length % 3), 3) %} - <div class="row"> - {% for n in range(number, number+3) %} - <div class="col-xs-6 col-sm-4 col-md-4"> - {% if feed.articles[n].readed %}<h3>{% else %}<h1>{% endif %} - <a href="/article/{{ feed.articles[n].id }}">{{ feed.articles[n].title|safe }}</a> - {% if feed.articles[n].readed %}</h3>{% else %}</h1>{% endif %} - <h6>{{ feed.articles[n].date | datetime }}</h6> - </div> - {% endfor %} - </div> - {% endfor %} - {% if feed.articles|length % 3 != 0 %} - <div class="row"> - {% for n in range(feed.articles|length-(feed.articles|length % 3), feed.articles|length) %} - <div class="col-xs-6 col-sm-4 col-md-4"> - {% if feed.articles[n].readed %}<h3>{% else %}<h1>{% endif %} - <a href="/article/{{ feed.articles[n].id }}">{{ feed.articles[n].title|safe }}</a> - {% if feed.articles[n].readed %}</h3>{% else %}</h1>{% endif %} - <h6>{{ feed.articles[n].date | datetime }}</h6> - </div> - {% endfor %} - </div> - {% endif %} - {% endfor %} - {% endif %} -</div><!-- /.container --> -{% endblock %} diff --git a/pyaggr3g470r/views/views.py b/pyaggr3g470r/views/views.py index fb2a5f87..ff33b576 100644 --- a/pyaggr3g470r/views/views.py +++ b/pyaggr3g470r/views/views.py @@ -363,24 +363,6 @@ def favorites(): nb_favorites += len(articles) return render_template('favorites.html', feeds=result, nb_favorites=nb_favorites) -@app.route('/unread/<int:feed_id>', methods=['GET']) -@app.route('/unread', methods=['GET']) -@login_required -def unread(feed_id=None): - """ - List unread articles. - """ - if feed_id is not None: - feeds_with_unread = Feed.query.filter(Feed.user_id == g.user.id, Feed.id == feed_id) - else: - feeds_with_unread = Feed.query.filter(Feed.user_id == g.user.id, Feed.articles.any(readed=False)) - result, nb_unread = [], 0 - light_feed = namedtuple('Feed', ['id', 'title', 'articles'], verbose=False, rename=False) - for feed in feeds_with_unread: - articles = Article.query.filter(Article.user_id == g.user.id, Article.feed_id == feed.id, Article.readed == False).all() - result.append(light_feed(feed.id, feed.title, articles)) - nb_unread += len(articles) - return render_template('unread.html', feeds=result, nb_unread=nb_unread) @app.route('/inactives', methods=['GET']) @login_required |