Browse Source

Replace direct_to_template generic view with class-based TemplateView

This is done as a part of migration to django 1.3. See
https://docs.djangoproject.com/en/1.3/topics/generic-views-migration/
for additional info.
pull/1/head
Hidden Z 13 years ago
parent
commit
a15bfb9cfa
  1. 14
      pyi2phosts/lib/generic.py
  2. 12
      pyi2phosts/urls.py

14
pyi2phosts/lib/generic.py

@ -0,0 +1,14 @@
from django.views.generic.base import TemplateView
from pyi2phosts.lib.utils import get_b32
import settings
class LocalTemplateView(TemplateView):
def get_context_data(self, **kwargs):
context = super(LocalTemplateView, self).get_context_data(**kwargs)
context.update({
'title': settings.SITE_NAME,
'domain': settings.DOMAIN,
'b64': settings.MY_B64,
'b32': get_b32(settings.MY_B64)
})
return context

12
pyi2phosts/urls.py

@ -1,5 +1,4 @@
from django.conf.urls.defaults import * from django.conf.urls.defaults import *
from django.views.generic.simple import direct_to_template
from django.views.generic.list_detail import object_list from django.views.generic.list_detail import object_list
# Uncomment the next two lines to enable the admin: # Uncomment the next two lines to enable the admin:
@ -8,6 +7,7 @@ admin.autodiscover()
from pyi2phosts.lib.rss import AliveHostsFeed from pyi2phosts.lib.rss import AliveHostsFeed
from pyi2phosts.lib.utils import get_b32 from pyi2phosts.lib.utils import get_b32
from pyi2phosts.lib.generic import LocalTemplateView
from pyi2phosts.extsources.models import ExternalSource from pyi2phosts.extsources.models import ExternalSource
from pyi2phosts.postkey.models import i2phost from pyi2phosts.postkey.models import i2phost
import settings import settings
@ -32,15 +32,7 @@ browse_hosts = {
} }
urlpatterns = patterns('', urlpatterns = patterns('',
url(r'^$', direct_to_template, { url(r'^$', LocalTemplateView.as_view(template_name='index.html'), name='index'),
'template': 'index.html',
'extra_context': {
'title': settings.SITE_NAME,
'domain': settings.DOMAIN,
'b64': settings.MY_B64,
'b32': get_b32(settings.MY_B64)
}
}, name='index'),
url(r'^faq/$', object_list, extsources, name='faq'), url(r'^faq/$', object_list, extsources, name='faq'),
url(r'^browse/$', object_list, browse_hosts, name='browse'), url(r'^browse/$', object_list, browse_hosts, name='browse'),
url(r'^browse/rss/$', AliveHostsFeed(), name='browse-rss'), url(r'^browse/rss/$', AliveHostsFeed(), name='browse-rss'),

Loading…
Cancel
Save