Display fixes: shelf tags, search results.

[wolnelektury.git] / wolnelektury / urls.py

diff --git a/wolnelektury/urls.py b/wolnelektury/urls.py
index 9801733..abe872f 100644 (file)
--- a/wolnelektury/urls.py
+++ b/wolnelektury/urls.py
@@ -1,15 +1,16 @@
 # -*- coding: utf-8 -*-
 # -*- coding: utf-8 -*-

+# This file is part of Wolnelektury, licensed under GNU Affero GPLv3 or later.
+# Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information.
+#

 import os
 
 import os
 

-from django.conf.urls.defaults import *
+from django.conf.urls import include, patterns, url

 from django.conf import settings
 from django.contrib import admin
 from django.views.generic import RedirectView
 import wolnelektury_core.views
 
 
 from django.conf import settings
 from django.contrib import admin
 from django.views.generic import RedirectView
 import wolnelektury_core.views
 
 

-admin.autodiscover()
-

 urlpatterns = patterns('wolnelektury_core.views',
     url(r'^$', 'main_page', name='main_page'),
     url(r'^planowane/$', 'publish_plan', name='publish_plan'),
 urlpatterns = patterns('wolnelektury_core.views',
     url(r'^$', 'main_page', name='main_page'),
     url(r'^planowane/$', 'publish_plan', name='publish_plan'),


@@ -35,7 +36,9 @@ urlpatterns += patterns('',
     url(r'^ludzie/', include('social.urls')),
     url(r'^uzytkownik/', include('allauth.urls')),
     url(r'^czekaj/', include('waiter.urls')),
     url(r'^ludzie/', include('social.urls')),
     url(r'^uzytkownik/', include('allauth.urls')),
     url(r'^czekaj/', include('waiter.urls')),

-    url(r'^biblioteki/', include('libraries.urls')),
+    url(r'^wesprzyj/', include('funding.urls')),
+    url(r'^ankieta/', include('polls.urls')),
+    url(r'^biblioteki', include('libraries.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'),