resolve URL problem

2 files changed, 3 insertions, 2 deletions

diff --git a/scipy2015/urls.py b/scipy2015/urls.py
index 18b0206..1815734 100644
--- a/scipy2015/urls.py
+++ b/scipy2015/urls.py
@@ -10,6 +10,7 @@ urlpatterns = patterns('',
 
     url(r'^admin/', include(admin.site.urls)),
     url(r'^', include('website.urls', namespace='website')),
+    url(r'^2015/', include('website.urls', namespace='website')),
     url(r'^', include('social.apps.django_app.urls', namespace='social')),
     url(r'^', include('django.contrib.auth.urls', namespace='auth')),
 )
diff --git a/website/views.py b/website/views.py
index a85536d..60a7176 100644
--- a/website/views.py
+++ b/website/views.py
@@ -26,7 +26,7 @@ def userregister(request):
             form = UserRegisterForm(request.POST)
             if form.is_valid():
                 form.save()
-                return HttpResponseRedirect('/accounts/login')
+                return HttpResponseRedirect('/2015/accounts/login')
             else:
                 context.update(csrf(request))
                 context['form'] = form
@@ -38,7 +38,7 @@ def userregister(request):
         return render_to_response('user-register.html', context)
     else:
         context['user'] = request.user
-        return HttpResponseRedirect('/cfp')
+        return HttpResponseRedirect('/2015/cfp')
 
 
 def userlogin(request):