X-Git-Url: https://git.mdrn.pl/wolnelektury.git/blobdiff_plain/dd6284e01f00296294a527ded7e840ac14c5fbb8..451f7b0e0ee3bfdab38cfa9c98a297c5320b52ad:/wolnelektury/urls.py?ds=sidebyside

diff --git a/wolnelektury/urls.py b/wolnelektury/urls.py
index 0cb3eddb7..3806b73ce 100644
--- a/wolnelektury/urls.py
+++ b/wolnelektury/urls.py
@@ -11,13 +11,16 @@ admin.autodiscover()
 
 urlpatterns = patterns('wolnelektury.views',
     url(r'^$', 'main_page', name='main_page'),
+    url(r'^planowane/$', 'publish_plan', name='publish_plan'),
 
     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'^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('',
@@ -29,9 +32,12 @@ urlpatterns += patterns('',
     url(r'^przypisy/', include('dictionary.urls')),
     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'),
+    url(r'^admin/catalogue/picture/import$', 'picture.views.import_picture', name='import_picture'),
     url(r'^admin/doc/', include('django.contrib.admindocs.urls')),
     url(r'^admin/', include(admin.site.urls)),