minimal allauth support

[wolnelektury.git] / wolnelektury / urls.py

diff --git a/wolnelektury/urls.py b/wolnelektury/urls.py
index f7d5015..3695990 100644 (file)
--- a/wolnelektury/urls.py
+++ b/wolnelektury/urls.py
@@ -11,6 +11,7 @@ admin.autodiscover()
 
 urlpatterns = patterns('wolnelektury.views',
     url(r'^$', 'main_page', name='main_page'),
 
 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'),
 
 
     url(r'^zegar/$', 'clock', name='clock'),
 


@@ -18,6 +19,7 @@ urlpatterns = patterns('wolnelektury.views',
     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/$', 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'),

 )
 
 urlpatterns += patterns('',
 )
 
 urlpatterns += patterns('',


@@ -29,16 +31,19 @@ urlpatterns += patterns('',
     url(r'^przypisy/', include('dictionary.urls')),
     url(r'^raporty/', include('reporting.urls')),
     url(r'^info/', include('infopages.urls')),
     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'^uzytkownicy/', include('allauth.urls')),

 
     # Admin panel
     url(r'^admin/catalogue/book/import$', 'catalogue.views.import_book', name='import_book'),
 
     # 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)),
 
     # API
     (r'^api/', include('api.urls')),
 
     url(r'^admin/doc/', include('django.contrib.admindocs.urls')),
     url(r'^admin/', include(admin.site.urls)),
 
     # API
     (r'^api/', include('api.urls')),
 

-    url(r'^newsearch/', include('search.urls')),
+    url(r'^fullsearch/', include('search.urls')),

 
     # Static files
     url(r'^%s(?P<path>.*)$' % settings.MEDIA_URL[1:], 'django.views.static.serve',
 
     # Static files
     url(r'^%s(?P<path>.*)$' % settings.MEDIA_URL[1:], 'django.views.static.serve',