From 5db1106677412b9d9c765ecbef9a5c7833e218ce Mon Sep 17 00:00:00 2001
From: Cédric Bonhomme <cedric@cedricbonhomme.org>
Date: Wed, 26 Feb 2020 23:52:03 +0100
Subject: cleaning

---
 CHANGELOG.md                     |  2 +-
 newspipe/web/templates/home.html | 24 ++++++++++++------------
 newspipe/web/views/article.py    |  2 +-
 package.json                     |  2 +-
 4 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7a3f2924..a3d3a3f1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,7 +1,7 @@
 Newspipe Changelog
 ==================
 
-## 8.1 (not yet released)
+## 9.0 (not yet released)
 
     New:
      * email address of users are no longer stored in the database. Only a
diff --git a/newspipe/web/templates/home.html b/newspipe/web/templates/home.html
index 6fe1a48b..cd02616a 100644
--- a/newspipe/web/templates/home.html
+++ b/newspipe/web/templates/home.html
@@ -31,10 +31,10 @@
             <li class="feed-commands"><span>
                 <a href="/feed/{{ fid }}"><i class="glyphicon glyphicon-info-sign" title="{{ _('Details') }}"></i></a>
                 <a href="/articles/{{ fid }}/100"><i class="glyphicon glyphicon-th-list" title="{{ _('Articles') }}"></i></a>
-                <a href="/edit_feed/{{ fid }}"><i class="glyphicon glyphicon-edit" title="{{ _('Edit this feed') }}"></i></a>
-                <a href="/delete_feed/{{ fid }}"><i class="glyphicon glyphicon-remove" title="{{ _('Delete this feed') }}" onclick="return confirm('{{ _('You are going to delete this feed.') }}');"></i></a>
-                <a href="/mark_as/read/feed/{{ fid }}"><i class="glyphicon glyphicon-check" title="{{ _('Mark this feed as read') }}"></i></a>
-                <a href="/mark_as/unread/feed/{{ fid }}"><i class="glyphicon glyphicon-unchecked" title="{{ _('Mark this feed as unread') }}"></i></a>
+                <a href="{{ url_for('feed.form', feed_id=fid) }}"><i class="glyphicon glyphicon-edit" title="{{ _('Edit this feed') }}"></i></a>
+                <a href="{{ url_for('feed.delete', feed_id=fid) }}"><i class="glyphicon glyphicon-remove" title="{{ _('Delete this feed') }}" onclick="return confirm('{{ _('You are going to delete this feed.') }}');"></i></a>
+                <a href="{{ url_for('article.mark_as', new_value='read', feed_id=fid) }}"><i class="glyphicon glyphicon-check" title="{{ _('Mark this feed as read') }}"></i></a>
+                <a href="{{ url_for('article.mark_as', new_value='unread', feed_id=fid) }}"><i class="glyphicon glyphicon-unchecked" title="{{ _('Mark this feed as unread') }}"></i></a>
             </span></li>
         {% endfor %}
         {% for fid, ftitle in feeds|dictsort(case_sensitive=False, by='value') if not fid in unread %}
@@ -49,20 +49,20 @@
             <li class="feed-commands"><span>
                 <a href="/feed/{{ fid }}"><i class="glyphicon glyphicon-info-sign" title="{{ _('Details') }}"></i></a>
                 <a href="/articles/{{ fid }}/100"><i class="glyphicon glyphicon-th-list" title="{{ _('Articles') }}"></i></a>
-                <a href="/edit_feed/{{ fid }}"><i class="glyphicon glyphicon-edit" title="{{ _('Edit this feed') }}"></i></a>
-                <a href="/delete_feed/{{ fid }}"><i class="glyphicon glyphicon-remove" title="{{ _('Delete this feed') }}" onclick="return confirm('{{ _('You are going to delete this feed.') }}');"></i></a>
-                <a href="/mark_as/read/feed/{{ fid }}"><i class="glyphicon glyphicon-check" title="{{ _('Mark this feed as read') }}"></i></a>
-                <a href="/mark_as/unread/feed/{{ fid }}"><i class="glyphicon glyphicon-unchecked" title="{{ _('Mark this feed as unread') }}"></i></a>
+                <a href="{{ url_for('feed.form', feed_id=fid) }}"><i class="glyphicon glyphicon-edit" title="{{ _('Edit this feed') }}"></i></a>
+                <a href="{{ url_for('feed.delete', feed_id=fid) }}"><i class="glyphicon glyphicon-remove" title="{{ _('Delete this feed') }}" onclick="return confirm('{{ _('You are going to delete this feed.') }}');"></i></a>
+                <a href="{{ url_for('article.mark_as', new_value='read', feed_id=fid) }}"><i class="glyphicon glyphicon-check" title="{{ _('Mark this feed as read') }}"></i></a>
+                <a href="{{ url_for('article.mark_as', new_value='unread', feed_id=fid) }}"><i class="glyphicon glyphicon-unchecked" title="{{ _('Mark this feed as unread') }}"></i></a>
             </span></li>
         {% endfor %}
         </ul>
     </div>
     <div class="container col-md-9">
         <div id="filters" data-filter="{{ filter_ }}">
-            <ul id="myTab" class="nav nav-tabs" role="tablist">
-                <li id="tab-all"><a href="{{ gen_url(filter_='all') }}">{{ _('All') }}</a></li>
-                <li id="tab-read"><a href="{{ gen_url(filter_='read') }}">{{ _('Read') }}</a></li>
-                <li id="tab-unread"><a href="{{ gen_url(filter_='unread') }}">{{ _('Unread') }}</a></li>
+            <ul class="nav nav-tabs"">
+                <li id="tab-all nav-item" {% if filter_ == 'all' %}class="active"{% endif %}><a href="{{ gen_url(filter_='all') }}">{{ _('All') }}</a></li>
+                <li id="tab-read" {% if filter_ == 'read' %}class="active"{% endif %}><a href="{{ gen_url(filter_='read') }}">{{ _('Read') }}</a></li>
+                <li id="tab-unread" {% if filter_ == 'unread' %}class="active"{% endif %}><a href="{{ gen_url(filter_='unread') }}">{{ _('Unread') }}</a></li>
                 <li id="tab-nbdisplay" class="pull-right">
                     <div id="nbdisplay">
                         <a href="{{ gen_url(limit=10) }}" class="label {% if limit == 10 %}label-primary{% else %}label-info{% endif %}">{{ _(10) }}</a>
diff --git a/newspipe/web/views/article.py b/newspipe/web/views/article.py
index e8d0a449..e3a00466 100644
--- a/newspipe/web/views/article.py
+++ b/newspipe/web/views/article.py
@@ -104,7 +104,7 @@ def history(year=None, month=None):
 
 @article_bp.route("/mark_as/<string:new_value>", methods=["GET"])
 @article_bp.route(
-    "/mark_as/<string:new_value>/article/<int:article_id>", methods=["GET"]
+    "/mark_as/<string:new_value>/feed/<int:article_id>", methods=["GET"]
 )
 @login_required
 def mark_as(new_value="read", feed_id=None, article_id=None):
diff --git a/package.json b/package.json
index 9b158bd9..76acd92b 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "newspipe",
-  "version": "8.0.0",
+  "version": "9.0.0",
   "license": "AGPL-3.0",
   "private": true,
   "dependencies": {
-- 
cgit