From b343dc73e5ea4aaf1314b6b277c3806f15ac0635 Mon Sep 17 00:00:00 2001
From: François Schmidts <francois.schmidts@gmail.com>
Date: Wed, 8 Apr 2015 12:33:40 +0200
Subject: moving feed views related code in views.feed and massive use of
 url_for

---
 pyaggr3g470r/templates/about.html      |  2 +-
 pyaggr3g470r/templates/admin/user.html |  6 +++---
 pyaggr3g470r/templates/feed.html       |  4 ++--
 pyaggr3g470r/templates/feeds.html      |  8 ++++----
 pyaggr3g470r/templates/home.html       | 18 +++++++++---------
 pyaggr3g470r/templates/layout.html     |  4 ++--
 pyaggr3g470r/templates/management.html |  2 +-
 pyaggr3g470r/templates/unread.html     |  4 ++--
 8 files changed, 24 insertions(+), 24 deletions(-)

(limited to 'pyaggr3g470r/templates')

diff --git a/pyaggr3g470r/templates/about.html b/pyaggr3g470r/templates/about.html
index 08b80fbb..901b3b35 100644
--- a/pyaggr3g470r/templates/about.html
+++ b/pyaggr3g470r/templates/about.html
@@ -17,7 +17,7 @@
         <h1>{{ _('Help') }}</h1>
         <p>{{ _('If you have any problem, <a href="http://wiki.cedricbonhomme.org/contact">contact</a> the administrator.') }}</p>
         <p>{{ _('The documentation of the RESTful API is <a href="https://pyaggr3g470r.readthedocs.org/en/latest/web-services.html">here</a>.') }}</p>
-        <p>{{ _('You can subscribe to new feeds with a bookmarklet. Drag <a href="%(bookmarklet)s">this link</a> to your browser bookmarks.', bookmarklet='javascript:window.location="https://pyaggr3g470r.herokuapp.com/bookmarklet?url="+encodeURIComponent(document.location)') }}</p>
+        <p>{{ _('You can subscribe to new feeds with a bookmarklet. Drag <a href="%(bookmarklet)s">this link</a> to your browser bookmarks.', bookmarklet='javascript:window.location="%s?url="+encodeURIComponent(document.location)' % url_for('feed.bookmarklet', _external=True)) }}</p>
     </div>
     <div class="well">
         <h1>{{ _('Donation') }}</h1>
diff --git a/pyaggr3g470r/templates/admin/user.html b/pyaggr3g470r/templates/admin/user.html
index f20d53dd..317fef49 100644
--- a/pyaggr3g470r/templates/admin/user.html
+++ b/pyaggr3g470r/templates/admin/user.html
@@ -39,9 +39,9 @@
                         <td>{{ feed.site_link }}</td>
                         <td>{{ feed.articles.all()|count }}</td>
                         <td>
-                            <a href="/feed/{{ feed.id }}"><i class="glyphicon glyphicon-th-list" title="{{ _('Feed') }}"></i></a>
-                            <a href="/edit_feed/{{ feed.id }}"><i class="glyphicon glyphicon-edit" title="{{ _('Edit this feed') }}"></i></a>
-                            <a href="/delete_feed/{{ feed.id }}"><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("feed.feed", feed_id=feed.id) }}"><i class="glyphicon glyphicon-th-list" title="{{ _('Feed') }}"></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="{{ 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>
                 {% endfor %}
                 </tbody>
diff --git a/pyaggr3g470r/templates/feed.html b/pyaggr3g470r/templates/feed.html
index 268cbf7d..c0c92279 100644
--- a/pyaggr3g470r/templates/feed.html
+++ b/pyaggr3g470r/templates/feed.html
@@ -4,8 +4,8 @@
     <div class="well">
         <h2>{{ feed.title }}</h2>
         {% if feed.description %} <p>{{ feed.description }}</p> {% endif %}
-        <a href="/delete_feed/{{ feed.id }}"><i class="glyphicon glyphicon-remove" title="{{ _('Delete this feed') }}" onclick="return confirm('{{ _('You are going to delete this feed.') }}');"></i></a>
-        <a href="/edit_feed/{{ feed.id }}"><i class="glyphicon glyphicon-edit" title="{{ _('Edit this feed') }}"></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>
+        <a href="{{ url_for("feed.form", feed_id=feed.id) }}"><i class="glyphicon glyphicon-edit" title="{{ _('Edit this feed') }}"></i></a>
     </div>
     <div class="well">
         <p>
diff --git a/pyaggr3g470r/templates/feeds.html b/pyaggr3g470r/templates/feeds.html
index 460ae4a2..9c57bf42 100644
--- a/pyaggr3g470r/templates/feeds.html
+++ b/pyaggr3g470r/templates/feeds.html
@@ -1,7 +1,7 @@
 {% extends "layout.html" %}
 {% block content %}
 <div class="container">
-    <h1>{{ _('You are subscribed to') }} {{ feeds.count() }} {{ _('feeds') }} &middot; {{ _('Add a') }} <a href="/create_feed">{{ _('feed') }}</a></h1>
+    <h1>{{ _('You are subscribed to') }} {{ feeds.count() }} {{ _('feeds') }} &middot; {{ _('Add a') }} <a href="{{ url_for("feed.form") }}">{{ _('feed') }}</a></h1>
     <div class="table-responsive">
         <table class="table table-striped">
             <thead>
@@ -25,14 +25,14 @@
                             <i class="glyphicon glyphicon-eye-close" title="{{ _('Feed disabled') }}"></i>
                         {% endif %}
                     </td>
-                    <td><a href="/feed/{{ feed.id }}" {% if feed.description %}title="{{ feed.description  }}"{% endif %}>{{ feed.title }}</a></td>
+                    <td><a href="{{ url_for("feed.feed", feed_id=feed.id) }}" {% if feed.description %}title="{{ feed.description  }}"{% endif %}>{{ feed.title }}</a></td>
                     <td><a href="{{ feed.site_link }}">{{ feed.site_link }}</a></td>
                     <td>{{ feed.articles.count() }}</td>
                     <td>
                         <a href="/articles/{{ feed.id }}/100"><i class="glyphicon glyphicon-th-list" title="{{ _('Articles') }}"></i></a>
-                        <a href="/edit_feed/{{ feed.id }}"><i class="glyphicon glyphicon-edit" title="{{ _('Edit this feed') }}"></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="/delete_feed/{{ feed.id }}"><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("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>
             {% endfor %}
diff --git a/pyaggr3g470r/templates/home.html b/pyaggr3g470r/templates/home.html
index c20cacfa..390ac5f6 100644
--- a/pyaggr3g470r/templates/home.html
+++ b/pyaggr3g470r/templates/home.html
@@ -3,7 +3,7 @@
 {% if feeds|count == 0 %}
     <div class="col-md-4 col-md-offset-4">
         <h1>{{ _("You don't have any feeds.") }}</h1>
-        <h1><a href="/create_feed">{{ _('Add some') }}</a>, {{ _('or') }} <a href="/management">{{ _('upload an OPML file.') }}</a></h1>
+        <h1><a href="{{ url_for("feed.form") }}">{{ _('Add some') }}</a>, {{ _('or') }} <a href="/management">{{ _('upload an OPML file.') }}</a></h1>
     </div>
 {% else %}
     <div id="affix-nav" class="col-md-3 sidebar hidden-xs hidden-sm">
@@ -26,10 +26,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("feed.update", feed_id=fid, action="read") }}"><i class="glyphicon glyphicon-check" title="{{ _('Mark this feed as read') }}"></i></a>
+                <a href="{{ url_for("feed.update", feed_id=fid, action="unread") }}"><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 %}
@@ -44,10 +44,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("feed.update", feed_id=fid, action="read") }}"><i class="glyphicon glyphicon-check" title="{{ _('Mark this feed as read') }}"></i></a>
+                <a href="{{ url_for("feed.update", feed_id=fid, action="unread") }}"><i class="glyphicon glyphicon-unchecked" title="{{ _('Mark this feed as unread') }}"></i></a>
             </span></li>
         {% endfor %}
         </ul>
diff --git a/pyaggr3g470r/templates/layout.html b/pyaggr3g470r/templates/layout.html
index 60efa69e..7f8288f8 100644
--- a/pyaggr3g470r/templates/layout.html
+++ b/pyaggr3g470r/templates/layout.html
@@ -38,7 +38,7 @@
                         <li><a accesskey="r" href="/fetch">{{ _('Fetch') }}</a></li>
                         <li><a href="/mark_as/read">{{ _('Mark all as read') }}</a></li>
                         <li role="presentation" class="divider"></li>
-                        <li><a href="/create_feed">{{ _('Add a feed') }}</a></li>
+                        <li><a href="{{ url_for("feed.form") }}">{{ _('Add a feed') }}</a></li>
                     </ul>
                 </li>
                 <li class="dropdown">
@@ -47,7 +47,7 @@
                         <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="/feeds">{{ _('All feeds') }}</a></li>
+                        <li><a href="{{ url_for("feeds.feeds") }}">{{ _('All feeds') }}</a></li>
                         <li><a href="/history">{{ _('History') }}</a></li>
                     </ul>
                 </li>
diff --git a/pyaggr3g470r/templates/management.html b/pyaggr3g470r/templates/management.html
index 722300af..b9d02de5 100644
--- a/pyaggr3g470r/templates/management.html
+++ b/pyaggr3g470r/templates/management.html
@@ -3,7 +3,7 @@
 <div class="container">
     <div class="well">
         <h1>{{ _('Your subscriptions') }}</h1>
-        <p>{{ _('You are subscribed to') }} {{ nb_feeds }} <a href="/feeds">{{ _('feeds') }}</a>. {{ _('Add a') }} <a href="/create_feed">{{ _('feed') }}</a>.</p>
+        <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 %}
             <a href="/index_database" class="btn btn-default">{{ _('Index database') }}</a>
diff --git a/pyaggr3g470r/templates/unread.html b/pyaggr3g470r/templates/unread.html
index 9808572b..d6f51bff 100644
--- a/pyaggr3g470r/templates/unread.html
+++ b/pyaggr3g470r/templates/unread.html
@@ -16,8 +16,8 @@
                 <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="/mark_as/read/feed/{{ feed.id }}"><i class="glyphicon glyphicon-check" title="{{ _('Mark all feed as read') }}"></i></a>
-                <a href="/mark_as/unread/feed/{{ feed.id }}"><i class="glyphicon glyphicon-unchecked" title="{{ _('Mark all feed as unread') }}"></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>
-- 
cgit 


From 5dfa537113c65a0596589c3683f7dba69323e8a7 Mon Sep 17 00:00:00 2001
From: François Schmidts <francois.schmidts@gmail.com>
Date: Wed, 8 Apr 2015 14:52:14 +0200
Subject: getting things out of the view a little more

---
 pyaggr3g470r/templates/home.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'pyaggr3g470r/templates')

diff --git a/pyaggr3g470r/templates/home.html b/pyaggr3g470r/templates/home.html
index 390ac5f6..9872c903 100644
--- a/pyaggr3g470r/templates/home.html
+++ b/pyaggr3g470r/templates/home.html
@@ -42,7 +42,7 @@
                 {% if feed_id == fid %}</b>{% endif %}
             </a></li>
             <li class="feed-commands"><span>
-                <a href="/feed/{{ fid }}"><i class="glyphicon glyphicon-info-sign" title="{{ _('Details') }}"></i></a>
+                <a href="{{ url_for("feed.feed", feed_id=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="{{ 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>
-- 
cgit 


From a4d30ad7b4481fe68e37d01a2c0b289445cf27a2 Mon Sep 17 00:00:00 2001
From: François Schmidts <francois.schmidts@gmail.com>
Date: Wed, 8 Apr 2015 15:53:39 +0200
Subject: adding a reset link to the feed page

---
 pyaggr3g470r/templates/feed.html | 1 +
 1 file changed, 1 insertion(+)

(limited to 'pyaggr3g470r/templates')

diff --git a/pyaggr3g470r/templates/feed.html b/pyaggr3g470r/templates/feed.html
index c0c92279..c888e04f 100644
--- a/pyaggr3g470r/templates/feed.html
+++ b/pyaggr3g470r/templates/feed.html
@@ -23,6 +23,7 @@
 
         {% if feed.error_count > 2 %}
             <b>{{ _("That feed has encountered too much consecutive errors and won't be retrieved anymore.") }}</b><br />
+            {{ _("You can click <a href='%(reset_error_url)s'>here</a> to reset the error count and reactivate the feed.", reset_error_url=url_for("feed.reset_errors", feed_id=feed.id)) }}
         {% elif feed.error_count > 0 %}
             {{ _("The download of this feed has encountered some problems. However its error counter will be reinitialized at the next successful retrieving.") }}<br />
         {% endif %}
-- 
cgit 


From 138ff287bedb78d0c444d9476b0c577ca22b79b6 Mon Sep 17 00:00:00 2001
From: François Schmidts <francois.schmidts@gmail.com>
Date: Wed, 8 Apr 2015 16:06:52 +0200
Subject: no more target, no more going back on the top of the page

---
 pyaggr3g470r/templates/home.html | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'pyaggr3g470r/templates')

diff --git a/pyaggr3g470r/templates/home.html b/pyaggr3g470r/templates/home.html
index 9872c903..e055b3e0 100644
--- a/pyaggr3g470r/templates/home.html
+++ b/pyaggr3g470r/templates/home.html
@@ -82,16 +82,16 @@
                         {% for article in articles %}
                         <tr data-article="{{ article.id }}" data-feed="{{ article.feed_id }}">
                             <td>
-                                <a href="#"><i class="glyphicon glyphicon-remove delete" title="{{ _('Delete this article') }}"></i></a>
+                                <a><i class="glyphicon glyphicon-remove delete" title="{{ _('Delete this article') }}"></i></a>
                                 {% if article.like %}
-                                    <a href="#"><i class="glyphicon glyphicon-star like" title="{{ _('One of your favorites') }}"></i></a>
+                                    <a><i class="glyphicon glyphicon-star like" title="{{ _('One of your favorites') }}"></i></a>
                                 {% else %}
-                                    <a href="#"><i class="glyphicon glyphicon-star-empty like" title="{{ _('Click if you like this article') }}"></i></a>
+                                    <a><i class="glyphicon glyphicon-star-empty like" title="{{ _('Click if you like this article') }}"></i></a>
                                 {% endif %}
                                 {% if article.readed %}
-                                    <a href="#"><i class="glyphicon glyphicon-unchecked readed" title="{{ _('Mark this article as unread') }}"></i></a>
+                                    <a><i class="glyphicon glyphicon-unchecked readed" title="{{ _('Mark this article as unread') }}"></i></a>
                                 {% else %}
-                                    <a href="#"><i class="glyphicon glyphicon-check readed" title="{{ _('Mark this article as read') }}"></i></a>
+                                    <a><i class="glyphicon glyphicon-check readed" title="{{ _('Mark this article as read') }}"></i></a>
                                     {% if filter_ == 'all' %}</b>{% endif %}
                                 {% endif %}
                             </td>
-- 
cgit 


From 01ccc02384a8b11d7ef33db2e13195d1e27bf850 Mon Sep 17 00:00:00 2001
From: François Schmidts <francois.schmidts@gmail.com>
Date: Sat, 11 Apr 2015 14:22:44 +0200
Subject: removing unread page

---
 pyaggr3g470r/templates/layout.html |  1 -
 pyaggr3g470r/templates/unread.html | 51 --------------------------------------
 2 files changed, 52 deletions(-)
 delete mode 100644 pyaggr3g470r/templates/unread.html

(limited to 'pyaggr3g470r/templates')

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 %}
-- 
cgit 


From d8e46270e1a879ea9a5fda8852ad7ddede95695d Mon Sep 17 00:00:00 2001
From: François Schmidts <francois.schmidts@gmail.com>
Date: Sat, 11 Apr 2015 15:20:03 +0200
Subject: regrouping favorties and home, redoing the tab selection jscode

---
 pyaggr3g470r/templates/favorites.html | 48 -----------------------------------
 pyaggr3g470r/templates/layout.html    | 27 ++++++++++----------
 2 files changed, 14 insertions(+), 61 deletions(-)
 delete mode 100644 pyaggr3g470r/templates/favorites.html

(limited to 'pyaggr3g470r/templates')

diff --git a/pyaggr3g470r/templates/favorites.html b/pyaggr3g470r/templates/favorites.html
deleted file mode 100644
index 210f7343..00000000
--- a/pyaggr3g470r/templates/favorites.html
+++ /dev/null
@@ -1,48 +0,0 @@
- {% extends "layout.html" %}
-{% block content %}
-<div class="container">
-    {% if feeds|count == 0  %}
-        <div class="page-header">
-            <h1>{{ _('No favorites') }}</h1>
-        </div>
-    {% else %}
-        <div class="page-header">
-            <h1>{{ _('Favorites articles') }} <small>{{ nb_favorites }}</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>
-                </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/templates/layout.html b/pyaggr3g470r/templates/layout.html
index 90263fb8..f9b51127 100644
--- a/pyaggr3g470r/templates/layout.html
+++ b/pyaggr3g470r/templates/layout.html
@@ -6,7 +6,7 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
     <meta name="description" content="pyAggr3g470r is a web-based news aggregator." />
     <meta name="author" content="" />
-    <title>{% if head_title %}{{ head_title }} - {% endif %}pyAggr3g470r</title>
+    <title>pyAggr3g470r{% if head_title %} - {{ head_title }}{% endif %}</title>
     <link rel="shortcut icon" href="{{ url_for('static', filename='img/favicon.png') }}" />
     <!-- Bootstrap core CSS -->
     <link href="{{ url_for('static', filename = 'css/bootstrap.css') }}" rel="stylesheet" media="screen" />
@@ -25,7 +25,7 @@
             <span class="icon-bar"></span>
             <span class="icon-bar"></span>
           </button>
-          <a class="navbar-brand" href="/">pyAggr3g470r</a>
+          <a class="navbar-brand" href="/">pyAggr3g470r</a><span class="navbar-brand">{% if head_title %}-  {{ head_title }}{% endif %}</span>
         </div>
 
         <!-- Collect the nav links, forms, and other content for toggling -->
@@ -101,18 +101,19 @@
     <script src="{{ url_for('static', filename = 'js/bootstrap.js') }}"></script>
     <script src="{{ url_for('static', filename = 'js/articles.js') }}"></script>
     <script type="text/javascript" class="source">
-        if (window.location.href.indexOf("filter_=all") > -1){
-            $("#tab-all").attr('class', "active");
-        }
-        else if (window.location.href.indexOf("filter_=unread") > -1) {
-            $("#tab-unread").attr('class', "active");
-        }
-        else if (window.location.href.indexOf("filter_=read") > -1) {
-            $("#tab-read").attr('class', "active");
-        }
-        else {
-            $("#tab-unread").attr('class', "active");
+        var filter_ = {% if filter_ %}"{{ filter_ }}"{% else %}undefined{% endif %};
+        if (filter_ == undefined) {
+            if (window.location.href.indexOf("filter_=all") > -1){
+                filter_ = 'all';
+            }
+            else if (window.location.href.indexOf("filter_=unread") > -1) {
+                filter_ = 'unread';
+            }
+            else if (window.location.href.indexOf("filter_=read") > -1) {
+                filter_ = 'read';
+            }
         }
+        $("#tab-" + filter_).attr('class', "active");
     </script>
   </body>
 </html>
-- 
cgit 


From 21da20f5d592aabcb60096768dcac76baa626315 Mon Sep 17 00:00:00 2001
From: François Schmidts <francois.schmidts@gmail.com>
Date: Sat, 11 Apr 2015 16:14:19 +0200
Subject: first take on redoing the menu

---
 pyaggr3g470r/templates/layout.html | 39 ++++++++++++++++++++------------------
 1 file changed, 21 insertions(+), 18 deletions(-)

(limited to 'pyaggr3g470r/templates')

diff --git a/pyaggr3g470r/templates/layout.html b/pyaggr3g470r/templates/layout.html
index f9b51127..d15d99d8 100644
--- a/pyaggr3g470r/templates/layout.html
+++ b/pyaggr3g470r/templates/layout.html
@@ -9,10 +9,10 @@
     <title>pyAggr3g470r{% if head_title %} - {{ head_title }}{% endif %}</title>
     <link rel="shortcut icon" href="{{ url_for('static', filename='img/favicon.png') }}" />
     <!-- Bootstrap core CSS -->
-    <link href="{{ url_for('static', filename = 'css/bootstrap.css') }}" rel="stylesheet" media="screen" />
+    <link href="{{ url_for('static', filename='css/bootstrap.css') }}" rel="stylesheet" media="screen" />
     <!-- Add custom CSS here -->
-    <link href="{{ url_for('static', filename = 'css/customized-bootstrap.css') }}" rel="stylesheet" media="screen" />
-    <link href="{{ url_for('static', filename = 'css/side-nav.css') }}" rel="stylesheet" media="screen" />
+    <link href="{{ url_for('static', filename='css/customized-bootstrap.css') }}" rel="stylesheet" media="screen" />
+    <link href="{{ url_for('static', filename='css/side-nav.css') }}" rel="stylesheet" media="screen" />
   {% endblock %}
   </head>
   <body>
@@ -25,36 +25,39 @@
             <span class="icon-bar"></span>
             <span class="icon-bar"></span>
           </button>
-          <a class="navbar-brand" href="/">pyAggr3g470r</a><span class="navbar-brand">{% if head_title %}-  {{ head_title }}{% endif %}</span>
+          <a class="navbar-brand" href="/">pyAggr3g470r</a>
+          <span class="navbar-brand">{% if head_title %} - {{ head_title }}{% endif %}</span>
         </div>
 
         <!-- Collect the nav links, forms, and other content for toggling -->
         <div class="collapse navbar-collapse navbar-ex1-collapse">
           <ul class="nav navbar-nav navbar-right">
             {% if g.user.is_authenticated() %}
+                <li><a href="{{ url_for("feed.form") }}"><span class="glyphicon glyphicon-plus-sign"></span>{{ _('Add a feed') }}</a></li>
+                <li><a accesskey="f" href="/favorites"><span class="glyphicon glyphicon-star"></span> {{ _('Favorites') }}</a></li>
+                {% if conf.ON_HEROKU and g.user.is_admin() %}
+                <li><a accesskey="r" href="/fetch"><span class="glyphicon glyphicon-import"></span>{{ _('Fetch') }}</a></li>
+                {% endif %}
                 <li class="dropdown">
-                    <a href="#" class="dropdown-toggle" data-toggle="dropdown">{{ _('Articles') }} <b class="caret"></b></a>
+                    <a href="#" class="dropdown-toggle" data-toggle="dropdown">{{ _('Feed') }} <b class="caret"></b></a>
                     <ul class="dropdown-menu">
-                        <li><a accesskey="r" href="/fetch">{{ _('Fetch') }}</a></li>
-                        <li><a href="/mark_as/read">{{ _('Mark all as read') }}</a></li>
+                        <li><a href="{{ url_for("feeds.update", action="read") }}">{{ _('Mark all as read') }}</a></li>
                         <li role="presentation" class="divider"></li>
-                        <li><a href="{{ url_for("feed.form") }}">{{ _('Add a feed') }}</a></li>
+                        <li><a accesskey="i" href="/inactives">{{ _('Inactive') }}</a></li>
+                        <li><a href="/history">{{ _('History') }}</a></li>
+                        <li><a href="{{ url_for("feeds.feeds") }}">{{ _('All') }}</a></li>
                     </ul>
                 </li>
                 <li class="dropdown">
-                    <a href="#" class="dropdown-toggle" data-toggle="dropdown"><span class="glyphicon glyphicon-filter"></span> {{ _('Filter') }} <b class="caret"></b></a>
+                    <a href="#" class="dropdown-toggle" data-toggle="dropdown">{{ _('Tools') }} <b class="caret"></b></a>
                     <ul class="dropdown-menu">
-                        <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>
-                        <li><a href="/history">{{ _('History') }}</a></li>
+                        <li><a accesskey="m" href="/management"><span class="glyphicon glyphicon-cog"></span> {{ _('Management') }}</a></li>
+                        {% if g.user.is_admin() %}
+                        <li><a href="{{ url_for('dashboard') }}"><span class="glyphicon glyphicon-dashboard"></span> {{ _('Dashboard') }}</a></li>
+                        {% endif %}
+                        <li><a href="/about"><span class="glyphicon glyphicon-question-sign"></span>{{ _('About') }}</a></li>
                     </ul>
                 </li>
-                <li><a accesskey="m" href="/management"><span class="glyphicon glyphicon-cog"></span> {{ _('Management') }}</a></li>
-                {% if g.user.is_admin() %}
-                    <li><a href="{{ url_for('dashboard') }}"><span class="glyphicon glyphicon-dashboard"></span> {{ _('Dashboard') }}</a></li>
-                {% endif %}
-                <li><a href="/about">{{ _('About') }}</a></li>
                 <li><a href="{{ url_for('logout') }}"><span class="glyphicon glyphicon-log-out"></span> {{ _('Logout') }}</a></li>
                 <li class="dropdown">
                     <a href="#" class="dropdown-toggle" data-toggle="dropdown">
-- 
cgit 


From ea60cca948469daaff940698f27f3cb9a53300c3 Mon Sep 17 00:00:00 2001
From: François Schmidts <francois.schmidts@gmail.com>
Date: Sun, 12 Apr 2015 14:28:03 +0200
Subject: making the favorites link switch to home when the displayed page is
 favorites

---
 pyaggr3g470r/templates/layout.html | 22 +++++++++++++---------
 1 file changed, 13 insertions(+), 9 deletions(-)

(limited to 'pyaggr3g470r/templates')

diff --git a/pyaggr3g470r/templates/layout.html b/pyaggr3g470r/templates/layout.html
index d15d99d8..e673a128 100644
--- a/pyaggr3g470r/templates/layout.html
+++ b/pyaggr3g470r/templates/layout.html
@@ -25,7 +25,7 @@
             <span class="icon-bar"></span>
             <span class="icon-bar"></span>
           </button>
-          <a class="navbar-brand" href="/">pyAggr3g470r</a>
+          <a class="navbar-brand" href="{{ url_for("home") }}">pyAggr3g470r</a>
           <span class="navbar-brand">{% if head_title %} - {{ head_title }}{% endif %}</span>
         </div>
 
@@ -34,7 +34,11 @@
           <ul class="nav navbar-nav navbar-right">
             {% if g.user.is_authenticated() %}
                 <li><a href="{{ url_for("feed.form") }}"><span class="glyphicon glyphicon-plus-sign"></span>{{ _('Add a feed') }}</a></li>
-                <li><a accesskey="f" href="/favorites"><span class="glyphicon glyphicon-star"></span> {{ _('Favorites') }}</a></li>
+                {% if favorites %}
+                <li><a href="{{ url_for("home") }}"><span class="glyphicon glyphicon-home"></span> {{ _('Home') }}</a></li>
+                {% else %}
+                <li><a accesskey="f" href="{{ url_for("favorites") }}"><span class="glyphicon glyphicon-star"></span> {{ _('Favorites') }}</a></li>
+                {% endif %}
                 {% if conf.ON_HEROKU and g.user.is_admin() %}
                 <li><a accesskey="r" href="/fetch"><span class="glyphicon glyphicon-import"></span>{{ _('Fetch') }}</a></li>
                 {% endif %}
@@ -43,22 +47,22 @@
                     <ul class="dropdown-menu">
                         <li><a href="{{ url_for("feeds.update", action="read") }}">{{ _('Mark all as read') }}</a></li>
                         <li role="presentation" class="divider"></li>
-                        <li><a accesskey="i" href="/inactives">{{ _('Inactive') }}</a></li>
-                        <li><a href="/history">{{ _('History') }}</a></li>
+                        <li><a accesskey="i" href="{{ url_for("inactives") }}">{{ _('Inactive') }}</a></li>
+                        <li><a href="{{ url_for("history") }}">{{ _('History') }}</a></li>
                         <li><a href="{{ url_for("feeds.feeds") }}">{{ _('All') }}</a></li>
                     </ul>
                 </li>
                 <li class="dropdown">
                     <a href="#" class="dropdown-toggle" data-toggle="dropdown">{{ _('Tools') }} <b class="caret"></b></a>
                     <ul class="dropdown-menu">
-                        <li><a accesskey="m" href="/management"><span class="glyphicon glyphicon-cog"></span> {{ _('Management') }}</a></li>
+i                       <li><a accesskey="m" href="{{ url_for("management") }}"><span class="glyphicon glyphicon-cog"></span> {{ _('Management') }}</a></li>
                         {% if g.user.is_admin() %}
-                        <li><a href="{{ url_for('dashboard') }}"><span class="glyphicon glyphicon-dashboard"></span> {{ _('Dashboard') }}</a></li>
+                        <li><a href="{{ url_for("dashboard") }}"><span class="glyphicon glyphicon-dashboard"></span> {{ _('Dashboard') }}</a></li>
                         {% endif %}
-                        <li><a href="/about"><span class="glyphicon glyphicon-question-sign"></span>{{ _('About') }}</a></li>
+                        <li><a href="{{ url_for("about") }}"><span class="glyphicon glyphicon-question-sign"></span>{{ _('About') }}</a></li>
                     </ul>
                 </li>
-                <li><a href="{{ url_for('logout') }}"><span class="glyphicon glyphicon-log-out"></span> {{ _('Logout') }}</a></li>
+                <li><a href="{{ url_for("logout") }}"><span class="glyphicon glyphicon-log-out"></span> {{ _('Logout') }}</a></li>
                 <li class="dropdown">
                     <a href="#" class="dropdown-toggle" data-toggle="dropdown">
                         <div><span class="glyphicon glyphicon-search"></span>&nbsp;<b class="caret"></b></div>
@@ -74,7 +78,7 @@
                     </ul>
                 </li>
             {% else %}
-                <li><a href="/about">{{ _('About') }}</a></li>
+                <li><a href="{{ url_for("about") }}"><span class="glyphicon glyphicon-question-sign"></span>{{ _('About') }}</a></li>
             {% endif %}
           </ul>
         </div><!-- /.navbar-collapse -->
-- 
cgit