From 5b7db9398abaacea241d9fcce7885457c562d7fa Mon Sep 17 00:00:00 2001
From: François Schmidts <francois.schmidts@gmail.com>
Date: Sun, 11 Oct 2015 12:18:07 +0200
Subject: a bit of cleaning, putting code where it belongs

---
 src/web/templates/article.html    | 2 +-
 src/web/templates/duplicates.html | 4 ++--
 src/web/templates/feed_list.html  | 2 +-
 src/web/templates/history.html    | 8 ++++----
 src/web/templates/inactives.html  | 2 +-
 src/web/templates/layout.html     | 4 ++--
 6 files changed, 11 insertions(+), 11 deletions(-)

(limited to 'src/web/templates')

diff --git a/src/web/templates/article.html b/src/web/templates/article.html
index b1f950b4..6ab9d0bb 100644
--- a/src/web/templates/article.html
+++ b/src/web/templates/article.html
@@ -4,7 +4,7 @@
     <div class="well">
         <h2><a href="{{ article.link  }}" target="_blank">{{ article.title|safe }}</a></h2>
         <h3>{{ _('from') }} <a href="/feed/{{ article.source.id }}">{{ article.source.title }}</a></h3>
-        <a href="/delete/{{ article.id }}"><i class="glyphicon glyphicon-remove" title="{{ _('Delete this article') }}"></i></a>
+        <a href="{{ url_for("article.delete", article_id=article.id) }}"><i class="glyphicon glyphicon-remove" title="{{ _('Delete this article') }}"></i></a>
         {% if article.like %}
             <a href="#"><i class="glyphicon glyphicon-star like" title="{{ _('One of your favorites') }}"></i></a>
         {% else %}
diff --git a/src/web/templates/duplicates.html b/src/web/templates/duplicates.html
index 32fbdf9a..d944a1a5 100644
--- a/src/web/templates/duplicates.html
+++ b/src/web/templates/duplicates.html
@@ -19,8 +19,8 @@
             {% for pair in duplicates %}
                 <tr>
                     <td>{{ loop.index }}</td>
-                    <td id="{{ pair[0].id }}"><a href="/delete/{{ pair[0].id }}"><i class="glyphicon glyphicon-remove" title="{{ _('Delete this article') }}"></i></a>&nbsp;<a href="/article/{{ pair[0].id }}">{{ pair[0].title }}</a> ({{ pair[0].retrieved_date }})</td>
-                    <td id="{{ pair[1].id }}"><a href="/delete/{{ pair[1].id }}"><i class="glyphicon glyphicon-remove" title="{{ _('Delete this article') }}"></i></a>&nbsp;<a href="/article/{{ pair[1].id }}">{{ pair[1].title }}</a> ({{ pair[1].retrieved_date }})</td>
+                    <td id="{{ pair[0].id }}"><a href="{{ url_for("article.delete", article_id=pair[0].id) }}"><i class="glyphicon glyphicon-remove" title="{{ _('Delete this article') }}"></i></a>&nbsp;<a href="/article/{{ pair[0].id }}">{{ pair[0].title }}</a> ({{ pair[0].retrieved_date }})</td>
+                    <td id="{{ pair[1].id }}"><a href="{{ url_for("article.delete", article_id=pair[1].id) }}"><i class="glyphicon glyphicon-remove" title="{{ _('Delete this article') }}"></i></a>&nbsp;<a href="/article/{{ pair[1].id }}">{{ pair[1].title }}</a> ({{ pair[1].retrieved_date }})</td>
                 </tr>
             {% endfor %}
             </tobdy>
diff --git a/src/web/templates/feed_list.html b/src/web/templates/feed_list.html
index c5cadab0..27815250 100644
--- a/src/web/templates/feed_list.html
+++ b/src/web/templates/feed_list.html
@@ -36,7 +36,7 @@
                 <td>
                     <a href="{{ url_for("home", feed_id=feed.id, filter_="all") }}"><i class="glyphicon glyphicon-th-list" title="{{ _('Articles') }}"></i></a>
                     <a href="{{ url_for("feed.form", feed_id=feed.id) }}"><i class="glyphicon glyphicon-edit" title="{{ _('Edit this feed') }}"></i></a>
-                    <a href="/duplicates/{{ feed.id }}"><i class="glyphicon glyphicon-book" title="{{ _('Duplicate articles') }}"></i></a>
+                    <a href="{{ url_for("feed.duplicates", feed_id=feed.id) }}"><i class="glyphicon glyphicon-book" title="{{ _('Duplicate articles') }}"></i></a>
                     <a href="{{ url_for("feed.delete", feed_id=feed.id) }}"><i class="glyphicon glyphicon-remove" title="{{ _('Delete this feed') }}" onclick="return confirm('{{ _('You are going to delete this feed.') }}');"></i></a>
                 </td>
         </tr>
diff --git a/src/web/templates/history.html b/src/web/templates/history.html
index 499fe50b..caa0b057 100644
--- a/src/web/templates/history.html
+++ b/src/web/templates/history.html
@@ -3,18 +3,18 @@
 <div class="container">
     <h1>{{ _('History') }}</h1>
     {% if month != None %}
-        <h2><a href="/history/{{ year }}"><span class="glyphicon glyphicon-chevron-left"></span> {{ year }}</a></h2>
+        <h2><a href="{{ url_for("articles.history", year=year) }}"><span class="glyphicon glyphicon-chevron-left"></span> {{ year }}</a></h2>
         <h3>{{ month | month_name }}</h3>
     {% elif year != None %}
-        <h2><a href="/history"><span class="glyphicon glyphicon-chevron-left"></span>&nbsp{{ _('all years') }}</a></h2>
+        <h2><a href="{{ url_for("articles.history") }}"><span class="glyphicon glyphicon-chevron-left"></span>&nbsp{{ _('all years') }}</a></h2>
         <h3>{{ year }}</h3>
     {% endif %}
     <ul class="list-group">
     {% for article in articles_counter | sort(reverse = True) %}
         {% if year == None %}
-            <li class="list-group-item"><a href="/history/{{ article }}">{{ article }}</a> : {{ articles_counter[article] }} articles</li>
+            <li class="list-group-item"><a href="{{ url_for("articles.history", year=article) }}">{{ article }}</a> : {{ articles_counter[article] }} articles</li>
         {% elif month == None %}
-            <li class="list-group-item"><a href="/history/{{ year }}/{{ article }}">{{ article | month_name  }}</a> : {{ articles_counter[article] }} articles</li>
+            <li class="list-group-item"><a href="{{ url_for("articles.history", year=year, month=article) }}">{{ article | month_name  }}</a> : {{ articles_counter[article] }} articles</li>
         {% else %}
             {% for article in articles | sort(attribute="date", reverse = True) %}
                 <li class="list-group-item">{{ article.date | datetime }} - <a href="/article/{{ article.id }}">{{ article.title | safe }}</a></li>
diff --git a/src/web/templates/inactives.html b/src/web/templates/inactives.html
index eb546eca..e89a5fe1 100644
--- a/src/web/templates/inactives.html
+++ b/src/web/templates/inactives.html
@@ -2,7 +2,7 @@
 {% block content %}
 <div class="container">
     <div class="well">
-        <form method=get action="/inactives">
+        <form method=get action="{{ url_for("feeds.inactives") }}">
             <p>{{ _('Days of inactivity') }}:</p>
             <input type="number" name="nb_days" class="form-control" value="{{ nb_days }}" min="0" max="1000000" step="1" size="4" style="text-align: center" />
         </form>
diff --git a/src/web/templates/layout.html b/src/web/templates/layout.html
index 15cf3e97..cf2498e2 100644
--- a/src/web/templates/layout.html
+++ b/src/web/templates/layout.html
@@ -71,8 +71,8 @@
                         <li><a href="{{ url_for("feeds.update", action="read", nb_days="5") }}">{{ gettext('Mark all as read older than %(days)s days', days=5) }}</a></li>
                         <li><a href="{{ url_for("feeds.update", action="read", nb_days="10") }}">{{ gettext('Mark all as read older than %(days)s days', days=10) }}</a></li>
                         <li role="presentation" class="divider"></li>
-                        <li><a href="{{ url_for("inactives") }}">{{ _('Inactive') }}</a></li>
-                        <li><a href="{{ url_for("history") }}">{{ _('History') }}</a></li>
+                        <li><a href="{{ url_for("feeds.inactives") }}">{{ _('Inactive') }}</a></li>
+                        <li><a href="{{ url_for("articles.history") }}">{{ _('History') }}</a></li>
                         <li><a href="{{ url_for("feeds.feeds") }}">{{ _('All') }}</a></li>
                     </ul>
                 </li>
-- 
cgit