diff --git a/colab/accounts/templates/accounts/user_create_form.html b/colab/accounts/templates/accounts/user_create_form.html index 2b7bb38..6ec0bbc 100644 --- a/colab/accounts/templates/accounts/user_create_form.html +++ b/colab/accounts/templates/accounts/user_create_form.html @@ -17,7 +17,7 @@

-
+ {% csrf_token %}
diff --git a/colab/accounts/urls.py b/colab/accounts/urls.py index b1949e8..5da9ee2 100644 --- a/colab/accounts/urls.py +++ b/colab/accounts/urls.py @@ -9,32 +9,15 @@ from django.contrib.auth import views as auth_views from colab.settings import BROWSERID_ENABLED -urlpatterns = patterns('', - url(r'^register/$', 'colab.accounts.views.signup', name='signup'), - -#FIXME Configure for XMPP -# url(r'^change-password/$', -# ChangeXMPPPasswordView.as_view(), name='change_password'), - - url(r'^(?P[\w@+.-]+)/?$', - UserProfileDetailView.as_view(), name='user_profile'), - - url(r'^(?P[\w@+.-]+)/edit/?$', - UserProfileUpdateView.as_view(), name='user_profile_update'), - - url(r'^(?P[\w@+.-]+)/subscriptions/?$', - ManageUserSubscriptionsView.as_view(), name='user_list_subscriptions'), -) if not BROWSERID_ENABLED: - urlpatterns += patterns('', + urlpatterns = patterns('', url(r'^login/?$', 'django.contrib.auth.views.login', name='login'), url(r'^logout/?$', 'django.contrib.auth.views.logout', name='logout'), url(r'^password-reset-done/?$', 'colab.accounts.views.password_reset_done_custom', name="password_reset_done"), - url(r'^password-reset-complete/$', 'colab.accounts.views.password_reset_complete_custom', name="password_reset_complete"), @@ -55,6 +38,23 @@ if not BROWSERID_ENABLED: 'colab.accounts.views.password_changed', name='password_change_done'), ) else: - urlpatterns += patterns('', - url(r'^login/?$', LoginView.as_view(), name='login'), + urlpatterns = patterns('', + url(r'^login/?$', LoginView.as_view(), name='colab.login'), ) + +urlpatterns += patterns('', + url(r'^register/?$', 'colab.accounts.views.signup', name='signup'), + +#FIXME Configure for XMPP +# url(r'^change-password/$', +# ChangeXMPPPasswordView.as_view(), name='change_password'), + + url(r'^(?P[\w@+.-]+)/?$', + UserProfileDetailView.as_view(), name='user_profile'), + + url(r'^(?P[\w@+.-]+)/edit/?$', + UserProfileUpdateView.as_view(), name='user_profile_update'), + + url(r'^(?P[\w@+.-]+)/subscriptions/?$', + ManageUserSubscriptionsView.as_view(), name='user_list_subscriptions'), +) diff --git a/colab/accounts/views.py b/colab/accounts/views.py index 72c51f5..774e047 100644 --- a/colab/accounts/views.py +++ b/colab/accounts/views.py @@ -146,7 +146,10 @@ def signup(request): # If the user is authenticated in Persona, but not in the Colab then he # will be redirected to the register form. if request.method == 'GET': - user_form = UserCreationForm() + if BROWSERID_ENABLED: + user_form = UserCreationForm() + else: + user_form = UserCreationFormNoBrowserId() lists_form = ListsForm() return render(request, 'accounts/user_create_form.html', @@ -187,6 +190,7 @@ def signup(request): messages.success(request, _('Your profile has been created!')) + return redirect('user_profile', username=user.username) diff --git a/colab/templates/base.html b/colab/templates/base.html index fe1c98f..4bb64c9 100644 --- a/colab/templates/base.html +++ b/colab/templates/base.html @@ -55,7 +55,9 @@ - {% browserid_info %} + {% if BROWSERID_ENABLED %} + {% browserid_info %} + {% endif %} {% block ribbon %} {% if ribbon %} @@ -110,11 +112,21 @@ Acesso
    {% trans 'Login' as login_text %} -
  • {% browserid_login text=login_text %}
    • + {% if BROWSERID_ENABLED %} +
  • {% browserid_login text=login_text %}
    • + {% else %} +
  • {% trans "Register" %}
    • +
  • {% trans "Login" %}
    • + {% endif %}
{% trans 'Login' as login_text %} - + {% if BROWSERID_ENABLED %} + + {% else %} + + + {% endif %} {% else %}