From 76d7b6deecd58609af2504570ac9fe4e07677fec Mon Sep 17 00:00:00 2001 From: Cédric Bonhomme Date: Tue, 24 Jun 2014 13:32:05 +0200 Subject: Removed trailing slashes from the routes. --- pyaggr3g470r/templates/about.html | 2 +- pyaggr3g470r/templates/admin/dashboard.html | 16 +++---- pyaggr3g470r/templates/admin/user.html | 2 +- pyaggr3g470r/templates/home.html | 2 +- pyaggr3g470r/templates/layout.html | 24 +++++----- pyaggr3g470r/templates/login.html | 2 +- pyaggr3g470r/templates/management.html | 12 ++--- pyaggr3g470r/views.py | 70 ++++++++++++++--------------- 8 files changed, 65 insertions(+), 65 deletions(-) (limited to 'pyaggr3g470r') diff --git a/pyaggr3g470r/templates/about.html b/pyaggr3g470r/templates/about.html index d164d4bb..3c4304e5 100644 --- a/pyaggr3g470r/templates/about.html +++ b/pyaggr3g470r/templates/about.html @@ -4,7 +4,7 @@

{{ _('pyAggr3g470r is a simple news aggregator you can use everywhere.') }}

{{ _('This software is under AGPLv3 license. You are welcome to copy, modify or - redistribute the source code + redistribute the source code according to the Affero GPL license.') }}

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

diff --git a/pyaggr3g470r/templates/admin/dashboard.html b/pyaggr3g470r/templates/admin/dashboard.html index 3e5b019e..6253ca62 100644 --- a/pyaggr3g470r/templates/admin/dashboard.html +++ b/pyaggr3g470r/templates/admin/dashboard.html @@ -20,29 +20,29 @@ {{ loop.index }} {% if user.id == current_user.id %} - {{ user.nickname }} (It's you!) + {{ user.nickname }} (It's you!) {% else %} - {{ user.nickname }} + {{ user.nickname }} {% endif %} {{ user.email }} {{ user.last_seen }} - - + + {% if user.id != current_user.id %} {% if user.activation_key == "" %} - + {% else %} - + {% endif %} - + {% endif %} {% endfor %} -{{ _('Add a new user') }} +{{ _('Add a new user') }}

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

{{ form.hidden_tag() }} diff --git a/pyaggr3g470r/templates/admin/user.html b/pyaggr3g470r/templates/admin/user.html index d896e85f..8f911b92 100644 --- a/pyaggr3g470r/templates/admin/user.html +++ b/pyaggr3g470r/templates/admin/user.html @@ -5,7 +5,7 @@ {% block content %}
- {{ _('Edit this user') }} + {{ _('Edit this user') }}

{{ _('Membership') }}

diff --git a/pyaggr3g470r/templates/home.html b/pyaggr3g470r/templates/home.html index a68b71a4..81aeea9c 100644 --- a/pyaggr3g470r/templates/home.html +++ b/pyaggr3g470r/templates/home.html @@ -8,7 +8,7 @@ {% if feeds|count == 0 %}

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

-

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

+

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

{% else %} diff --git a/pyaggr3g470r/templates/login.html b/pyaggr3g470r/templates/login.html index e58b5d83..8bfbffa5 100644 --- a/pyaggr3g470r/templates/login.html +++ b/pyaggr3g470r/templates/login.html @@ -26,7 +26,7 @@ {{ form.submit(class_="btn") }}
- {{ _('Sign up') }} + {{ _('Sign up') }}   {{ _('Forgot password') }}
diff --git a/pyaggr3g470r/templates/management.html b/pyaggr3g470r/templates/management.html index 6264f307..6755281d 100644 --- a/pyaggr3g470r/templates/management.html +++ b/pyaggr3g470r/templates/management.html @@ -3,17 +3,17 @@

{{ _('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') }}.

+

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

+

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

{% if not_on_heroku %} - {{ _('Index database') }} + {{ _('Index database') }} {% endif %}

{{ _('Your Profile') }}

-

{{ _('Update your') }} {{ _('profile') }}.

+

{{ _('Update your') }} {{ _('profile') }}.

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

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

@@ -23,7 +23,7 @@
- {{ _('Delete your account') }} + {{ _('Delete your account') }}
@@ -34,7 +34,7 @@
- {{ _('Export feeds to OPML') }} + {{ _('Export feeds to OPML') }}

{{ _('Data liberation') }}

{{ _('Import account') }} (*.json) diff --git a/pyaggr3g470r/views.py b/pyaggr3g470r/views.py index 1ff8952a..9525ac9b 100644 --- a/pyaggr3g470r/views.py +++ b/pyaggr3g470r/views.py @@ -136,7 +136,7 @@ def get_timezone(): # # Views. # -@app.route('/login/', methods=['GET', 'POST']) +@app.route('/login', methods=['GET', 'POST']) def login(): """ Log in view. @@ -178,7 +178,7 @@ def logout(): flash(gettext("Logged out successfully."), 'success') return redirect(url_for('login')) -@app.route('/signup/', methods=['GET', 'POST']) +@app.route('/signup', methods=['GET', 'POST']) def signup(): """ Signup page. @@ -244,7 +244,7 @@ def home(): unread=dict(unread), articles=articles.all()) -@app.route('/article/redirect//', methods=['GET']) +@app.route('/article/redirect/', methods=['GET']) @login_required def redirect_to_article(article_id): article = Article.query.filter(Article.id == article_id, @@ -256,8 +256,8 @@ def redirect_to_article(article_id): return redirect(article.link) -@app.route('/fetch/', methods=['GET']) -@app.route('/fetch//', methods=['GET']) +@app.route('/fetch', methods=['GET']) +@app.route('/fetch/', methods=['GET']) @login_required def fetch(feed_id=None): """ @@ -268,14 +268,14 @@ def fetch(feed_id=None): flash(gettext("Downloading articles..."), 'success') return redirect(redirect_url()) -@app.route('/about/', methods=['GET']) +@app.route('/about', methods=['GET']) def about(): """ 'About' page. """ return render_template('about.html') -@app.route('/feeds/', methods=['GET']) +@app.route('/feeds', methods=['GET']) @login_required def feeds(): """ @@ -315,7 +315,7 @@ def feed(feed_id=None): first_post_date=first_article, end_post_date=last_article , nb_articles=nb_articles, \ average=average, delta=delta, elapsed=elapsed) -@app.route('/article//', methods=['GET']) +@app.route('/article/', methods=['GET']) @login_required def article(article_id=None): """ @@ -341,9 +341,9 @@ def article(article_id=None): return redirect(redirect_url()) -@app.route('/mark_as//', methods=['GET']) -@app.route('/mark_as//feed//', methods=['GET']) -@app.route('/mark_as//article//', methods=['GET']) +@app.route('/mark_as/', methods=['GET']) +@app.route('/mark_as//feed/', methods=['GET']) +@app.route('/mark_as//article/', methods=['GET']) @login_required @feed_access_required def mark_as(new_value='read', feed_id=None, article_id=None): @@ -367,7 +367,7 @@ def mark_as(new_value='read', feed_id=None, article_id=None): return redirect(redirect_url()) return redirect(url_for('home')) -@app.route('/like//', methods=['GET']) +@app.route('/like/', methods=['GET']) @login_required def like(article_id=None): """ @@ -380,7 +380,7 @@ def like(article_id=None): db.session.commit() return redirect(redirect_url()) -@app.route('/delete//', methods=['GET']) +@app.route('/delete/', methods=['GET']) @login_required def delete(article_id=None): """ @@ -400,7 +400,7 @@ def delete(article_id=None): flash(gettext('This article do not exist.'), 'danger') return redirect(url_for('home')) -@app.route('/articles//', methods=['GET']) +@app.route('/articles/', methods=['GET']) @app.route('/articles//', methods=['GET']) @login_required @feed_access_required @@ -422,7 +422,7 @@ def articles(feed_id=None, nb_articles=-1): Article.feed_id == feed.id).order_by(desc("Article.date")).limit(nb_articles) return render_template('articles.html', feed=new_feed, nb_articles=nb_articles) -@app.route('/favorites/', methods=['GET']) +@app.route('/favorites', methods=['GET']) @login_required def favorites(): """ @@ -441,8 +441,8 @@ def favorites(): nb_favorites += length return render_template('favorites.html', feeds=result, nb_favorites=nb_favorites) -@app.route('/unread//', methods=['GET']) -@app.route('/unread/', methods=['GET']) +@app.route('/unread/', methods=['GET']) +@app.route('/unread', methods=['GET']) @login_required def unread(feed_id=None): """ @@ -464,7 +464,7 @@ def unread(feed_id=None): nb_unread += length return render_template('unread.html', feeds=result, nb_unread=nb_unread) -@app.route('/inactives/', methods=['GET']) +@app.route('/inactives', methods=['GET']) @login_required def inactives(): """ @@ -484,7 +484,7 @@ def inactives(): inactives.append((feed, elapsed)) return render_template('inactives.html', inactives=inactives, nb_days=nb_days) -@app.route('/index_database/', methods=['GET']) +@app.route('/index_database', methods=['GET']) @login_required def index_database(): """ @@ -502,7 +502,7 @@ def index_database(): flash(gettext('Option not available on Heroku.'), 'success') return redirect(url_for('home')) -@app.route('/export/', methods=['GET']) +@app.route('/export', methods=['GET']) @login_required def export_articles(): """ @@ -534,7 +534,7 @@ def export_articles(): return redirect(redirect_url()) return response -@app.route('/export_opml/', methods=['GET']) +@app.route('/export_opml', methods=['GET']) @login_required def export_opml(): """ @@ -546,7 +546,7 @@ def export_opml(): response.headers['Content-Disposition'] = 'attachment; filename=feeds.opml' return response -@app.route('/search/', methods=['GET']) +@app.route('/search', methods=['GET']) @login_required def search(): """ @@ -581,7 +581,7 @@ def search(): break return render_template('search.html', feeds=result, nb_articles=nb_articles, query=query) -@app.route('/management/', methods=['GET', 'POST']) +@app.route('/management', methods=['GET', 'POST']) @login_required def management(): """ @@ -623,13 +623,13 @@ def management(): nb_feeds=nb_feeds, nb_articles=nb_articles, nb_unread_articles=nb_unread_articles, \ not_on_heroku = not conf.ON_HEROKU) -@app.route('/history/', methods=['GET']) +@app.route('/history', methods=['GET']) @login_required def history(): user = User.query.filter(User.id == g.user.id).first() return render_template('history.html') -@app.route('/create_feed/', methods=['GET', 'POST']) +@app.route('/create_feed', methods=['GET', 'POST']) @app.route('/edit_feed/', methods=['GET', 'POST']) @login_required @feed_access_required @@ -692,7 +692,7 @@ def delete_feed(feed_id=None): flash(gettext('Feed') + ' ' + feed.title + ' ' + gettext('successfully deleted.'), 'success') return redirect(redirect_url()) -@app.route('/profile/', methods=['GET', 'POST']) +@app.route('/profile', methods=['GET', 'POST']) @login_required def profile(): """ @@ -716,7 +716,7 @@ def profile(): form = ProfileForm(obj=user) return render_template('profile.html', user=user, form=form) -@app.route('/delete_account/', methods=['GET']) +@app.route('/delete_account', methods=['GET']) @login_required def delete_account(): """ @@ -780,7 +780,7 @@ def recover(): # # Views dedicated to administration tasks. # -@app.route('/admin/dashboard/', methods=['GET', 'POST']) +@app.route('/admin/dashboard', methods=['GET', 'POST']) @login_required @admin_permission.require(http_exception=403) def dashboard(): @@ -799,8 +799,8 @@ def dashboard(): users = User.query.all() return render_template('admin/dashboard.html', users=users, current_user=g.user, form=form) -@app.route('/admin/create_user/', methods=['GET', 'POST']) -@app.route('/admin/edit_user//', methods=['GET', 'POST']) +@app.route('/admin/create_user', methods=['GET', 'POST']) +@app.route('/admin/edit_user/', methods=['GET', 'POST']) @login_required @admin_permission.require(http_exception=403) def create_user(user_id=None): @@ -830,7 +830,7 @@ def create_user(user_id=None): db.session.add(user) db.session.commit() flash(gettext('User') + ' ' + user.nickname + ' ' + gettext('successfully created.'), 'success') - return redirect("/admin/edit_user/"+str(user.id)+"/") + return redirect("/admin/edit_user/"+str(user.id)) else: return redirect(url_for('create_user')) @@ -844,7 +844,7 @@ def create_user(user_id=None): message = gettext('Add a new user') return render_template('/admin/create_user.html', form=form, message=message) -@app.route('/admin/user//', methods=['GET']) +@app.route('/admin/user/', methods=['GET']) @login_required @admin_permission.require(http_exception=403) def user(user_id=None): @@ -858,7 +858,7 @@ def user(user_id=None): flash(gettext('This user does not exist.'), 'danger') return redirect(redirect_url()) -@app.route('/admin/delete_user//', methods=['GET']) +@app.route('/admin/delete_user/', methods=['GET']) @login_required @admin_permission.require(http_exception=403) def delete_user(user_id=None): @@ -874,8 +874,8 @@ def delete_user(user_id=None): flash(gettext('This user does not exist.'), 'danger') return redirect(redirect_url()) -@app.route('/admin/enable_user//', methods=['GET']) -@app.route('/admin/disable_user//', methods=['GET']) +@app.route('/admin/enable_user/', methods=['GET']) +@app.route('/admin/disable_user/', methods=['GET']) @login_required @admin_permission.require() def disable_user(user_id=None): -- cgit