-from django.conf.urls.defaults import patterns, include, url
-from django.views.generic.simple import direct_to_template
+from django.conf.urls import include, url
-# from django.contrib import admin
-# admin.autodiscover()
-
-urlpatterns = patterns('',
- url(r'^$', 'turniej.views.home', name='main_page'),
-
- url(r'^regulamin/$', direct_to_template, {'template': 'pages/rules.html'},
- name='rules_page'),
- url(r'^wiecej/$', direct_to_template, {'template': 'pages/more.html'},
- name='more_page'),
- url(r'^technikalia/$', direct_to_template, {'template': 'pages/technical.html'},
- name='technical_page'),
+urlpatterns = [
+ url(r'^2011/', include('edition1.urls')),
url(r'^poezja/', include('poetry.urls')),
-
- # url(r'^admin/doc/', include('django.contrib.admindocs.urls')),
- # url(r'^admin/', include(admin.site.urls)),
-)
+ url(r'', include('edition2.urls')),
+]