From b35e9773198ef2d8b37c4ca223f08147db47de0b Mon Sep 17 00:00:00 2001 From: François Schmidts Date: Sat, 12 Dec 2015 21:14:28 +0100 Subject: moving the root of source code from / to /src/ --- web/templates/about.html | 28 ------ web/templates/admin/create_user.html | 29 ------ web/templates/admin/dashboard.html | 60 ------------- web/templates/admin/user.html | 19 ---- web/templates/article.html | 45 ---------- web/templates/duplicates.html | 30 ------- web/templates/edit_feed.html | 77 ---------------- web/templates/emails/new_account.html | 9 -- web/templates/emails/new_account.txt | 11 --- web/templates/emails/new_article.html | 1 - web/templates/emails/new_article.txt | 1 - web/templates/errors/404.html | 12 --- web/templates/errors/500.html | 12 --- web/templates/feed.html | 47 ---------- web/templates/feed_list.html | 47 ---------- web/templates/feeds.html | 7 -- web/templates/history.html | 26 ------ web/templates/home.html | 131 --------------------------- web/templates/inactives.html | 26 ------ web/templates/layout.html | 165 ---------------------------------- web/templates/login.html | 30 ------- web/templates/management.html | 31 ------- web/templates/opml.xml | 14 --- web/templates/profile.html | 42 --------- web/templates/recover.html | 18 ---- web/templates/signup.html | 26 ------ 26 files changed, 944 deletions(-) delete mode 100644 web/templates/about.html delete mode 100644 web/templates/admin/create_user.html delete mode 100644 web/templates/admin/dashboard.html delete mode 100644 web/templates/admin/user.html delete mode 100644 web/templates/article.html delete mode 100644 web/templates/duplicates.html delete mode 100644 web/templates/edit_feed.html delete mode 100644 web/templates/emails/new_account.html delete mode 100644 web/templates/emails/new_account.txt delete mode 100644 web/templates/emails/new_article.html delete mode 100644 web/templates/emails/new_article.txt delete mode 100644 web/templates/errors/404.html delete mode 100644 web/templates/errors/500.html delete mode 100644 web/templates/feed.html delete mode 100644 web/templates/feed_list.html delete mode 100644 web/templates/feeds.html delete mode 100644 web/templates/history.html delete mode 100644 web/templates/home.html delete mode 100644 web/templates/inactives.html delete mode 100644 web/templates/layout.html delete mode 100644 web/templates/login.html delete mode 100644 web/templates/management.html delete mode 100644 web/templates/opml.xml delete mode 100644 web/templates/profile.html delete mode 100644 web/templates/recover.html delete mode 100644 web/templates/signup.html (limited to 'web/templates') diff --git a/web/templates/about.html b/web/templates/about.html deleted file mode 100644 index 8d042077..00000000 --- a/web/templates/about.html +++ /dev/null @@ -1,28 +0,0 @@ -{% extends "layout.html" %} -{% block content %} -
-
-

{{ _('About') }}

-

- {{ _('JARR is a news aggregator platform.') }} - {{ _('You can easily install JARR on your server.') }} - {{ _('Alternatively, you can deploy your own copy using this button:') }}

- https://www.herokucdn.com/deploy/button.png

-

{{ _('This software is under AGPLv3 license. You are welcome to copy, modify or - redistribute the source code - 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 the following button to your browser bookmarks.') }}

- {{ _('Subscribe to this feed using JARR', bookmarklet='javascript:window.location="%s?url="+encodeURIComponent(document.location)' % url_for('feed.bookmarklet', _external=True)) }} -
-
-

{{ _('Donation') }}

-

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

-
-
-{% endblock %} diff --git a/web/templates/admin/create_user.html b/web/templates/admin/create_user.html deleted file mode 100644 index 64387dce..00000000 --- a/web/templates/admin/create_user.html +++ /dev/null @@ -1,29 +0,0 @@ -{% extends "layout.html" %} -{% block head%} -{{super()}} -{% endblock %} -{% block content %} -
-
-

{{ message | safe }}

-
- {{ form.hidden_tag() }} - - {{ form.nickname.label }} - {{ form.nickname(class_="form-control") }} {% for error in form.nickname.errors %} {{ error }}
{% endfor %} - - {{ form.email.label }} - {{ form.email(class_="form-control") }} {% for error in form.email.errors %} {{ error }}
{% endfor %} - - {{ form.password.label }} - {{ form.password(class_="form-control") }} {% for error in form.password.errors %} {{ error }}
{% endfor %} - - {{ form.refresh_rate.label }} - {{ form.refresh_rate(class_="form-control") }} {% for error in form.refresh_rate.errors %} {{ error }}
{% endfor %} - -
- {{ form.submit(class_="btn btn-default") }} -
-
-
-{% endblock %} diff --git a/web/templates/admin/dashboard.html b/web/templates/admin/dashboard.html deleted file mode 100644 index 25bd3883..00000000 --- a/web/templates/admin/dashboard.html +++ /dev/null @@ -1,60 +0,0 @@ -{% extends "layout.html" %} -{% block head%} -{{super()}} -{% endblock %} -{% block content %} -
-

{{ _('Registered users') }}

- - - - - - - - - - - - {% for user in users|sort(attribute="last_seen")|reverse %} - - - {% if user.id == current_user.id %} - - {% else %} - - {% endif %} - - - - - {% endfor %} - -
#{{ _('Nickname') }}{{ _('Email') }}{{ _('Last seen') }}{{ _('Actions') }}
{{ loop.index }}{{ user.nickname }} (It's you!){{ user.nickname }}{{ user.email }}{{ user.last_seen }} - - - {% if user.id != current_user.id %} - {% if user.activation_key == "" %} - - {% else %} - - {% endif %} - - {% endif %} -
-{{ _('Add a new user') }} -

{{ _('Send notification messages') }}

-
- {{ form.hidden_tag() }} - - {{ form.subject.label }} - {{ form.subject(class_="form-control") }} {% for error in form.subject.errors %} {{ error }}
{% endfor %} - - {{ form.message.label }} - {{ form.message(class_="form-control", rows=8) }} {% for error in form.message.errors %} {{ error }}
{% endfor %} - -
- {{ form.submit(class_="btn btn-default") }} -
-
-{% endblock %} diff --git a/web/templates/admin/user.html b/web/templates/admin/user.html deleted file mode 100644 index d1e08c0d..00000000 --- a/web/templates/admin/user.html +++ /dev/null @@ -1,19 +0,0 @@ -{% extends "layout.html" %} -{% block head%} -{{super()}} -{% endblock %} -{% block content %} -
-
- {{ _('Edit this user') }} -

{{ _('Membership') }}

-
-
-

{{ _('Member since') }} {{ user.date_created | datetime }}.

-

{{ _('Last seen:') }} {{ user.last_seen | datetime }}.

-
-
-
- {% include "feed_list.html" %} -
-{% endblock %} diff --git a/web/templates/article.html b/web/templates/article.html deleted file mode 100644 index b1f950b4..00000000 --- a/web/templates/article.html +++ /dev/null @@ -1,45 +0,0 @@ -{% extends "layout.html" %} -{% block content %} -
-
-

{{ article.title|safe }}

-

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

- - {% if article.like %} - - {% else %} - - {% endif %} - {% if article.readed %} - - {% else %} - - {% endif %} -
{{ article.date | datetime }}
-
-
- {{ article.content | safe }} -
-
-
-
- {{ _('Next post:') }} {{ next_article.title }} -
-
- {{ _('Previous post:') }} {{ previous_article.title }} -
-
-
-
- - - - - - - - - -
-
-{% endblock %} diff --git a/web/templates/duplicates.html b/web/templates/duplicates.html deleted file mode 100644 index 32fbdf9a..00000000 --- a/web/templates/duplicates.html +++ /dev/null @@ -1,30 +0,0 @@ -{% extends "layout.html" %} -{% block content %} -
-

{{ _('Duplicates in the feed') }} {{ feed.title }}.

-

- - - - - - - - - - {% for pair in duplicates %} - - - - - - {% endfor %} - -
# - {{ _('Delete all in this column') }} - - {{ _('Delete all in this column') }} -
{{ loop.index }} {{ pair[0].title }} ({{ pair[0].retrieved_date }}) {{ pair[1].title }} ({{ pair[1].retrieved_date }})
-
-
-{% endblock %} diff --git a/web/templates/edit_feed.html b/web/templates/edit_feed.html deleted file mode 100644 index 68da0d48..00000000 --- a/web/templates/edit_feed.html +++ /dev/null @@ -1,77 +0,0 @@ -{% extends "layout.html" %} -{% block content %} -
-
-

{{ action }}

-
- {{ form.hidden_tag() }} -
- -
- {{ form.link(class_="form-control", size="100%") }} -
- {% for error in form.link.errors %} {{ error }}
{% endfor %} -
- -
- -
- {{ form.title(class_="form-control", size="100%", placeholder=_('Optional')) }} -
- {% for error in form.title.errors %} {{ error }}
{% endfor %} -
- -
- -
- {{ form.site_link(class_="form-control", size="100%", placeholder=_('Optional')) }} -
- {% for error in form.site_link.errors %} {{ error }}
{% endfor %} -
- -
- -
-
- {{ form.enabled(class_="checkbox", style="margin-left: 0px;") }} -
-
-
-
- -
- -
-
-
- {% if feed %} - {% for filter_ in feed.filters or [] %} -
- - - - - -
- {% endfor %} - {% endif %} -
- -
-
- {{ form.submit(class_="btn btn-default") }} -
-
-
-
-
-{% endblock %} diff --git a/web/templates/emails/new_account.html b/web/templates/emails/new_account.html deleted file mode 100644 index 5b173e7e..00000000 --- a/web/templates/emails/new_account.html +++ /dev/null @@ -1,9 +0,0 @@ -

Hello {{ user.firstname }} {{ user.lastname }},

- -

An account has been created for you. -You can now access the JARR platform. -Your login is your e-mail address and your password is:

- -

{{ password }}

- -

Regards,

\ No newline at end of file diff --git a/web/templates/emails/new_account.txt b/web/templates/emails/new_account.txt deleted file mode 100644 index 6397f502..00000000 --- a/web/templates/emails/new_account.txt +++ /dev/null @@ -1,11 +0,0 @@ -Hello {{ user.firstname }} {{ user.lastname }}, - -An account has been created for you. -You can now access the pyAggr3g470r platform ({{ platform_url }}). -Your login is your e-mail address and your password is: - ---- -{{ password }} ---- - -Regards, \ No newline at end of file diff --git a/web/templates/emails/new_article.html b/web/templates/emails/new_article.html deleted file mode 100644 index 5a6b7c4a..00000000 --- a/web/templates/emails/new_article.html +++ /dev/null @@ -1 +0,0 @@ -{{ article.content | safe }} \ No newline at end of file diff --git a/web/templates/emails/new_article.txt b/web/templates/emails/new_article.txt deleted file mode 100644 index 9b800855..00000000 --- a/web/templates/emails/new_article.txt +++ /dev/null @@ -1 +0,0 @@ -{{ article.content | striptags }} \ No newline at end of file diff --git a/web/templates/errors/404.html b/web/templates/errors/404.html deleted file mode 100644 index c64a2be8..00000000 --- a/web/templates/errors/404.html +++ /dev/null @@ -1,12 +0,0 @@ -{% extends "layout.html" %} -{% block head %} -{{ super() }} -{% endblock %} -{% block content %} -
-
-

Page Not Found

-

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

-
-
-{% endblock %} diff --git a/web/templates/errors/500.html b/web/templates/errors/500.html deleted file mode 100644 index 417fc0c7..00000000 --- a/web/templates/errors/500.html +++ /dev/null @@ -1,12 +0,0 @@ -{% extends "layout.html" %} -{% block head %} -{{ super() }} -{% endblock %} -{% block content %} -
-
-

Internal Server Error

-

Something bad just happened! Go to the home page.

-
-
-{% endblock %} diff --git a/web/templates/feed.html b/web/templates/feed.html deleted file mode 100644 index c421a411..00000000 --- a/web/templates/feed.html +++ /dev/null @@ -1,47 +0,0 @@ -{% 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 }}
- {% if feed.site_link != "" %} - {{ _('Address of the site') }}: {{ feed.site_link }}
- {% endif %} - -
- - {% if feed.last_retrieved %} - {{ _("Last download:") }} {{ feed.last_retrieved | datetime }}
- {% endif %} - - {% if feed.error_count >= conf.DEFAULT_MAX_ERROR %} - {{ _("That feed has encountered too much consecutive errors and won't be retrieved anymore.") }}
- {{ _("You can click here 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.") }}
- {% endif %} - - {% if feed.last_error %} - {{ _("Here's the last error encountered while retrieving this feed:") }} 

{{ feed.last_error }}

- {% 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 }}. - {% endif %} -

-
-
- {% if feed.articles.all()|count != 0 %} -
{{ tag_cloud|safe }}
- {% endif %} -
-
-{% endblock %} diff --git a/web/templates/feed_list.html b/web/templates/feed_list.html deleted file mode 100644 index c5cadab0..00000000 --- a/web/templates/feed_list.html +++ /dev/null @@ -1,47 +0,0 @@ -{% if feeds.all()| count == 0 %} -

{{_("No feed")}}

-{% else %} -
- - - - - - - - - - - - - {% for feed in feeds|sort(attribute="title") %} - - - - - - - - - {% endfor %} - -
#{{ _('Status') }}{{ _('Title') }}{{ _('Site') }}{{ _('Articles') }}{{ _('Actions') }}
{{ loop.index }} - {% if feed.enabled %} - - {% else %} - - {% endif %} - {% if feed.error_count >= conf.DEFAULT_MAX_ERROR %} - - {% endif %} - - {% if feed.icon_url %}{% endif %} - {{ feed.title }} - {{ feed.site_link }}( {{ unread_article_count.get(feed.id, 0) }} ) {{ article_count.get(feed.id, 0) }} - - - - -
-
-{% endif %} diff --git a/web/templates/feeds.html b/web/templates/feeds.html deleted file mode 100644 index 9ba16359..00000000 --- a/web/templates/feeds.html +++ /dev/null @@ -1,7 +0,0 @@ -{% extends "layout.html" %} -{% block content %} -
-

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

- {% include "feed_list.html" %} -
-{% endblock %} diff --git a/web/templates/history.html b/web/templates/history.html deleted file mode 100644 index 6be54d71..00000000 --- a/web/templates/history.html +++ /dev/null @@ -1,26 +0,0 @@ -{% extends "layout.html" %} -{% block content %} -
-

{{ _('History') }}

- {% if month != None %} -

{{ year }}

-

{{ month | month_name }}

- {% elif year != None %} -

 {{ _('all years') }}

-

{{ year }}

- {% endif %} - -
-{% endblock %} diff --git a/web/templates/home.html b/web/templates/home.html deleted file mode 100644 index 86d96e94..00000000 --- a/web/templates/home.html +++ /dev/null @@ -1,131 +0,0 @@ -{% extends "layout.html" %} -{% block content %} -{% if feeds|count == 0 %} -
-

{{ _("You don't have any feeds.") }}

-

{{ _('Add some') }}, {{ _('or') }} {{ _('upload an OPML file.') }}

-
-{% else %} -
-
- - - {% with messages = get_flashed_messages(with_categories=true) %} - {% if messages %} -
- {% block messages %} - {{ super() }} - {% endblock %} -
- {% endif %} - {% endwith %} -
- - {% if articles | count != 0%} -
- - - - - - - - - - - {% for article in articles %} - - - - - - - {% endfor %} - -
{{ _('Feed') }}{{ _('Article') }}{{ _('Date') }}
- - {% if article.like %} - - {% else %} - - {% endif %} - {% if article.readed %} - - {% else %} - - {% if filter_ == 'all' %}{% endif %} - {% endif %} - - - {% if article.source.icon_url %} - - {% else %} - - {% endif %} - - {{ article.title|safe }} - {{ article.date|datetime }}
-
- {% endif %} -
-
-
- -{% endif %} -{% endblock %} diff --git a/web/templates/inactives.html b/web/templates/inactives.html deleted file mode 100644 index eb546eca..00000000 --- a/web/templates/inactives.html +++ /dev/null @@ -1,26 +0,0 @@ -{% extends "layout.html" %} -{% block content %} -
-
-
-

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

- -
-
- {% if inactives != [] %} - - {% else %} -

{{ _('No inactive feeds.') }}

- {% endif %} -

-
-{% endblock %} diff --git a/web/templates/layout.html b/web/templates/layout.html deleted file mode 100644 index 3a10f2d6..00000000 --- a/web/templates/layout.html +++ /dev/null @@ -1,165 +0,0 @@ - - - - {% block head %} - - - - - JARR{% if head_titles %} - {{ ' - '.join(head_titles) }}{% endif %} - - - - - - - {% endblock %} - - - -
- -
- {% block messages %} - {% with messages = get_flashed_messages(with_categories=true) %} - {% if messages %} - {% for category, message in messages %} -
- - {{ message }} -
- {% endfor %} - {% endif %} - {% endwith %} - {% endblock %} -
- - {% block content %}{% endblock %} - - - - - - - - - - diff --git a/web/templates/login.html b/web/templates/login.html deleted file mode 100644 index c37d6937..00000000 --- a/web/templates/login.html +++ /dev/null @@ -1,30 +0,0 @@ -{% extends "layout.html" %} -{% block content %} -
-
-

{{ _('Log In') }}

-
- {{ form.hidden_tag() }} - -
- {{ form.email(class_="form-control", placeholder=_('Your email')) }} -
- {% for message in form.email.errors %} - - {% endfor %} - -
- {{ form.password(class_="form-control", placeholder=_('Your Password')) }} -
- {% for message in form.password.errors %} - - {% endfor %} - - {{ form.submit(class_="btn btn-default") }} -
-
- {{ _('Sign up') }} -   - {{ _('Forgot password') }} -
-{% endblock %} diff --git a/web/templates/management.html b/web/templates/management.html deleted file mode 100644 index 72259551..00000000 --- a/web/templates/management.html +++ /dev/null @@ -1,31 +0,0 @@ -{% 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') }}.

- {{ _('Delete articles older than 10 weeks') }} -
-
-

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

-
- {{ _('Batch import feeds from OPML') }} (*.xml {{ _('or') }} *.opml) - -
-
- {{ _('Export feeds to OPML') }} -

{{ _('Data liberation') }}

-
- {{ _('Import account') }} (*.json) - -
-
- {{ _('Export account to JSON') }} -
-
-

{{ _('Export articles') }}

- HTML -
-
-{% endblock %} diff --git a/web/templates/opml.xml b/web/templates/opml.xml deleted file mode 100644 index 96fe66f5..00000000 --- a/web/templates/opml.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - Feeds of {{ user.nickname }} - {{ now | datetime }} - {{ now | datetime }} - {{ user.nickname }} - {{ user.email }} - - - {% for feed in user.feeds %} - {% endfor %} - \ No newline at end of file diff --git a/web/templates/profile.html b/web/templates/profile.html deleted file mode 100644 index acd593b2..00000000 --- a/web/templates/profile.html +++ /dev/null @@ -1,42 +0,0 @@ -{% extends "layout.html" %} -{% block content %} -
-
-

{{ _('Your Profile') }}

-
-
-

{{ _('Member since') }} {{ user.date_created | datetime }}.

-

{{ _('Last seen:') }} {{ user.last_seen | datetime }}.

-
-
-
-
- {{ _('Delete your account') }} -
-
-
-
-

Edit your profile

-
- {{ form.hidden_tag() }} - - {{ form.nickname.label }} - {{ form.nickname(class_="form-control") }} {% for error in form.nickname.errors %} {{ error }}
{% endfor %} - - {{ form.email.label }} - {{ form.email(class_="form-control") }} {% for error in form.email.errors %} {{ error }}
{% endfor %} - - {{ form.password.label }} - {{ form.password(class_="form-control") }} {% for error in form.password.errors %} {{ error }}
{% endfor %} - - {{ form.password_conf.label }} - {{ form.password_conf(class_="form-control") }} {% for error in form.password_conf.errors %} {{ error }}
{% endfor %} - - {{ form.refresh_rate.label }} - {{ form.refresh_rate(class_="form-control") }} {% for error in form.refresh_rate.errors %} {{ error }}
{% endfor %} -
- {{ form.submit(class_="btn") }} -
-
-
-{% endblock %} diff --git a/web/templates/recover.html b/web/templates/recover.html deleted file mode 100644 index c1176d55..00000000 --- a/web/templates/recover.html +++ /dev/null @@ -1,18 +0,0 @@ -{% extends "layout.html" %} -{% block content %} -
-
-

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

- {% for message in form.email.errors %} -
{{ message }}
- {% endfor %} -
- {{ form.hidden_tag() }} -
- {{ form.email(class_="form-control", placeholder=_('Your email')) }} -
- {{ form.submit(class_="btn btn-default") }} -
-
-
-{% endblock %} diff --git a/web/templates/signup.html b/web/templates/signup.html deleted file mode 100644 index 3962c42a..00000000 --- a/web/templates/signup.html +++ /dev/null @@ -1,26 +0,0 @@ -{% extends "layout.html" %} -{% block content %} -
-
-
- {{ form.hidden_tag() }} -
- {{ form.nickname.label }} - {{ form.nickname(class_="form-control") }} {% for error in form.nickname.errors %} {{ error }}
{% endfor %} -

{{ _('Letters, numbers, dots and underscores only.') }}

-
- {{ form.email.label }} - {{ form.email(class_="form-control") }} {% for error in form.email.errors %} {{ error }}
{% endfor %} -
- {{ form.password.label }} - {{ form.password(class_="form-control") }} {% for error in form.password.errors %} {{ error }}
{% endfor %} -

{{ _('Minimum 6 characters.') }}

-
- {{ form.recaptcha.label }} - {{ form.recaptcha }} {% for error in form.recaptcha.errors %} {{ error }}
 {% endfor %} -
- {{ form.submit(class_="btn btn-default") }} -
-
-
-{% endblock %} -- cgit