Merge branch 'reflow'

[wolnelektury.git] / wolnelektury / urls.py

diff --git a/wolnelektury/urls.py b/wolnelektury/urls.py
deleted file mode 100644 (file)
index 19f6cb5..0000000
--- a/wolnelektury/urls.py
+++ /dev/null
@@ -1,35 +0,0 @@
-# -*- coding: utf-8 -*-
-import os
-
-from django.conf.urls.defaults import *
-from django.contrib import admin
-
-admin.autodiscover()
-
-from catalogue.forms import SearchForm
-
-urlpatterns = patterns('',
-    url(r'^katalog/', include('catalogue.urls')),
-    
-    # Static pages
-    url(r'^wolontariat/$', 'django.views.generic.simple.direct_to_template', 
-        {'template': 'info/voluntary_services.html', 'extra_context': {'form': SearchForm()}},
-        name='voluntary_services'),
-    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
-    url(r'^admin/doc/', include('django.contrib.admindocs.urls')),
-    url(r'^admin/(.*)$', admin.site.root),
-    
-    # Authentication
-    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'),
-    
-    # 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'^$', 'django.views.generic.simple.redirect_to', {'url': 'katalog/'}),
-)