From b2f7cd61e89c59bb52a542f6667aabd53743681c Mon Sep 17 00:00:00 2001 From: Dan McGee Date: Tue, 29 Mar 2011 15:44:08 -0500 Subject: Convert generic views in urls.py to class-based Signed-off-by: Dan McGee --- urls.py | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) (limited to 'urls.py') diff --git a/urls.py b/urls.py index 33319263..cc8b593a 100644 --- a/urls.py +++ b/urls.py @@ -4,7 +4,7 @@ from django.conf.urls.defaults import * from django.conf import settings from django.contrib import admin -from django.views.generic.simple import direct_to_template +from django.views.generic import TemplateView from feeds import PackageFeed, NewsFeed import sitemaps @@ -49,13 +49,16 @@ urlpatterns += patterns('django.contrib.auth.views', # Public pages urlpatterns += patterns('public.views', (r'^$', 'index', {}, 'index'), - (r'^about/$', direct_to_template, {'template': 'public/about.html'}, 'page-about'), - (r'^art/$', direct_to_template, {'template': 'public/art.html'}, 'page-art'), - (r'^svn/$', direct_to_template, {'template': 'public/svn.html'}, 'page-svn'), + (r'^about/$', TemplateView.as_view(template_name='public/about.html'), + {}, 'page-about'), + (r'^art/$', TemplateView.as_view(template_name='public/art.html'), + {}, 'page-art'), + (r'^svn/$', TemplateView.as_view(template_name='public/svn.html'), + {}, 'page-svn'), (r'^developers/$', 'userlist', { 'type':'devs' }, 'page-devs'), (r'^trustedusers/$', 'userlist', { 'type':'tus' }, 'page-tus'), (r'^fellows/$', 'userlist', { 'type':'fellows' }, 'page-fellows'), - (r'^donate/$', 'donate', {}, 'page-donate'), + (r'^donate/$', 'donate', {}, 'page-donate'), (r'^download/$', 'download', {}, 'page-download'), ) -- cgit v1.2.3-2-g168b From c5a28f88936fba06755aefec61a017c2ce94ba40 Mon Sep 17 00:00:00 2001 From: Tom Willemsen Date: Thu, 28 Apr 2011 12:43:01 -0500 Subject: isotests: modelines, imports, url and pass * Added vim modelines to files. * Rearranged import statements. * Moved the arch releng isos url to settings.py. * Fixed some issues that arose from forgetting to import the isotests urls package. * removed redundant str() calls. Signed-off-by: Dan McGee --- urls.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'urls.py') diff --git a/urls.py b/urls.py index cc8b593a..cc8e2471 100644 --- a/urls.py +++ b/urls.py @@ -77,11 +77,12 @@ urlpatterns += patterns('', (r'^opensearch/packages/$', 'packages.views.opensearch', {}, 'opensearch-packages'), (r'^todolists/$','todolists.views.public_list'), + (r'^isotests/', include('isotests.urls')), ) if settings.DEBUG == True: urlpatterns += patterns('', - (r'^media/(.*)$', 'django.views.static.serve', + (r'^media/(.*)$', 'django.views.static.serve', {'document_root': os.path.join(settings.DEPLOY_PATH, 'media')})) # vim: set ts=4 sw=4 et: -- cgit v1.2.3-2-g168b From bfe6afcd7ac5ae7b6f07caa7b02a33fec710ebda Mon Sep 17 00:00:00 2001 From: Dan McGee Date: Thu, 28 Apr 2011 17:58:13 -0500 Subject: Rename isotests to releng Signed-off-by: Dan McGee --- urls.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'urls.py') diff --git a/urls.py b/urls.py index cc8e2471..36a2d79f 100644 --- a/urls.py +++ b/urls.py @@ -73,11 +73,11 @@ urlpatterns += patterns('', (r'^mirrors/', include('mirrors.urls')), (r'^news/', include('news.urls')), (r'^packages/', include('packages.urls')), + (r'^releng/', include('releng.urls')), (r'^todo/', include('todolists.urls')), (r'^opensearch/packages/$', 'packages.views.opensearch', {}, 'opensearch-packages'), (r'^todolists/$','todolists.views.public_list'), - (r'^isotests/', include('isotests.urls')), ) if settings.DEBUG == True: -- cgit v1.2.3-2-g168b