Search in stagin phase - waiting for final guidelines on new wl

[wolnelektury.git] / wolnelektury / urls.py

diff --git a/wolnelektury/urls.py b/wolnelektury/urls.py
index 0d61a36..2a199c7 100644 (file)
--- a/wolnelektury/urls.py
+++ b/wolnelektury/urls.py
@@ -18,17 +18,13 @@ urlpatterns = patterns('',
     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')),

+    url(r'^przypisy/', include('dictionary.urls')),
+    url(r'^statystyka/', include('stats.urls')),

 
     # Static pages
 
     # 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'^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'),

 
     # 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'),


@@ -36,14 +32,16 @@ urlpatterns = patterns('',
     url(r'^admin/', include(admin.site.urls)),
 
     # Authentication
     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'),
     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')),
 
 
     # API
     (r'^api/', include('api.urls')),
 

+    url(r'^newsearch/', 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}),
     # Static files
     url(r'^%s(?P<path>.*)$' % settings.MEDIA_URL[1:], 'django.views.static.serve',
         {'document_root': settings.MEDIA_ROOT, 'show_indexes': True}),


@@ -53,6 +51,14 @@ urlpatterns = patterns('',
     url(r'^i18n/', include('django.conf.urls.i18n')),
 )
 
     url(r'^i18n/', include('django.conf.urls.i18n')),
 )
 

+urlpatterns += patterns('django.views.generic.simple',
+    # old static pages - redirected
+    (r'^1procent/$', 'redirect_to', {'url': 'http://nowoczesnapolska.org.pl/wesprzyj_nas/'}),
+    (r'^wolontariat/$', 'redirect_to', {'url': '/mozesz-nam-pomoc/'}),
+    (r'^epub/$', 'redirect_to', {'url': '/katalog/lektury/'}),
+)
+    
+

 if 'rosetta' in settings.INSTALLED_APPS:
     urlpatterns += patterns('',
         url(r'^rosetta/', include('rosetta.urls')),
 if 'rosetta' in settings.INSTALLED_APPS:
     urlpatterns += patterns('',
         url(r'^rosetta/', include('rosetta.urls')),