From a4c40ad567abe66c52d119d3023482a02b71b1bb Mon Sep 17 00:00:00 2001 From: Cédric Bonhomme Date: Sat, 4 Apr 2015 00:50:08 +0200 Subject: 'Jumbotron' replaced by 'well' bootstrap component in all templates. --- pyaggr3g470r/templates/about.html | 6 +++--- pyaggr3g470r/templates/admin/create_user.html | 2 +- pyaggr3g470r/templates/admin/user.html | 4 ++-- pyaggr3g470r/templates/article.html | 8 ++++---- pyaggr3g470r/templates/articles.html | 2 +- pyaggr3g470r/templates/edit_feed.html | 2 +- pyaggr3g470r/templates/errors/404.html | 2 +- pyaggr3g470r/templates/errors/500.html | 2 +- pyaggr3g470r/templates/feed.html | 6 +++--- pyaggr3g470r/templates/inactives.html | 2 +- pyaggr3g470r/templates/login.html | 4 ++-- pyaggr3g470r/templates/management.html | 8 ++++---- pyaggr3g470r/templates/profile.html | 2 +- pyaggr3g470r/templates/recover.html | 4 ++-- pyaggr3g470r/templates/signup.html | 2 +- 15 files changed, 28 insertions(+), 28 deletions(-) diff --git a/pyaggr3g470r/templates/about.html b/pyaggr3g470r/templates/about.html index 84315271..08b80fbb 100644 --- a/pyaggr3g470r/templates/about.html +++ b/pyaggr3g470r/templates/about.html @@ -1,7 +1,7 @@ {% extends "layout.html" %} {% block content %}
-
+

{{ _('About') }}

{{ _('pyAggr3g470r is a news aggregator platform and can be shared between several users.') }} @@ -13,13 +13,13 @@ according to the Affero GPL license.') }}

{{ _('Found a bug? Report it here.') }}

-
+

{{ _('Help') }}

{{ _('If you have any problem, contact the administrator.') }}

{{ _('The documentation of the RESTful API is here.') }}

{{ _('You can subscribe to new feeds with a bookmarklet. Drag this link to your browser bookmarks.', bookmarklet='javascript:window.location="https://pyaggr3g470r.herokuapp.com/bookmarklet?url="+encodeURIComponent(document.location)') }}

-
+

{{ _('Donation') }}

{{ _('If you wish and if you like pyAggr3g470r, you can donate via bitcoin 1GVmhR9fbBeEh7rP1qNq76jWArDdDQ3otZ. Thank you!') }}

diff --git a/pyaggr3g470r/templates/admin/create_user.html b/pyaggr3g470r/templates/admin/create_user.html index 833ae601..1d6d6c11 100644 --- a/pyaggr3g470r/templates/admin/create_user.html +++ b/pyaggr3g470r/templates/admin/create_user.html @@ -4,7 +4,7 @@ {% endblock %} {% block content %}
-
+

{{ message | safe }}

{{ form.hidden_tag() }} diff --git a/pyaggr3g470r/templates/admin/user.html b/pyaggr3g470r/templates/admin/user.html index 046093e1..f20d53dd 100644 --- a/pyaggr3g470r/templates/admin/user.html +++ b/pyaggr3g470r/templates/admin/user.html @@ -4,7 +4,7 @@ {% endblock %} {% block content %}
-
+
{{ _('Edit this user') }}

{{ _('Membership') }}

@@ -14,7 +14,7 @@
-
+
{% if user.feeds.all()|count == 0 %}

{{ _('This user is not subscribed to any feed.') }}

{% else %} diff --git a/pyaggr3g470r/templates/article.html b/pyaggr3g470r/templates/article.html index 101cf628..92014599 100644 --- a/pyaggr3g470r/templates/article.html +++ b/pyaggr3g470r/templates/article.html @@ -5,7 +5,7 @@ {% endblock %} {% block content %}
-
+

{{ article.title|safe }}

{{ _('from') }} {{ article.source.title }}

@@ -21,10 +21,10 @@ {% endif %}
{{ article.date | datetime }}
-
+
{{ article.content | safe }}
-
+
{{ _('Next post:') }} {{ next_article.title }} @@ -34,7 +34,7 @@
-
+
diff --git a/pyaggr3g470r/templates/articles.html b/pyaggr3g470r/templates/articles.html index eecb9579..383c28a4 100644 --- a/pyaggr3g470r/templates/articles.html +++ b/pyaggr3g470r/templates/articles.html @@ -1,7 +1,7 @@ {% extends "layout.html" %} {% block content %}
-
+

{{ feed.title|safe }}

diff --git a/pyaggr3g470r/templates/edit_feed.html b/pyaggr3g470r/templates/edit_feed.html index a6b28ded..e9a90960 100644 --- a/pyaggr3g470r/templates/edit_feed.html +++ b/pyaggr3g470r/templates/edit_feed.html @@ -1,7 +1,7 @@ {% extends "layout.html" %} {% block content %}
-
+

{{ action }}

{{ form.hidden_tag() }} diff --git a/pyaggr3g470r/templates/errors/404.html b/pyaggr3g470r/templates/errors/404.html index 49c9ef5a..c64a2be8 100644 --- a/pyaggr3g470r/templates/errors/404.html +++ b/pyaggr3g470r/templates/errors/404.html @@ -4,7 +4,7 @@ {% endblock %} {% block content %}
-
+

Page Not Found

What you were looking for is just not there, go to the home page.

diff --git a/pyaggr3g470r/templates/errors/500.html b/pyaggr3g470r/templates/errors/500.html index 1fa6acc9..417fc0c7 100644 --- a/pyaggr3g470r/templates/errors/500.html +++ b/pyaggr3g470r/templates/errors/500.html @@ -4,7 +4,7 @@ {% endblock %} {% block content %}
-
+

Internal Server Error

Something bad just happened! Go to the home page.

diff --git a/pyaggr3g470r/templates/feed.html b/pyaggr3g470r/templates/feed.html index c7dfecc2..268cbf7d 100644 --- a/pyaggr3g470r/templates/feed.html +++ b/pyaggr3g470r/templates/feed.html @@ -1,13 +1,13 @@ {% extends "layout.html" %} {% block content %}
-
+

{{ feed.title }}

{% if feed.description %}

{{ feed.description }}

{% endif %}
-
+

{{ _('This feed contains') }} {{ feed.articles.all()|count }} {{ _('articles') }}.
{{ _('Address of the feed') }}: {{ feed.link }}
@@ -37,7 +37,7 @@ {% endif %}

-
+
{% if feed.articles.all()|count != 0 %}
{{ tag_cloud|safe }}
{% endif %} diff --git a/pyaggr3g470r/templates/inactives.html b/pyaggr3g470r/templates/inactives.html index e6897281..6a4ff055 100644 --- a/pyaggr3g470r/templates/inactives.html +++ b/pyaggr3g470r/templates/inactives.html @@ -1,7 +1,7 @@ {% extends "layout.html" %} {% block content %}
-
+

{{ _('Days of inactivity') }}:

diff --git a/pyaggr3g470r/templates/login.html b/pyaggr3g470r/templates/login.html index ae0797a5..c37d6937 100644 --- a/pyaggr3g470r/templates/login.html +++ b/pyaggr3g470r/templates/login.html @@ -1,7 +1,7 @@ {% extends "layout.html" %} {% block content %}
-
+

{{ _('Log In') }}

{{ form.hidden_tag() }} @@ -27,4 +27,4 @@   {{ _('Forgot password') }}
-{% endblock %} \ No newline at end of file +{% endblock %} diff --git a/pyaggr3g470r/templates/management.html b/pyaggr3g470r/templates/management.html index 4a2de617..722300af 100644 --- a/pyaggr3g470r/templates/management.html +++ b/pyaggr3g470r/templates/management.html @@ -1,7 +1,7 @@ {% extends "layout.html" %} {% block content %}
-
+

{{ _('Your subscriptions') }}

{{ _('You are subscribed to') }} {{ nb_feeds }} {{ _('feeds') }}. {{ _('Add a') }} {{ _('feed') }}.

{{ nb_articles }} {{ _('articles are stored in the database with') }} {{ nb_unread_articles }} {{ _('unread articles') }}.

@@ -10,7 +10,7 @@ {% endif %} {{ _('Delete articles older than 10 weeks') }}
-
+

{{ _('Your Profile') }}

@@ -25,7 +25,7 @@
-
+

{{ _('OPML import/export') }}

{{ _('Batch import feeds from OPML') }} (*.xml {{ _('or') }} *.opml) @@ -41,7 +41,7 @@
{{ _('Export account to JSON') }}
-
+

{{ _('Export articles') }}

HTML
diff --git a/pyaggr3g470r/templates/profile.html b/pyaggr3g470r/templates/profile.html index f879b054..971c4e64 100644 --- a/pyaggr3g470r/templates/profile.html +++ b/pyaggr3g470r/templates/profile.html @@ -1,7 +1,7 @@ {% extends "layout.html" %} {% block content %}
-
+

Edit your profile

{{ form.hidden_tag() }} diff --git a/pyaggr3g470r/templates/recover.html b/pyaggr3g470r/templates/recover.html index 1098ffef..c1176d55 100644 --- a/pyaggr3g470r/templates/recover.html +++ b/pyaggr3g470r/templates/recover.html @@ -1,7 +1,7 @@ {% extends "layout.html" %} {% block content %}
-
+

{{ _('Recover your account') }}

{% for message in form.email.errors %}
{{ message }}
@@ -15,4 +15,4 @@
-{% endblock %} \ No newline at end of file +{% endblock %} diff --git a/pyaggr3g470r/templates/signup.html b/pyaggr3g470r/templates/signup.html index dd8154e2..3962c42a 100644 --- a/pyaggr3g470r/templates/signup.html +++ b/pyaggr3g470r/templates/signup.html @@ -1,7 +1,7 @@ {% extends "layout.html" %} {% block content %}
-
+
{{ form.hidden_tag() }}
-- cgit