X-Git-Url: https://git.mdrn.pl/wolnelektury.git/blobdiff_plain/f551c7053c91818b3ac0dfccc2e699dc6517fae1..0271966e210c862e0a781ec0f567758e0fed2e55:/wolnelektury/urls.py?ds=inline diff --git a/wolnelektury/urls.py b/wolnelektury/urls.py index 3806b73ce..5323ada9b 100644 --- a/wolnelektury/urls.py +++ b/wolnelektury/urls.py @@ -4,12 +4,12 @@ import os from django.conf.urls.defaults import * from django.conf import settings from django.contrib import admin -import views +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'), @@ -17,15 +17,15 @@ urlpatterns = patterns('wolnelektury.views', # Authentication 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/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/$', views.LoginRegisterFormView(), name='login_register'), + 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')), @@ -34,6 +34,7 @@ urlpatterns += patterns('', url(r'^info/', include('infopages.urls')), url(r'^ludzie/', include('social.urls')), url(r'^uzytkownik/', include('allauth.urls')), + url(r'^czekaj/', include('waiter.urls')), # Admin panel url(r'^admin/catalogue/book/import$', 'catalogue.views.import_book', name='import_book'), @@ -44,7 +45,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.*)$' % settings.MEDIA_URL[1:], 'django.views.static.serve',