Poprawienie migracji dla 0002 dla MySQL, które nie uznaje default dla pól typu BLOB...

[wolnelektury.git] / wolnelektury / urls.py

diff --git a/wolnelektury/urls.py b/wolnelektury/urls.py
index b84c616..1994414 100644 (file)
--- a/wolnelektury/urls.py
+++ b/wolnelektury/urls.py
@@ -2,21 +2,31 @@
 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
 

+from catalogue.forms import SearchForm
+
+

 admin.autodiscover()
 
 admin.autodiscover()
 

-from catalogue.forms import SearchForm

 
 urlpatterns = patterns('',
     url(r'^katalog/', include('catalogue.urls')),
     
     # Static pages
 
 urlpatterns = patterns('',
     url(r'^katalog/', include('catalogue.urls')),
     
     # Static pages

-    url(r'wolontariat/$', 'django.views.generic.simple.direct_to_template', 
+    url(r'^wolontariat/$', 'django.views.generic.simple.direct_to_template', 

         {'template': 'info/voluntary_services.html', 'extra_context': {'form': SearchForm()}},
         name='voluntary_services'),
         {'template': 'info/voluntary_services.html', 'extra_context': {'form': SearchForm()}},
         name='voluntary_services'),

+    url(r'^mozesz-nam-pomoc/$', 'django.views.generic.simple.direct_to_template',
+        {'template': 'info/help_us.html', 'extra_context': {'form': SearchForm()}},
+        name='help_us'),
+    url(r'^o-projekcie/$', 'django.views.generic.simple.direct_to_template', 
+        {'template': 'info/about_us.html', 'extra_context': {'form': SearchForm()}},
+        name='about_us'),

     
     # Admin panel
     
     # Admin panel

+    url(r'^admin/catalogue/book/import$', 'catalogue.views.import_book', name='import_book'),

     url(r'^admin/doc/', include('django.contrib.admindocs.urls')),
     url(r'^admin/(.*)$', admin.site.root),
     
     url(r'^admin/doc/', include('django.contrib.admindocs.urls')),
     url(r'^admin/(.*)$', admin.site.root),
     


@@ -26,7 +36,9 @@ urlpatterns = patterns('',
     url(r'^uzytkownicy/utworz/$', 'catalogue.views.register', name='register'),
     
     # Static files
     url(r'^uzytkownicy/utworz/$', 'catalogue.views.register', name='register'),
     
     # Static files

-    url(r'^media/(?P<path>.*)$', 'django.views.static.serve', 
-        {'document_root': os.path.join(os.path.dirname(__file__), 'media'), 'show_indexes': True}),
+    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'^$', 'django.views.generic.simple.redirect_to', {'url': 'katalog/'}),
 )