Changes to the wording, small cosmetic changes

[wolnelektury.git] / wolnelektury / urls.py

diff --git a/wolnelektury/urls.py b/wolnelektury/urls.py
index 3806b73..fd8ed63 100644 (file)
--- a/wolnelektury/urls.py
+++ b/wolnelektury/urls.py
@@ -4,12 +4,13 @@ import os
 from django.conf.urls.defaults import *
 from django.conf import settings
 from django.contrib import admin
 from django.conf.urls.defaults import *
 from django.conf import settings
 from django.contrib import admin

-import views
+from django.views.generic import RedirectView
+import wolnelektury_core.views

 
 
 admin.autodiscover()
 
 
 
 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'^$', 'main_page', name='main_page'),
     url(r'^planowane/$', 'publish_plan', name='publish_plan'),
 


@@ -17,15 +18,14 @@ urlpatterns = patterns('wolnelektury.views',
 
     # Authentication
     url(r'^uzytkownik/$', 'user_settings', name='user_settings'),
 
     # 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/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')),
 )
 
 urlpatterns += patterns('',
     url(r'^katalog/', include('catalogue.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'^opds/', include('opds.urls')),
     url(r'^sugestia/', include('suggest.urls')),
     url(r'^lesmianator/', include('lesmianator.urls')),


@@ -34,6 +34,9 @@ urlpatterns += patterns('',
     url(r'^info/', include('infopages.urls')),
     url(r'^ludzie/', include('social.urls')),
     url(r'^uzytkownik/', include('allauth.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')),
+    url(r'^wesprzyj/', include('funding.urls')),
+    url(r'^ankieta/', include('polls.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'),


@@ -43,8 +46,10 @@ urlpatterns += patterns('',
 
     # API
     (r'^api/', include('api.urls')),
 
     # API
     (r'^api/', include('api.urls')),

+    # OAIPMH
+    (r'^oaipmh/', include('oai.urls')),

 
 

-    url(r'^fullsearch/', include('search.urls')),
+    url(r'^szukaj/', 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',


@@ -54,20 +59,20 @@ urlpatterns += patterns('',
     url(r'^i18n/', include('django.conf.urls.i18n')),
 )
 
     url(r'^i18n/', include('django.conf.urls.i18n')),
 )
 

-urlpatterns += patterns('django.views.generic.simple',
+urlpatterns += patterns('',

     # old static pages - redirected
     # 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/'}),
+    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/')),

 )
     
 
 )