X-Git-Url: https://git.mdrn.pl/wolnelektury.git/blobdiff_plain/3badd77f743883992829a1174eef7c8d5e851766..743349c4413cfceb6f52a12e0a0790d9db346c98:/wolnelektury/urls.py

diff --git a/wolnelektury/urls.py b/wolnelektury/urls.py
index f6cd8d927..d0270365b 100644
--- a/wolnelektury/urls.py
+++ b/wolnelektury/urls.py
@@ -16,10 +16,11 @@ urlpatterns = patterns('wolnelektury.views',
     url(r'^zegar/$', 'clock', name='clock'),
 
     # Authentication
-    url(r'^uzytkownicy/zaloguj/$', views.LoginFormView(), name='login'),
-    url(r'^uzytkownicy/utworz/$', views.RegisterFormView(), name='register'),
-    url(r'^uzytkownicy/wyloguj/$', 'logout_then_redirect', name='logout'),
-    url(r'^uzytkownicy/zaloguj-utworz/$', views.LoginRegisterFormView(), name='login_register'),
+    url(r'^uzytkownik/$', 'user_settings', name='user_settings'),
+    url(r'^uzytkownik/login/$', views.LoginFormView(), name='login'),
+    url(r'^uzytkownik/signup/$', views.RegisterFormView(), name='register'),
+    url(r'^uzytkownik/logout/$', 'logout_then_redirect', name='logout'),
+    url(r'^uzytkownik/zaloguj-utworz/$', views.LoginRegisterFormView(), name='login_register'),
 )
 
 urlpatterns += patterns('',
@@ -32,6 +33,7 @@ urlpatterns += patterns('',
     url(r'^raporty/', include('reporting.urls')),
     url(r'^info/', include('infopages.urls')),
     url(r'^ludzie/', include('social.urls')),
+    url(r'^uzytkownik/', include('allauth.urls')),
 
     # Admin panel
     url(r'^admin/catalogue/book/import$', 'catalogue.views.import_book', name='import_book'),
@@ -42,7 +44,7 @@ urlpatterns += patterns('',
     # API
     (r'^api/', include('api.urls')),
 
-    url(r'^fullsearch/', include('search.urls')),
+    url(r'^szukaj/', include('search.urls')),
 
     # Static files
     url(r'^%s(?P<path>.*)$' % settings.MEDIA_URL[1:], 'django.views.static.serve',