some fixes to last search commit

[wolnelektury.git] / wolnelektury / urls.py

diff --git a/wolnelektury/urls.py b/wolnelektury/urls.py
index 2556a3d..ce51801 100644 (file)
--- a/wolnelektury/urls.py
+++ b/wolnelektury/urls.py
@@ -4,43 +4,48 @@ import os
 from django.conf.urls.defaults import *
 from django.conf import settings
 from django.contrib import admin
+import wolnelektury_core.views
 
 
 admin.autodiscover()
 
-urlpatterns = patterns('wolnelektury.views',
+urlpatterns = patterns('wolnelektury_core.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'^uzytkownik/$', 'user_settings', name='user_settings'),
+    url(r'^uzytkownik/login/$', wolnelektury_core.views.LoginFormView(), name='login'),
+    url(r'^uzytkownik/signup/$', wolnelektury_core.views.RegisterFormView(), name='register'),
+    url(r'^uzytkownik/logout/$', 'logout_then_redirect', name='logout'),
+    url(r'^uzytkownik/zaloguj-utworz/$', wolnelektury_core.views.LoginRegisterFormView(), name='login_register'),
 )
 
 urlpatterns += patterns('',
     url(r'^katalog/', include('catalogue.urls')),
-    url(r'^materialy/', include('lessons.urls')),
+    #url(r'^materialy/', include('lessons.urls')),
     url(r'^opds/', include('opds.urls')),
     url(r'^sugestia/', include('suggest.urls')),
     url(r'^lesmianator/', include('lesmianator.urls')),
     url(r'^przypisy/', include('dictionary.urls')),
     url(r'^raporty/', include('reporting.urls')),
     url(r'^info/', include('infopages.urls')),
-
-    # Static pages
-    url(r'^mozesz-nam-pomoc/$', 'infopages.views.infopage', {'slug': 'help_us'}, name='help_us'),
-    url(r'^o-projekcie/$', 'infopages.views.infopage', {'slug': 'about_us'}, name='about_us'),
-    url(r'^widget/$', 'infopages.views.infopage', {'slug': 'widget'}, name='widget'),
+    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)),
 
-    # Authentication
-    url(r'^uzytkownicy/zaloguj/$', 'catalogue.views.login', name='login'),
-    url(r'^uzytkownicy/wyloguj/$', 'catalogue.views.logout_then_redirect', name='logout'),
-    url(r'^uzytkownicy/utworz/$', 'catalogue.views.register', name='register'),
-    url(r'^uzytkownicy/login/$', 'django.contrib.auth.views.login', name='simple_login'),
-
     # API
     (r'^api/', include('api.urls')),
 
+    url(r'^szukaj/', include('search.urls')),
+
     # Static files
     url(r'^%s(?P<path>.*)$' % settings.MEDIA_URL[1:], 'django.views.static.serve',
         {'document_root': settings.MEDIA_ROOT, 'show_indexes': True}),
@@ -56,13 +61,13 @@ urlpatterns += patterns('django.views.generic.simple',
     url(r'^epub/$', 'redirect_to',
         {'url': '/katalog/lektury/'}),
     url(r'^mozesz-nam-pomoc/$', 'redirect_to',
-        {'url': '/info/mozesz-nam-pomoc'}, name='help_us'),
+        {'url': '/info/mozesz-nam-pomoc'}),
     url(r'^o-projekcie/$', 'redirect_to',
-        {'url': '/info/o-projekcie'}, name='about_us'),
+        {'url': '/info/o-projekcie'}),
     url(r'^widget/$', 'redirect_to',
         {'url': '/info/widget'}),
     url(r'^wolontariat/$', 'redirect_to',
-        {'url': '/mozesz-nam-pomoc/'}),
+        {'url': '/info/mozesz-nam-pomoc/'}),
 )