From 1e371849ec6f2994867a90b30440def528cab81c Mon Sep 17 00:00:00 2001 From: Jannis Leidel Date: Mon, 15 Sep 2014 11:40:42 +0200 Subject: [PATCH] Use newer cab and the proper auth URL patterns. --- djangosnippets/templates/base.html | 6 +++--- djangosnippets/templates/comments/form.html | 4 ++-- .../templates/registration/activation_complete.html | 2 +- djangosnippets/templates/registration/logged_out.html | 2 +- djangosnippets/templates/registration/login.html | 2 +- .../templates/registration/password_reset_complete.html | 2 +- requirements-common.txt | 2 +- 7 files changed, 10 insertions(+), 10 deletions(-) diff --git a/djangosnippets/templates/base.html b/djangosnippets/templates/base.html index e917d1ab..609f850d 100644 --- a/djangosnippets/templates/base.html +++ b/djangosnippets/templates/base.html @@ -12,11 +12,11 @@

+ {% url 'auth_logout' as logout_url %} {% if user.is_authenticated %} - Logged in as {{ user.username }} (Log out) + Logged in as {{ user.username }} (Log out) {% else %} - {% url 'logout' as logout_url %} - Log in or register + Log in or register {% endif %}

diff --git a/djangosnippets/templates/comments/form.html b/djangosnippets/templates/comments/form.html index 0aab477b..929012f7 100644 --- a/djangosnippets/templates/comments/form.html +++ b/djangosnippets/templates/comments/form.html @@ -4,7 +4,7 @@ {{ form.non_field_errors }} -

{% trans "Username:" %} {{ user.username }} ({% trans "Log out" %})

+

{% trans "Username:" %} {{ user.username }} ({% trans "Log out" %})

@@ -39,7 +39,7 @@
{% else %} -
{% csrf_token %} +{% csrf_token %}
diff --git a/djangosnippets/templates/registration/activation_complete.html b/djangosnippets/templates/registration/activation_complete.html index 8990c495..5bfcfd46 100644 --- a/djangosnippets/templates/registration/activation_complete.html +++ b/djangosnippets/templates/registration/activation_complete.html @@ -9,5 +9,5 @@ Welcome to django snippets! Now you can start sharing snippets, bookmark your favorites, and comment on other users' snippets.

-

Log in »

+

Log in »

{% endblock %} diff --git a/djangosnippets/templates/registration/logged_out.html b/djangosnippets/templates/registration/logged_out.html index 520fed62..cd3daad1 100644 --- a/djangosnippets/templates/registration/logged_out.html +++ b/djangosnippets/templates/registration/logged_out.html @@ -5,7 +5,7 @@ {% block content_header %}Logged out{% endblock %} {% block content %} -

You're logged out. Log in again

+

You're logged out. Log in again

{% endblock %} {% block sidebar %}{% endblock %} diff --git a/djangosnippets/templates/registration/login.html b/djangosnippets/templates/registration/login.html index 59c7fbb4..1faf320d 100644 --- a/djangosnippets/templates/registration/login.html +++ b/djangosnippets/templates/registration/login.html @@ -5,7 +5,7 @@ {% block content_header %}Log in / Sign up{% endblock %} {% block content %} - {% csrf_token %} + {% csrf_token %} {{ form.non_field_errors }} {% if next %}

The page you're trying to access is only available to readers with free {{ site_name }} accounts. Just sign up and we'll send you on your way.

{% endif %}

Already have an account? Welcome back! Please use your username and password to sign in.

diff --git a/djangosnippets/templates/registration/password_reset_complete.html b/djangosnippets/templates/registration/password_reset_complete.html index 381feb7a..ad515007 100644 --- a/djangosnippets/templates/registration/password_reset_complete.html +++ b/djangosnippets/templates/registration/password_reset_complete.html @@ -6,5 +6,5 @@ {% block content %}

Your password has been reset. You can reset it as often as you forget it.

-

Log in »

+

Log in »

{% endblock %} diff --git a/requirements-common.txt b/requirements-common.txt index 1dfa8987..5fe7be04 100644 --- a/requirements-common.txt +++ b/requirements-common.txt @@ -1,4 +1,4 @@ -django-cab==0.3.3 +django-cab==0.3.4 django-generic-aggregation==0.3.2 django-haystack==2.1.0 django-pagination==1.0.7