From 0dd06d8e6047be57295d5346857fb62fc1c103b5 Mon Sep 17 00:00:00 2001 From: Cédric Bonhomme Date: Tue, 10 Mar 2015 22:13:46 +0100 Subject: The label of the badge (for the errors count) wasn't clear enough. --- pyaggr3g470r/templates/home.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pyaggr3g470r/templates') diff --git a/pyaggr3g470r/templates/home.html b/pyaggr3g470r/templates/home.html index 3a9608d5..f2d2218b 100644 --- a/pyaggr3g470r/templates/home.html +++ b/pyaggr3g470r/templates/home.html @@ -22,7 +22,7 @@
  • {% if feed_id == fid %}{% endif %} {% if in_error.get(fid, 0) > 0 %} - 2 else "orange" }} ;" class="badge pull-right" title="Some errors occured while trying to retrieve that feed.">{{ in_error[fid] }} + 2 else "orange" }} ;" class="badge pull-right" title="Some errors occured while trying to retrieve that feed.">{{ in_error[fid] }} {{ _("error") }}{% if in_error[fid] > 1 %}s{% endif %} {% endif %} {{ nbunread }} {{ feeds[fid]|safe }} @@ -40,7 +40,7 @@ {% for fid, ftitle in feeds|dictsort(case_sensitive=False, by='value') if not fid in unread %}
  • {% if in_error.get(fid, 0) > 0 %} - 2 else "orange" }} ;" class="badge pull-right" title="Some errors occured while trying to retrieve that feed.">{{ in_error[fid] }} + 2 else "orange" }} ;" class="badge pull-right" title="Some errors occured while trying to retrieve that feed.">{{ in_error[fid] }} {{ _("error") }}{% if in_error[fid] > 1 %}s{% endif %} {% endif %} {% if feed_id == fid %}{% endif %} {{ ftitle|safe }} -- cgit From fb5df6041fc7bf97429bfe689e26fdc08e7e307f Mon Sep 17 00:00:00 2001 From: Cédric Bonhomme Date: Sun, 15 Mar 2015 23:59:14 +0100 Subject: A new test for the history page. --- pyaggr3g470r/templates/history.html | 89 +++++++------------------------------ 1 file changed, 17 insertions(+), 72 deletions(-) (limited to 'pyaggr3g470r/templates') diff --git a/pyaggr3g470r/templates/history.html b/pyaggr3g470r/templates/history.html index 0194cb89..6216f616 100644 --- a/pyaggr3g470r/templates/history.html +++ b/pyaggr3g470r/templates/history.html @@ -1,74 +1,19 @@ - {% extends "layout.html" %} - {% block head %} -{{ super() }} - - -{% endblock %} - +{% extends "layout.html" %} {% block content %} +{% endblock %} -- cgit From 8d0fea82761f2fdc1ea93687429990eefa851fc8 Mon Sep 17 00:00:00 2001 From: Cédric Bonhomme Date: Mon, 16 Mar 2015 07:22:52 +0100 Subject: Improvements and fixes for the history() function. --- pyaggr3g470r/templates/history.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'pyaggr3g470r/templates') diff --git a/pyaggr3g470r/templates/history.html b/pyaggr3g470r/templates/history.html index 6216f616..2d64da98 100644 --- a/pyaggr3g470r/templates/history.html +++ b/pyaggr3g470r/templates/history.html @@ -10,7 +10,7 @@
  • {{ article }} : {{ articles_counter[article] }} articles
  • {% else %} {% for article in articles %} -
  • {{ article.title | safe }}
  • +
  • {{ article.date }} - {{ article.title | safe }}
  • {% endfor %} {% endif %} {% endfor %} -- cgit From f322fba75c8ca3dd4296a11bda688d63b2a547d2 Mon Sep 17 00:00:00 2001 From: Cédric Bonhomme Date: Mon, 16 Mar 2015 07:36:11 +0100 Subject: Added a new Jinja filter to get month name from number. --- pyaggr3g470r/templates/history.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'pyaggr3g470r/templates') diff --git a/pyaggr3g470r/templates/history.html b/pyaggr3g470r/templates/history.html index 2d64da98..3b9412a3 100644 --- a/pyaggr3g470r/templates/history.html +++ b/pyaggr3g470r/templates/history.html @@ -7,7 +7,7 @@ {% if year == None %}
  • {{ article }} : {{ articles_counter[article] }} articles
  • {% elif month == None %} -
  • {{ article }} : {{ articles_counter[article] }} articles
  • +
  • {{ article | month_name }} : {{ articles_counter[article] }} articles
  • {% else %} {% for article in articles %}
  • {{ article.date }} - {{ article.title | safe }}
  • -- cgit From 3cb61e31e6642cba163604893efcca98b46f4b68 Mon Sep 17 00:00:00 2001 From: Cédric Bonhomme Date: Mon, 16 Mar 2015 13:30:02 +0100 Subject: Improvements to the 'history' page. --- pyaggr3g470r/templates/history.html | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'pyaggr3g470r/templates') diff --git a/pyaggr3g470r/templates/history.html b/pyaggr3g470r/templates/history.html index 3b9412a3..c4d6c9a6 100644 --- a/pyaggr3g470r/templates/history.html +++ b/pyaggr3g470r/templates/history.html @@ -2,6 +2,13 @@ {% block content %}

    {{ _('History') }}

    + {% if month != None %} +

    {{ year }}

    +

    {{ month | month_name }}

    + {% elif year != None %} +

     {{ _('all years') }}

    +

    {{ year }}

    + {% endif %}
      {% for article in articles_counter %} {% if year == None %} @@ -9,7 +16,7 @@ {% elif month == None %}
    • {{ article | month_name }} : {{ articles_counter[article] }} articles
    • {% else %} - {% for article in articles %} + {% for article in articles | sort(attribute="date") %}
    • {{ article.date }} - {{ article.title | safe }}
    • {% endfor %} {% endif %} -- cgit From 264c916b1e83a3f429c87a14d69c45e87a5afbd0 Mon Sep 17 00:00:00 2001 From: Cédric Bonhomme Date: Tue, 17 Mar 2015 06:56:38 +0100 Subject: Reverse the sort of articles. --- pyaggr3g470r/templates/history.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'pyaggr3g470r/templates') diff --git a/pyaggr3g470r/templates/history.html b/pyaggr3g470r/templates/history.html index c4d6c9a6..b01ca032 100644 --- a/pyaggr3g470r/templates/history.html +++ b/pyaggr3g470r/templates/history.html @@ -16,7 +16,7 @@ {% elif month == None %}
    • {{ article | month_name }} : {{ articles_counter[article] }} articles
    • {% else %} - {% for article in articles | sort(attribute="date") %} + {% for article in articles | sort(attribute="date", reverse = True) %}
    • {{ article.date }} - {{ article.title | safe }}
    • {% endfor %} {% endif %} -- cgit From c351b29b2181aabfdd115476ffa68df0c05a3a09 Mon Sep 17 00:00:00 2001 From: Cédric Bonhomme Date: Thu, 19 Mar 2015 11:54:08 +0100 Subject: Format the date with the adequat Babel filter. --- pyaggr3g470r/templates/history.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'pyaggr3g470r/templates') diff --git a/pyaggr3g470r/templates/history.html b/pyaggr3g470r/templates/history.html index b01ca032..6be54d71 100644 --- a/pyaggr3g470r/templates/history.html +++ b/pyaggr3g470r/templates/history.html @@ -17,7 +17,7 @@
    • {{ article | month_name }} : {{ articles_counter[article] }} articles
    • {% else %} {% for article in articles | sort(attribute="date", reverse = True) %} -
    • {{ article.date }} - {{ article.title | safe }}
    • +
    • {{ article.date | datetime }} - {{ article.title | safe }}
    • {% endfor %} {% endif %} {% endfor %} -- cgit From c94a05150f22d0fef073efdd1ef6f1debb51dbab Mon Sep 17 00:00:00 2001 From: Cédric Bonhomme Date: Mon, 23 Mar 2015 19:21:30 +0100 Subject: Fixed a minor bug in the '/feed' page. --- pyaggr3g470r/templates/feed.html | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) (limited to 'pyaggr3g470r/templates') 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 @@

    - {{ _('This feed contains') }} {{ feed.articles.all()|count }} {{ _('articles') }} - {% if nb_articles != 0 %} - ({{ ((feed.articles.all()|count * 100 ) / nb_articles) | round(2, 'floor') }}% {{ _('of the database') }}).
    + {{ _('This feed contains') }} {{ feed.articles.all()|count }} {{ _('articles') }}.
    + {{ _('Address of the feed') }}: {{ feed.link }}
    + {% if feed.site_link != "" %} + {{ _('Address of the site') }}: {{ feed.site_link }}
    {% endif %} +
    + {% if feed.last_retrieved %} {{ _("Last download:") }} {{ feed.last_retrieved | datetime }}
    {% endif %} @@ -28,11 +31,6 @@ {{ _("Here's the last error encountered while retrieving this feed:") }}

    {{ feed.last_error }}

    {% endif %} - {{ _('Address of the feed') }}: {{ feed.link }}
    - {% if feed.site_link != "" %} - {{ _('Address of the site') }}: {{ feed.site_link }}
    - {% endif %} - {% if feed.articles.all()|count != 0 %} {{ _('The last article was posted') }} {{ elapsed.days }} {{ _('day(s) ago.') }}
    {{ _('Daily average') }}: {{ average }}, {{ _('between the') }} {{ first_post_date | datetime }} {{ _('and the') }} {{ end_post_date | datetime }}. -- cgit From 5e31ec379db43f6ecfdde6ebdc155e7896338698 Mon Sep 17 00:00:00 2001 From: Cédric Bonhomme Date: Mon, 23 Mar 2015 19:27:42 +0100 Subject: Use the 'safe' Jinja filter to prevent bad html code. --- pyaggr3g470r/templates/feed.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'pyaggr3g470r/templates') diff --git a/pyaggr3g470r/templates/feed.html b/pyaggr3g470r/templates/feed.html index c7dfecc2..3d6bb3c0 100644 --- a/pyaggr3g470r/templates/feed.html +++ b/pyaggr3g470r/templates/feed.html @@ -28,7 +28,7 @@ {% endif %} {% if feed.last_error %} - {{ _("Here's the last error encountered while retrieving this feed:") }}
    {{ feed.last_error }}

    + {{ _("Here's the last error encountered while retrieving this feed:") }}
    {{ feed.last_error | safe }}

    {% endif %} {% if feed.articles.all()|count != 0 %} -- cgit From b7951227d3daf1723dc7805155cc68e4b8ec779d Mon Sep 17 00:00:00 2001 From: Cédric Bonhomme Date: Mon, 23 Mar 2015 19:29:59 +0100 Subject: Previous commit is useless... --- pyaggr3g470r/templates/feed.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'pyaggr3g470r/templates') diff --git a/pyaggr3g470r/templates/feed.html b/pyaggr3g470r/templates/feed.html index 3d6bb3c0..c7dfecc2 100644 --- a/pyaggr3g470r/templates/feed.html +++ b/pyaggr3g470r/templates/feed.html @@ -28,7 +28,7 @@ {% endif %} {% if feed.last_error %} - {{ _("Here's the last error encountered while retrieving this feed:") }}
    {{ feed.last_error | safe }}

    + {{ _("Here's the last error encountered while retrieving this feed:") }}
    {{ feed.last_error }}

    {% endif %} {% if feed.articles.all()|count != 0 %} -- cgit From 7d94362fdde9a93b234be7a8be33a6ff819fe293 Mon Sep 17 00:00:00 2001 From: Cédric Bonhomme Date: Fri, 27 Mar 2015 06:58:24 +0100 Subject: Display the article id in the 'duplicates' page. --- pyaggr3g470r/templates/duplicates.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pyaggr3g470r/templates') diff --git a/pyaggr3g470r/templates/duplicates.html b/pyaggr3g470r/templates/duplicates.html index a7eff2d0..2c08306a 100644 --- a/pyaggr3g470r/templates/duplicates.html +++ b/pyaggr3g470r/templates/duplicates.html @@ -16,8 +16,8 @@ {% for pair in duplicates %} {{ loop.index }} -  {{ pair[0].title }} -  {{ pair[1].title }} +  {{ pair[0].title }} ({{ pair[0].entry_id }}) +  {{ pair[1].title }} ({{ pair[1].entry_id }}) {% endfor %} -- cgit From d1cbb124997166292eed2f7cfb25c82d82792226 Mon Sep 17 00:00:00 2001 From: Cédric Bonhomme Date: Sat, 28 Mar 2015 09:55:16 +0100 Subject: It is now possible to delete all duplicate articles with one request. --- pyaggr3g470r/templates/duplicates.html | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'pyaggr3g470r/templates') diff --git a/pyaggr3g470r/templates/duplicates.html b/pyaggr3g470r/templates/duplicates.html index 2c08306a..2c953fa3 100644 --- a/pyaggr3g470r/templates/duplicates.html +++ b/pyaggr3g470r/templates/duplicates.html @@ -8,16 +8,16 @@ # - - + Delete all + Delete all {% for pair in duplicates %} {{ loop.index }} -  {{ pair[0].title }} ({{ pair[0].entry_id }}) -  {{ pair[1].title }} ({{ pair[1].entry_id }}) +  {{ pair[0].title }} ({{ pair[0].entry_id }}) +  {{ pair[1].title }} ({{ pair[1].entry_id }}) {% endfor %} -- cgit From 21074e1b7a110d219d71049a8bae26f6b9466118 Mon Sep 17 00:00:00 2001 From: Cédric Bonhomme Date: Sat, 28 Mar 2015 11:26:47 +0100 Subject: Improved table to the /duplicates page. --- pyaggr3g470r/templates/duplicates.html | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'pyaggr3g470r/templates') diff --git a/pyaggr3g470r/templates/duplicates.html b/pyaggr3g470r/templates/duplicates.html index 2c953fa3..86990473 100644 --- a/pyaggr3g470r/templates/duplicates.html +++ b/pyaggr3g470r/templates/duplicates.html @@ -8,8 +8,12 @@ # - Delete all - Delete all + + {{ _('Delete all in this column') }} + + + {{ _('Delete all in this column') }} + -- cgit From 20677d77dec1d06703b12b4e6f0a4aa551a687ee Mon Sep 17 00:00:00 2001 From: Cédric Bonhomme Date: Sun, 29 Mar 2015 10:59:59 +0200 Subject: Displays the 'retrieved_date' instead of the 'id' in the /duplicates page. --- pyaggr3g470r/templates/duplicates.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pyaggr3g470r/templates') diff --git a/pyaggr3g470r/templates/duplicates.html b/pyaggr3g470r/templates/duplicates.html index 86990473..4d7ac650 100644 --- a/pyaggr3g470r/templates/duplicates.html +++ b/pyaggr3g470r/templates/duplicates.html @@ -20,8 +20,8 @@ {% for pair in duplicates %} {{ loop.index }} -  {{ pair[0].title }} ({{ pair[0].entry_id }}) -  {{ pair[1].title }} ({{ pair[1].entry_id }}) +  {{ pair[0].title }} ({{ pair[0].retrieved_date }}) +  {{ pair[1].title }} ({{ pair[1].retrieved_date }}) {% endfor %} -- cgit From d987c309ca583b3682d1d8c97f2985f5d5876af9 Mon Sep 17 00:00:00 2001 From: Cédric Bonhomme Date: Wed, 1 Apr 2015 21:57:44 +0200 Subject: Added customized-bootstrap.css file. --- pyaggr3g470r/templates/layout.html | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'pyaggr3g470r/templates') diff --git a/pyaggr3g470r/templates/layout.html b/pyaggr3g470r/templates/layout.html index 6b929bf3..12c02814 100644 --- a/pyaggr3g470r/templates/layout.html +++ b/pyaggr3g470r/templates/layout.html @@ -10,6 +10,7 @@ + {% endblock %} - -
    - +
    {% with messages = get_flashed_messages(with_categories=true) %} {% if messages %} -- cgit