Merge branch 'master' into production

[wolnelektury.git] / wolnelektury / urls.py

diff --git a/wolnelektury/urls.py b/wolnelektury/urls.py
index 0d61a36..e501ae1 100644 (file)
--- a/wolnelektury/urls.py
+++ b/wolnelektury/urls.py
@@ -4,55 +4,75 @@ import os
 from django.conf.urls.defaults import *
 from django.conf import settings
 from django.contrib import admin
+from django.views.generic import RedirectView
+import wolnelektury_core.views
 
-from catalogue.forms import SearchForm
 
-from infopages.models import InfoPage
+admin.autodiscover()
 
+urlpatterns = patterns('wolnelektury_core.views',
+    url(r'^$', 'main_page', name='main_page'),
+    url(r'^planowane/$', 'publish_plan', name='publish_plan'),
 
-admin.autodiscover()
+    url(r'^zegar/$', 'clock', name='clock'),
 
-urlpatterns = patterns('',
+    # 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')),
-
-    # Static pages
-    url(r'^wolontariat/$', 'infopages.views.infopage', {'slug': 'voluntary_services'}, name='voluntary_services'),
-    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'^epub/$', 'infopages.views.infopage', {'slug': 'epub'}, name='epub'),
-    
-    url(r'^1procent/$', 'django.views.generic.simple.direct_to_template', {
-        'template': '1percent.html'
-    }, name='1percent'),
+    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')),
+    url(r'^czekaj/', include('waiter.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'^users/simple_login/$', 'catalogue.views.simple_login', name='simple_login'),
-    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'),
-
     # 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}),
     url(r'^%s(?P<path>.*)$' % settings.STATIC_URL[1:], 'django.views.static.serve',
         {'document_root': settings.STATIC_ROOT, 'show_indexes': True}),
-    url(r'^$', 'django.views.generic.simple.redirect_to', {'url': 'katalog/'}),
     url(r'^i18n/', include('django.conf.urls.i18n')),
 )
 
+urlpatterns += patterns('',
+    # old static pages - redirected
+    url(r'^1procent/$', RedirectView.as_view(
+        url='http://nowoczesnapolska.org.pl/wesprzyj_nas/')),
+    url(r'^epub/$', RedirectView.as_view(
+        url='/katalog/lektury/')),
+    url(r'^mozesz-nam-pomoc/$', RedirectView.as_view(
+        url='/info/mozesz-nam-pomoc')),
+    url(r'^o-projekcie/$', RedirectView.as_view(
+        url='/info/o-projekcie')),
+    url(r'^widget/$', RedirectView.as_view(
+        url='/info/widget')),
+    url(r'^wolontariat/$', RedirectView.as_view(
+        url='/info/mozesz-nam-pomoc/')),
+)
+    
+
 if 'rosetta' in settings.INSTALLED_APPS:
     urlpatterns += patterns('',
         url(r'^rosetta/', include('rosetta.urls')),