summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--public/views.py13
-rw-r--r--urls.py9
2 files changed, 5 insertions, 17 deletions
diff --git a/public/views.py b/public/views.py
index 4a4e01e7..a1010b43 100644
--- a/public/views.py
+++ b/public/views.py
@@ -16,16 +16,6 @@ def index(request):
}
return render_to_response('public/index.html', RequestContext(request,
context))
-
-def about(request):
- return render_to_response('public/about.html')
-
-def art(request):
- return render_to_response('public/art.html')
-
-def svn(request):
- return render_to_response('public/svn.html')
-
def projects(request):
projects = ExternalProject.objects.all()
return render_to_response('public/projects.html', {'projects': projects})
@@ -68,9 +58,6 @@ def download(request):
template_object_name="mirror_url",
extra_context={"path": request.path})
-def irc(request):
- return render_to_response('public/irc.html')
-
def moreforums(request):
return list_detail.object_list(request,
AltForum.objects.order_by('language', 'name'),
diff --git a/urls.py b/urls.py
index 17d06dbb..9aa879b1 100644
--- a/urls.py
+++ b/urls.py
@@ -3,6 +3,7 @@ from django.conf import settings
from django.contrib import admin
from django.views.generic.create_update import delete_object
+from django.views.generic.simple import direct_to_template
from django.contrib.auth.decorators import permission_required
from archweb.main.models import Todolist
@@ -62,14 +63,14 @@ urlpatterns = patterns('',
# (mostly) Static Pages
(r'^$', 'archweb.public.views.index'),
- (r'^about/$', 'archweb.public.views.about'),
- (r'^art/$', 'archweb.public.views.art'),
- (r'^svn/$', 'archweb.public.views.svn'),
+ (r'^about/$', direct_to_template, {'template': 'public/about.html'}),
+ (r'^art/$', direct_to_template, {'template': 'public/art.html'}),
+ (r'^svn/$', direct_to_template, {'template': 'public/svn.html'}),
(r'^developers/$', 'archweb.public.views.developers'),
(r'^fellows/$', 'archweb.public.views.fellows'),
(r'^donate/$', 'archweb.public.views.donate'),
(r'^download/$', 'archweb.public.views.download'),
- (r'^irc/$', 'archweb.public.views.irc'),
+ (r'^irc/$', direct_to_template, {'template': 'public/irc.html'}),
(r'^moreforums/$', 'archweb.public.views.moreforums'),
(r'^projects/$', 'archweb.public.views.projects'),
('^jsi18n/$', 'django.views.i18n.null_javascript_catalog',