X-Git-Url: https://git.mdrn.pl/turniej.git/blobdiff_plain/3dbaa20d66d533211dc34746150cbb31f5afd5d3..0968cfbe5012ab5fe8eae41d0dd370b9c99678ca:/turniej/urls.py?ds=inline diff --git a/turniej/urls.py b/turniej/urls.py index 2a2a2f1..117df8b 100644 --- a/turniej/urls.py +++ b/turniej/urls.py @@ -1,21 +1,11 @@ from django.conf.urls.defaults import patterns, include, url from django.views.generic.simple import direct_to_template +from edition2.urls import urlpatterns as e2_urlpatterns # 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'), - + 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)), -) +) + e2_urlpatterns