diff options
Diffstat (limited to 'pyaggr3g470r/templates')
| -rw-r--r-- | pyaggr3g470r/templates/feed.html | 12 | ||||
| -rw-r--r-- | pyaggr3g470r/templates/home.html | 16 |
2 files changed, 14 insertions, 14 deletions
diff --git a/pyaggr3g470r/templates/feed.html b/pyaggr3g470r/templates/feed.html index 95465170..849dba49 100644 --- a/pyaggr3g470r/templates/feed.html +++ b/pyaggr3g470r/templates/feed.html @@ -4,14 +4,14 @@ <div class="jumbotron"> <h2>{{ feed.title }}</h2> {% if feed.description %} <p>{{ feed.description }}</p> {% endif %} - <a href="/delete_feed/{{ feed.oid }}"><i class="glyphicon glyphicon-remove" title="Delete this feed"></i></a> - <a href="/edit_feed/{{ feed.oid }}"><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"></i></a> + <a href="/edit_feed/{{ feed.id }}"><i class="glyphicon glyphicon-edit" title="Edit this feed"></i></a> </div> <div class="jumbotron"> <p> - This feed contains {{ feed.articles|count }} <a href="/articles/{{ feed.oid }}/100">articles</a> + This feed contains {{ feed.articles.all()|count }} <a href="/articles/{{ feed.id }}/100">articles</a> {% if nb_articles != 0 %} - ({{ ((feed.articles|count * 100 ) / nb_articles) | round(2, 'floor') }}% of the database) + ({{ ((feed.articles.all()|count * 100 ) / nb_articles) | round(2, 'floor') }}% of the database) {% endif %} .<br /> Address of the feed: <a href="{{ feed.link }}">{{ feed.link }}</a><br /> @@ -19,14 +19,14 @@ Address of the site: <a href="{{ feed.site_link }}">{{ feed.site_link }}</a> {% endif %} <br /> - {% if feed.articles|count != 0 %} + {% if feed.articles.all()|count != 0 %} The last article was posted {{ elapsed.days }} day(s) ago.<br /> Daily average: {{ average }}, between the {{ first_post_date.strftime('%Y-%m-%d') }} and the {{ end_post_date.strftime('%Y-%m-%d') }}. {% endif %} </p> </div> <div class="jumbotron"> - {% if feed.articles|count != 0 %} + {% if feed.articles.all()|count != 0 %} <div>{{ tag_cloud|safe }}</div> {% endif %} </div> diff --git a/pyaggr3g470r/templates/home.html b/pyaggr3g470r/templates/home.html index 9117bce9..8a4e429d 100644 --- a/pyaggr3g470r/templates/home.html +++ b/pyaggr3g470r/templates/home.html @@ -8,16 +8,16 @@ <div class="row"> <div class="col-md-6 col-md-offset-3"> <h1>{{ feed.title|safe }}</h1> - <a href="/articles/{{ feed.oid }}/100"><i class="glyphicon glyphicon-th-list" title="More articles"></i></a> - <a href="/feed/{{ feed.oid }}"><i class="glyphicon glyphicon-info-sign" title="Details"></i></a> - <a href="/edit_feed/{{ feed.oid }}"><i class="glyphicon glyphicon-edit" title="Edit this feed"></i></a> + <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> {% if feed.enabled %} - <a href="/fetch/{{ feed.oid }}"><i class="glyphicon glyphicon-cloud-download" title="Fetch this feed"></i></a> + <a href="/fetch/{{ feed.id }}"><i class="glyphicon glyphicon-cloud-download" title="Fetch this feed"></i></a> {% endif %} - <a href="/mark_as_read/{{ feed.oid }}"><i class="glyphicon glyphicon-check" title="Mark all as read"></i></a> + <a href="/mark_as_read/{{ feed.id }}"><i class="glyphicon glyphicon-check" title="Mark all as read"></i></a> </div> </div> - {% for number in range(0, feed.articles|length-(feed.articles|length % 3), 3) %} + {% for number in range(0, feed.articles.all()|count-(feed.articles.all()|count % 3), 3) %} <div class="row"> {% for n in range(number, number+3) %} <div class="col-xs-6 col-sm-4 col-md-4"> @@ -29,9 +29,9 @@ {% endfor %} </div> {% endfor %} - {% if feed.articles|length % 3 != 0 %} + {% if feed.articles.all()|count % 3 != 0 %} <div class="row"> - {% for n in range(feed.articles|length-(feed.articles|length % 3), feed.articles|length) %} + {% for n in range(feed.articles.all()|count-(feed.articles.all()|count % 3), feed.articles.all()|count) %} <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> |