Merge branch 'master' of https://github.com/fnp/wolnelektury

[wolnelektury.git] / wolnelektury / urls.py

diff --git a/wolnelektury/urls.py b/wolnelektury/urls.py
index 104899f..5323ada 100644 (file)
--- a/wolnelektury/urls.py
+++ b/wolnelektury/urls.py
@@ -2,25 +2,77 @@
 import os
 
 from django.conf.urls.defaults import *
 import os
 
 from django.conf.urls.defaults import *

+from django.conf import settings

 from django.contrib import admin
 from django.contrib import admin

+import wolnelektury_core.views
+

 
 admin.autodiscover()
 
 
 admin.autodiscover()
 

+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('',
+urlpatterns += patterns('',

     url(r'^katalog/', include('catalogue.urls')),
     url(r'^katalog/', include('catalogue.urls')),

-    
-    # Panel administracyjny
+    #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')),
+    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/doc/', include('django.contrib.admindocs.urls')),

-    url(r'^admin/(.*)$', admin.site.root),
-    
-    # Użytkownicy
-    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'),
-    
-    # Pliki statyczne
-    url(r'^media/(?P<path>.*)$', 'django.views.static.serve', 
-        {'document_root': os.path.join(os.path.dirname(__file__), 'media'), 'show_indexes': True}),
-    url(r'^$', 'django.views.generic.simple.redirect_to', {'url': 'katalog/'}),
+    url(r'^admin/', include(admin.site.urls)),
+
+    # 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'^i18n/', include('django.conf.urls.i18n')),

 )
 )

+
+urlpatterns += patterns('django.views.generic.simple',
+    # old static pages - redirected
+    url(r'^1procent/$', 'redirect_to',
+        {'url': 'http://nowoczesnapolska.org.pl/wesprzyj_nas/'}),
+    url(r'^epub/$', 'redirect_to',
+        {'url': '/katalog/lektury/'}),
+    url(r'^mozesz-nam-pomoc/$', 'redirect_to',
+        {'url': '/info/mozesz-nam-pomoc'}),
+    url(r'^o-projekcie/$', 'redirect_to',
+        {'url': '/info/o-projekcie'}),
+    url(r'^widget/$', 'redirect_to',
+        {'url': '/info/widget'}),
+    url(r'^wolontariat/$', 'redirect_to',
+        {'url': '/info/mozesz-nam-pomoc/'}),
+)
+    
+
+if 'rosetta' in settings.INSTALLED_APPS:
+    urlpatterns += patterns('',
+        url(r'^rosetta/', include('rosetta.urls')),
+    )