diff options
Diffstat (limited to 'hyperkitty/urls.py')
| -rw-r--r-- | hyperkitty/urls.py | 19 |
1 files changed, 12 insertions, 7 deletions
diff --git a/hyperkitty/urls.py b/hyperkitty/urls.py index f6cfa18..1a2e945 100644 --- a/hyperkitty/urls.py +++ b/hyperkitty/urls.py @@ -20,10 +20,10 @@ # Author: Aurelien Bompard <abompard@fedoraproject.org> # -from django.conf.urls.defaults import patterns, include, url +from django.conf.urls import patterns, include, url from django.conf import settings -from django.views.generic.simple import direct_to_template -from api import EmailResource, ThreadResource, SearchResource +from django.views.generic.base import TemplateView +from api import ListResource, EmailResource, ThreadResource, SearchResource from django.contrib.staticfiles.urls import staticfiles_urlpatterns from django.contrib.auth.views import login as login_view @@ -33,6 +33,10 @@ from django.contrib.auth.views import logout as logout_view from django.contrib import admin admin.autodiscover() +from hyperkitty.views import TextTemplateView + + + urlpatterns = patterns('hyperkitty.views', # Index url(r'^/$', 'pages.index', name='index'), @@ -88,8 +92,10 @@ urlpatterns = patterns('hyperkitty.views', # REST API - url(r'^api/$', direct_to_template, {"template": "api.html"}), - url(r'^api/email\/(?P<mlist_fqdn>[^/@]+@[^/@]+)\/(?P<hashid>.*)/', + url(r'^api/$', TemplateView.as_view(template_name="api.html")), + url(r'^api/list\/', + ListResource.as_view(), name="api_list"), + url(r'^api/email\/(?P<mlist_fqdn>[^/@]+@[^/@]+)\/(?P<messageid>.*)/', EmailResource.as_view(), name="api_email"), url(r'^api/thread\/(?P<mlist_fqdn>[^/@]+@[^/@]+)\/(?P<threadid>.*)/', ThreadResource.as_view(), name="api_thread"), @@ -103,8 +109,7 @@ urlpatterns = patterns('hyperkitty.views', url(r'^admin/', include(admin.site.urls), {"SSL": True}), # Robots.txt - url(r'^robots\.txt$', direct_to_template, - {'template': 'robots.txt', 'mimetype': 'text/plain'}), + url(r'^robots\.txt$', TextTemplateView.as_view(template_name="robots.txt")), # Social Auth url(r'', include('social_auth.urls'), {"SSL": True}), |