diff options
| author | Cédric Bonhomme <cedric@cedricbonhomme.org> | 2015-03-23 19:21:30 +0100 |
|---|---|---|
| committer | Cédric Bonhomme <cedric@cedricbonhomme.org> | 2015-03-23 19:21:30 +0100 |
| commit | c94a05150f22d0fef073efdd1ef6f1debb51dbab (patch) | |
| tree | 2954b5ab40eabc80d4be29d95814b9809c33b5fb /pyaggr3g470r/templates/feed.html | |
| parent | Format the date with the adequat Babel filter. (diff) | |
| download | newspipe-c94a05150f22d0fef073efdd1ef6f1debb51dbab.tar.gz newspipe-c94a05150f22d0fef073efdd1ef6f1debb51dbab.tar.bz2 newspipe-c94a05150f22d0fef073efdd1ef6f1debb51dbab.zip | |
Fixed a minor bug in the '/feed' page.
Diffstat (limited to 'pyaggr3g470r/templates/feed.html')
| -rw-r--r-- | pyaggr3g470r/templates/feed.html | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/pyaggr3g470r/templates/feed.html b/pyaggr3g470r/templates/feed.html index 4b050573..c7dfecc2 100644 --- a/pyaggr3g470r/templates/feed.html +++ b/pyaggr3g470r/templates/feed.html @@ -9,11 +9,14 @@ </div> <div class="jumbotron"> <p> - {{ _('This feed contains') }} {{ feed.articles.all()|count }} <a href="/articles/{{ feed.id }}/100">{{ _('articles') }}</a> - {% if nb_articles != 0 %} - ({{ ((feed.articles.all()|count * 100 ) / nb_articles) | round(2, 'floor') }}% {{ _('of the database') }}).<br /> + {{ _('This feed contains') }} {{ feed.articles.all()|count }} <a href="/articles/{{ feed.id }}/100">{{ _('articles') }}</a>.<br /> + {{ _('Address of the feed') }}: <a href="{{ feed.link }}" target="_blank">{{ feed.link }}</a><br /> + {% if feed.site_link != "" %} + {{ _('Address of the site') }}: <a href="{{ feed.site_link }}" target="_blank">{{ feed.site_link }}</a><br /> {% endif %} + <br /> + {% if feed.last_retrieved %} {{ _("Last download:") }} {{ feed.last_retrieved | datetime }}<br /> {% endif %} @@ -28,11 +31,6 @@ {{ _("Here's the last error encountered while retrieving this feed:") }} <pre>{{ feed.last_error }}</pre><br /> {% endif %} - {{ _('Address of the feed') }}: <a href="{{ feed.link }}">{{ feed.link }}</a><br /> - {% if feed.site_link != "" %} - {{ _('Address of the site') }}: <a href="{{ feed.site_link }}">{{ feed.site_link }}</a><br /> - {% endif %} - {% 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 | datetime }} {{ _('and the') }} {{ end_post_date | datetime }}. |