From 90630129f4eef1e1d96bf40cceb288d0eae1741e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89lie=20Bouttier?= <elie@bouttier.eu>
Date: Sat, 23 Jul 2016 13:27:15 +0200
Subject: [PATCH] small urls modifications

---
 accounts/tests.py            | 2 +-
 accounts/urls.py             | 4 ++--
 ponyconf/settings.py         | 4 +++-
 ponyconf/templates/base.html | 2 +-
 ponyconf/urls.py             | 3 +--
 5 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/accounts/tests.py b/accounts/tests.py
index 25b438d..676be1e 100644
--- a/accounts/tests.py
+++ b/accounts/tests.py
@@ -45,7 +45,7 @@ class AccountTests(TestCase):
         self.client.logout()
 
     def test_participant_views(self):
-        self.assertEqual(self.client.get(reverse('register')).status_code, 200)
+        self.assertEqual(self.client.get(reverse('registration_register')).status_code, 200)
         self.client.login(username='b', password='b')
         self.assertEqual(self.client.get(reverse('list-participant')).status_code, 403)
         self.assertEqual(self.client.post(reverse('edit-participant', kwargs={'username': 'a'}),
diff --git a/accounts/urls.py b/accounts/urls.py
index 1007165..058ae5e 100644
--- a/accounts/urls.py
+++ b/accounts/urls.py
@@ -2,16 +2,16 @@ from django.conf import settings
 from django.conf.urls import include, url
 from django.contrib.auth import views as auth_views
 
-from registration.backends.default import views as registration_views
+#from registration.backends.default import views as registration_views
 
 from . import views
 
 urlpatterns = [
-    url(r'^register/$', registration_views.RegistrationView.as_view(), name='register'),
     url(r'^profile/$', views.profile, name='profile'),
     url(r'^login/$', auth_views.login, {'extra_context': {'buttons': [views.RESET_PASSWORD_BUTTON]}}, name='login'),
     url(r'^logout/$', auth_views.logout, {'next_page': settings.LOGOUT_REDIRECT_URL}, name='logout'),
     url(r'^admin/participants/$', views.participation_list, name='list-participant'),
     url(r'^admin/participant/(?P<username>[\w.@+-]+)$', views.edit, name='edit-participant'),
     url(r'', include('django.contrib.auth.urls')),
+    url(r'', include('registration.backends.default.urls')),
 ]
diff --git a/ponyconf/settings.py b/ponyconf/settings.py
index 2b7c542..a0aa7d0 100644
--- a/ponyconf/settings.py
+++ b/ponyconf/settings.py
@@ -197,4 +197,6 @@ SELECT2_CSS = 'select2/dist/css/select2.min.css'
 AUTHENTICATION_BACKENDS = ['yeouia.backends.YummyEmailOrUsernameInsensitiveAuth']
 LOGOUT_REDIRECT_URL = 'home'
 
-ACCOUNT_ACTIVATION_DAYS = 7  # django-registration
+# django-registration
+ACCOUNT_ACTIVATION_DAYS = 7
+INCLUDE_REGISTER_URL = True
diff --git a/ponyconf/templates/base.html b/ponyconf/templates/base.html
index 30888da..2e4dd45 100644
--- a/ponyconf/templates/base.html
+++ b/ponyconf/templates/base.html
@@ -71,7 +71,7 @@
             <li{% block profiletab %}{% endblock %}><a href="{% url 'profile' %}" data-toggle="tooltip" data-placement="bottom" title="Profile"><span class="glyphicon glyphicon-user"></span>&nbsp;{{ request.user.username }}</a></li>
             <li><a href="{% url 'logout' %}" data-toggle="tooltip" data-placement="bottom" title="Logout"><span class="glyphicon glyphicon-log-out"></span></a></li>
             {% else %}
-            <li{% block registrationtab %}{% endblock %}><a href="{% url 'register' %}"><span class="glyphicon glyphicon-edit"></span>&nbsp;{% trans "Register" %}</a></li>
+            <li{% block registrationtab %}{% endblock %}><a href="{% url 'registration_register' %}"><span class="glyphicon glyphicon-edit"></span>&nbsp;{% trans "Register" %}</a></li>
             <li{% block logintab %}{% endblock %}><a href="{% url 'login' %}?next={{ request.path }}"><span class="glyphicon glyphicon-log-in"></span>&nbsp;{% trans "Login" %}</a></li>
             {% endif %}
           </ul>
diff --git a/ponyconf/urls.py b/ponyconf/urls.py
index 09a747e..19d08aa 100644
--- a/ponyconf/urls.py
+++ b/ponyconf/urls.py
@@ -19,8 +19,7 @@ from django.contrib import admin
 urlpatterns = [
     url(r'^admin/', admin.site.urls),
     url(r'^accounts/', include('accounts.urls')),
-    url(r'^registration/', include('registration.backends.default.urls')),
-    url(r'^', include('proposals.urls')),
+    url(r'', include('proposals.urls')),
     url(r'^conversations/', include('conversations.urls')),
     url(r'^select2/', include('django_select2.urls')),
 ]