summaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
Diffstat (limited to 'app')
-rw-r--r--app/blog/views.py6
-rw-r--r--app/build/base.py281
-rw-r--r--app/lib/templatetags/templatetags/html5_datetime.py16
-rw-r--r--app/pages/__init__.py0
-rw-r--r--app/pages/admin.py26
-rw-r--r--app/pages/models.py41
-rw-r--r--app/pages/views.py13
-rw-r--r--app/photos/models.py2
-rw-r--r--app/projects/admin.py15
-rw-r--r--app/projects/models/__init__.py3
-rw-r--r--app/projects/urls.py1
-rw-r--r--app/projects/views.py7
12 files changed, 272 insertions, 139 deletions
diff --git a/app/blog/views.py b/app/blog/views.py
index 72c769e..8d14fe3 100644
--- a/app/blog/views.py
+++ b/app/blog/views.py
@@ -9,7 +9,7 @@ from django.conf import settings
from blog.models import Entry, Topic
from locations.models import Region, Country
from photos.models import Photo, PhotoGallery
-from chunks.models import Chunk
+#from chunks.models import Chunk
def home(request):
featured = Entry.objects.filter(status__exact=1).select_related().latest()
@@ -71,10 +71,12 @@ def entry_list_by_area(request,slug,page):
return object_list(request, queryset=qs, template_name='archives/writing.html',
extra_context=context)
+"""
def about(request):
qs = Chunk.objects.filter(key__in=['about_top','about_middle','about_bottom'])
context = {
'object_list':qs,
'IMAGES_URL' : settings.IMAGES_URL
}
- return render_to_response('details/about.html', context, context_instance=RequestContext(request)) \ No newline at end of file
+ return render_to_response('details/about.html', context, context_instance=RequestContext(request))
+"""
diff --git a/app/build/base.py b/app/build/base.py
index f6df69d..49f1989 100644
--- a/app/build/base.py
+++ b/app/build/base.py
@@ -10,27 +10,54 @@ from django.conf import settings
class Build():
- def write_file(self, path, object):
- file = open(path, 'w')
+ def write_file(self, path, object, ext='html',filename='index'):
+ """
+ Given a path and object intended to be a webpage, write the page the
+ disc
+ """
+ path = '%s%s' %(settings.FLATFILES_ROOT, path)
+ if not os.path.isdir(path):
+ os.makedirs(path)
+ fpath = '%s%s.%s' %(path, filename, ext)
+ file = open(fpath, 'w')
file.write(object)
file.close()
+ if ext == 'js':
+ import jsmin
+ compressed = jsmin.jsmin(object)
+ fpath = '%s%s.min.%s' %(path, filename, ext)
+ file = open(fpath, 'w')
+ file.write(compressed)
+ file.close()
-class BuildSitemap(Build):
- def build(self):
+ def build_archive_pages(self, qs=None, base_path='', paginate_by=10):
+ """
+ Archive Page builder that actually crawls the urls
+ because we need to be able to pass a request object to the template
+
+ """
+ if qs == None:
+ qs = self.get_model_querset()
c = Client()
- response = c.get('/sitemap.xml')
- fpath = '%ssitemap.xml' %(settings.BAKED_ROOT)
- self.write_file(fpath,str(response.content))
-
+ pages = ceil(Decimal(qs.count())/Decimal(paginate_by))
+ for page in range(int(pages)):
+ path = '%s%s/' %(base_path, page+1)
+ url = '/%s%s/' %(base_path, str(page+1))
+ page_url = base_path+'%d/'
+ response = c.post(url, {'page_url': page_url, 'page': int(page)})
+ if page == 0:
+ self.write_file(base_path,str(response.content))
+ self.write_file(path,str(response.content))
+
class BuildWriting(Build):
-
-
def build(self):
self.build_detail_pages()
- self.build_archive_pages()
+ self.build_writing_archives()
self.build_location_archive_pages()
self.build_homepage()
-
+ self.writing_year_archives()
+ self.writing_month_archives()
+
def get_model_querset(self):
model = get_model('blog', 'entry')
qs = model.objects.filter(status__exact=1)
@@ -44,31 +71,16 @@ class BuildWriting(Build):
for entry in qs:
c = Context({'object':entry,'MEDIA_URL':settings.BAKED_MEDIA_URL, 'IMAGES_URL':settings.BAKED_IMAGES_URL})
t = render_to_string('details/entry.html',c).encode('utf-8')
- path = '%s%s/%s/' %(settings.BAKED_ROOT, entry.pub_date.strftime("%Y/%b/%d").lower(), entry.slug)
- if not os.path.isdir(path):
- os.makedirs(path)
- fpath = '%sindex.html' %(path)
- self.write_file(fpath,t)
+ path = '%s/%s/' %(entry.pub_date.strftime("%Y/%b/%d").lower(), entry.slug)
+ self.write_file(path,t)
+ s = render_to_string('details/entry.txt',c).encode('utf-8')
+ self.write_file(path,s,'txt')
- def build_archive_pages(self, qs=None, extra='writing/', paginate_by=10):
- if qs == None:
- qs = self.get_model_querset()
- c = Client()
- pages = ceil(Decimal(qs.count())/Decimal(paginate_by))
- print pages
- for page in range(int(pages)):
- base_path = '%s%s' %(settings.BAKED_ROOT, extra)
- path = '%s%s/' %(base_path, page+1)
- if not os.path.isdir(path):
- os.makedirs(path)
- url = '/%s%s/' %(extra, str(page+1))
- page_url = extra+'%d/'
- response = c.post(url, {'page_url': page_url, 'page': int(page)})
- fpath = '%sindex.html' %(path)
- if page == 0:
- self.write_file(base_path+'/index.html',str(response.content))
- self.write_file(fpath,str(response.content))
-
+
+ def build_writing_archives(self):
+ qs = self.get_model_querset()
+ self.build_archive_pages(qs, 'writing/')
+
def build_location_archive_pages(self):
model = get_model('locations', 'Country')
blog = get_model('blog', 'entry')
@@ -77,28 +89,39 @@ class BuildWriting(Build):
qs = blog.objects.filter(status__exact=1,location__state__country = c).order_by('-pub_date')
path = 'writing/%s/' %(c.slug)
self.build_archive_pages(qs, path)
-
- def build_recent_entries(self):
- model = get_model('blog', 'entry')
- qs = {'object_list': model.objects.filter(status__exact=1).order_by('-pub_date')[1:4]}
- c = Context(qs)
- t = render_to_string('bin/recent_entries.html',c).encode('utf-8')
- fpath = '%s%s' %(settings.PROJ_ROOT,'templates/includes/recent_entries.html')
- self.write_file(fpath,t)
-
-
-
+
+ def writing_year_archives(self):
+ entry = get_model('blog', 'entry')
+ years = entry.objects.dates('pub_date', 'year')
+ for year in years:
+ year = year.strftime('%Y')
+ qs = entry.objects.filter(status__exact=1,pub_date__year=year).order_by('-pub_date')
+ c = Context({'type':'year','date': year, 'object_list':qs,})
+ t = render_to_string('archives/writing_date.html',c).encode('utf-8')
+ fpath = '%s/' %(year)
+ self.write_file(fpath,t)
+
+ def writing_month_archives(self):
+ entry = get_model('blog', 'entry')
+ months = entry.objects.dates('pub_date', 'month')
+ for m in months:
+ year = m.strftime('%Y')
+ month = m.strftime('%m')
+ month_name = m.strftime('%b')
+ month_full_name = m.strftime('%B')
+ qs = entry.objects.filter(status__exact=1,pub_date__year=year,pub_date__month=month).order_by('-pub_date')
+ c = Context({'type':'monthly','date': '%s %s' %(month_full_name,year), 'object_list':qs,})
+ t = render_to_string('archives/writing_date.html',c).encode('utf-8')
+ fpath = '%s/%s/' %(year,month_name)
+ self.write_file(fpath,t)
+
def build_homepage(self):
- self.build_recent_entries()
qs = get_model('blog', 'entry').objects.filter(status__exact=1).latest()
c = Context({'featured':qs,'MEDIA_URL':settings.BAKED_MEDIA_URL, 'IMAGES_URL':settings.BAKED_IMAGES_URL})
t = render_to_string('archives/homepage.html',c).encode('utf-8')
- fpath = '%s%s' %(settings.BAKED_ROOT,'index.html')
- self.write_file(fpath,t)
-
-
-class BuildPhotos(BuildWriting):
+ self.write_file('',t)
+class BuildPhotos(Build):
def build(self):
self.build_photo_archive_pages()
self.build_detail_pages()
@@ -110,76 +133,13 @@ class BuildPhotos(BuildWriting):
def build_detail_pages(self):
qs = get_model('photos', 'PhotoGallery').objects.all()
- path = 'photos/galleries/'
- '''
- Grab all the blog posts, render them to a template string and write that out to the filesystem
- '''
for photo in qs:
c = Context({'object':photo,'MEDIA_URL':settings.BAKED_MEDIA_URL, 'IMAGES_URL':settings.BAKED_IMAGES_URL})
t = render_to_string('details/photo_galleries.html',c).encode('utf-8')
- path = '%sphotos/galleries/%s/' %(settings.BAKED_ROOT, photo.set_slug)
- if not os.path.isdir(path):
- os.makedirs(path)
- fpath = '%sindex.html' %(path)
- self.write_file(fpath,t)
-
-
+ path = 'photos/galleries/%s/' %(photo.set_slug)
+ self.write_file(path,t)
-class BuildAbout(Build):
- def build(self):
- model = get_model('chunks', 'Chunk')
- qs = model.objects.filter(key__in=['about_top','about_middle','about_bottom'])
- c = Context({
- 'object_list': qs,
- 'IMAGES_URL' : settings.BAKED_IMAGES_URL,
- 'MEDIA_URL':settings.BAKED_MEDIA_URL
- })
- t = render_to_string('details/about.html',c).encode('utf-8')
- path = '%sabout/' %(settings.BAKED_ROOT)
- if not os.path.isdir(path):
- os.makedirs(path)
- fpath = '%sindex.html' %(path)
- self.write_file(fpath,t)
-
-class BuildMap(Build):
-
- def build_map_templates(self):
- import codecs
- qs = get_model('blog', 'entry').objects.filter(status__exact=1)
- cl = get_model('locations', 'Country').objects.filter(visited=True).exclude(name='default')
- rl = get_model('locations', 'Region').objects.all()
- rtl = get_model('locations', 'Route').objects.all()
- c = Context({'object_list':qs, 'country_list':cl,'region_list':rl, 'route_list':rtl, 'MEDIA_URL':settings.BAKED_MEDIA_URL, 'IMAGES_URL':settings.BAKED_IMAGES_URL})
- t = render_to_string('bin/map_entry_list.html',c).encode('utf-8')
- fpath = '%s%s' %(settings.PROJ_ROOT,'media/js/mainmap.js')
- self.write_file(fpath,t)
- c = Context({'country_list':cl,'region_list':rl,'route_list':rtl,'MEDIA_URL':settings.BAKED_MEDIA_URL, 'IMAGES_URL':settings.BAKED_IMAGES_URL})
- t = render_to_string('bin/map_sidebar.html',c).encode('utf-8')
- fpath = '%s%s' %(settings.PROJ_ROOT,'templates/includes/map_sidebar.html')
- self.write_file(fpath,t)
-
- def build(self):
- self.build_map_templates()
- c = Context({'MEDIA_URL':settings.BAKED_MEDIA_URL,'IMAGES_URL':settings.BAKED_IMAGES_URL})
- t = render_to_string('archives/map.html', c).encode('utf-8')
- path = '%smap/' %(settings.BAKED_ROOT)
- if not os.path.isdir(path):
- os.makedirs(path)
- fpath = '%sindex.html' %(path)
- self.write_file(fpath,t)
-
-class BuildContact(Build):
- def build(self):
- c = Client()
- response = c.get('/contact/')
- path = '%scontact/' %(settings.BAKED_ROOT)
- if not os.path.isdir(path):
- os.makedirs(path)
- fpath = '%sindex.html' %(path)
- self.write_file(fpath,str(response.content))
-
class BuildProjects(Build):
-
def build(self):
self.build_project_archive()
self.build_project_details()
@@ -197,11 +157,7 @@ class BuildProjects(Build):
qs = get_model('projects', 'Project').objects.filter(status__exact=1).order_by('-pub_date')
c = Context({'object_list': qs,'MEDIA_URL':settings.BAKED_MEDIA_URL,'IMAGES_URL':settings.BAKED_IMAGES_URL})
t = render_to_string('archives/projects.html', c).encode('utf-8')
- path = '%sprojects/' %(settings.BAKED_ROOT)
- if not os.path.isdir(path):
- os.makedirs(path)
- fpath = '%sindex.html' %(path)
- self.write_file(fpath,t)
+ self.write_file('projects/',t)
def build_project_details(self):
projects = self.get_projects()
@@ -213,11 +169,9 @@ class BuildProjects(Build):
qs = model.objects.filter(status__exact=1)
c = Context({'object_list': qs,'MEDIA_URL':settings.BAKED_MEDIA_URL,'IMAGES_URL':settings.BAKED_IMAGES_URL})
t = render_to_string('details/%s.html' %(proj['slug']), c).encode('utf-8')
- path = '%sprojects/%s/' %(settings.BAKED_ROOT, proj['slug'])
- if not os.path.isdir(path):
- os.makedirs(path)
- fpath = '%sindex.html' %(path)
- self.write_file(fpath,t)
+ path = 'projects/%s/' %(proj['slug'])
+ self.write_file(path,t)
+
def build_project_data(self):
from projects.shortcuts import render_to_geojson
model = get_model('projects', 'NationalParks')
@@ -233,9 +187,74 @@ class BuildProjects(Build):
json = str(json)
json ="\n".join(json.splitlines()[3:])
#print json
- path = '%sprojects/data/' %(settings.BAKED_ROOT)
- if not os.path.isdir(path):
- os.makedirs(path)
+ path = 'projects/data/'
fpath = '%s%s.json' %(path, park.id)
self.write_file(fpath,json)
+class BuildSitemap(Build):
+ def build(self):
+ c = Client()
+ response = c.get('/sitemap.xml')
+ self.write_file('',str(response.content), 'xml','sitemap')
+
+class BuildWritingFeed(Build):
+ def build(self):
+ qs = Entry.objects.filter(status__exact=1).order_by('-pub_date')[:20]
+ c = Context({'object_list':qs,'SITE_URL':settings.SITE_URL})
+ t = render_to_string('feed.xml',c).encode('utf-8')
+ fpath = '%s' %('feed/',)
+ self.write_file(fpath,t,'xml')
+
+class BuildMap(Build):
+ def build(self):
+ qs = get_model('blog', 'entry').objects.filter(status__exact=1)
+ cl = get_model('locations', 'Country').objects.filter(visited=True).exclude(name='default')
+ rl = get_model('locations', 'Region').objects.all()
+ rtl = get_model('locations', 'Route').objects.all()
+ c = Context({'object_list':qs, 'country_list':cl,'region_list':rl, 'route_list':rtl, 'MEDIA_URL':settings.BAKED_MEDIA_URL, 'IMAGES_URL':settings.BAKED_IMAGES_URL})
+ t = render_to_string('archives/map_data.html',c).encode('utf-8')
+ self.write_file('media/js/',t, 'js','mainmap')
+ c = Context({'country_list':cl,'region_list':rl,'route_list':rtl,'MEDIA_URL':settings.BAKED_MEDIA_URL, 'IMAGES_URL':settings.BAKED_IMAGES_URL})
+ t = render_to_string('archives/map.html',c).encode('utf-8')
+ self.write_file('map/',t)
+
+class BuildPages(Build):
+ def build(self):
+ model = get_model('pages', 'page')
+ pages = model.objects.all()
+ for page in pages:
+ c = Context({'object':page,'SITE_URL':settings.SITE_URL, 'MEDIA_URL':settings.BAKED_MEDIA_URL,'IMAGES_URL':settings.BAKED_IMAGES_URL})
+ t = render_to_string('details/page.html',c).encode('utf-8')
+ s = render_to_string('details/page.txt',c).encode('utf-8')
+ fpath = '%s/' %(page.slug)
+ self.write_file(fpath,t)
+ self.write_file(fpath,s,'txt')
+
+
+
+class BuildContact(Build):
+ def build(self):
+ c = Client()
+ response = c.get('/contact/')
+ path = '%scontact/' %(settings.BAKED_ROOT)
+ if not os.path.isdir(path):
+ os.makedirs(path)
+ fpath = '%sindex.html' %(path)
+ self.write_file(fpath,str(response.content))
+
+class BuildAbout(Build):
+ def build(self):
+ model = get_model('chunks', 'Chunk')
+ qs = model.objects.filter(key__in=['about_top','about_middle','about_bottom'])
+ c = Context({
+ 'object_list': qs,
+ 'IMAGES_URL' : settings.BAKED_IMAGES_URL,
+ 'MEDIA_URL':settings.BAKED_MEDIA_URL
+ })
+ t = render_to_string('details/about.html',c).encode('utf-8')
+ path = '%sabout/' %(settings.BAKED_ROOT)
+ if not os.path.isdir(path):
+ os.makedirs(path)
+ fpath = '%sindex.html' %(path)
+ self.write_file(fpath,t)
+
diff --git a/app/lib/templatetags/templatetags/html5_datetime.py b/app/lib/templatetags/templatetags/html5_datetime.py
new file mode 100644
index 0000000..20b5f27
--- /dev/null
+++ b/app/lib/templatetags/templatetags/html5_datetime.py
@@ -0,0 +1,16 @@
+from django.utils import dateformat
+import datetime
+from django import template
+from django.utils.safestring import mark_safe
+register = template.Library()
+
+@register.filter
+def html5_datetime(value):
+ """
+ Adds to colons to django's "Z" format to match html5 guidelines
+ """
+ fmt = "Y-m-d\TH:i:sO"
+ value = value
+ str = dateformat.format(value, fmt)
+ s = str[:-2] + ':' + str[-2:]
+ return mark_safe(s)
diff --git a/app/pages/__init__.py b/app/pages/__init__.py
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/app/pages/__init__.py
diff --git a/app/pages/admin.py b/app/pages/admin.py
new file mode 100644
index 0000000..e1328e9
--- /dev/null
+++ b/app/pages/admin.py
@@ -0,0 +1,26 @@
+from django.contrib import admin
+from django import forms
+from pages.models import Page
+from django.conf import settings
+
+from django.forms import TextInput, Textarea
+from django.db import models
+class PageAdmin(admin.ModelAdmin):
+ formfield_overrides = {
+ models.TextField: {'widget': Textarea(attrs={'rows':25, 'cols':40})},
+ }
+ list_display = ('title', 'slug',)
+ search_fields = ['title', 'body_markdown']
+ prepopulated_fields = {"slug" : ('title',)}
+ fieldsets = (
+ ('Page', {
+ 'fields': ('title','body_markdown', 'slug'),
+ 'classes': ('show','extrapretty','wide')
+ }),
+ ('Metadata', {
+ 'classes': ('collapse closed',),
+ 'fields': ('meta_description',),
+ })
+ )
+
+admin.site.register(Page, PageAdmin)
diff --git a/app/pages/models.py b/app/pages/models.py
new file mode 100644
index 0000000..198e186
--- /dev/null
+++ b/app/pages/models.py
@@ -0,0 +1,41 @@
+import datetime
+from django.db import models
+from django.conf import settings
+from django.contrib.sitemaps import Sitemap
+
+from utils import markdown2 as markdown
+
+def markdown_processor(md):
+ return markdown.markdown(md, ['footnotes'],safe_mode = False)
+
+TEMPLATES = (
+ (0, 'single'),
+ (1, 'double'),
+ (2, 'single-dark'),
+ (3, 'double-dark'),
+ )
+
+class Page(models.Model):
+ title = models.CharField(max_length=200)
+ slug = models.SlugField()
+ body_html = models.TextField(blank=True)
+ body_markdown = models.TextField()
+ meta_description = models.CharField(max_length=256, null=True, blank=True)
+
+ def __unicode__(self):
+ return self.title
+
+ def get_absolute_url(self):
+ return "/%s/" % (self.slug)
+
+ def save(self):
+ #run markdown
+ self.body_html = markdown_processor(self.body_markdown)
+ super(Page, self).save()
+
+class PageSitemap(Sitemap):
+ changefreq = "never"
+ priority = 1.0
+
+ def items(self):
+ return Page.objects.all()
diff --git a/app/pages/views.py b/app/pages/views.py
new file mode 100644
index 0000000..016c2ed
--- /dev/null
+++ b/app/pages/views.py
@@ -0,0 +1,13 @@
+from django.shortcuts import render_to_response,get_object_or_404
+from django.template import RequestContext
+from django.conf import settings
+
+
+from pages.models import Page
+
+def page(request,slug):
+ obj = get_object_or_404(Page, slug__exact=slug)
+ context = { 'object': obj,}
+ return render_to_response('details/page.html', context, context_instance = RequestContext(request))
+
+
diff --git a/app/photos/models.py b/app/photos/models.py
index dcb3d8a..7b75397 100644
--- a/app/photos/models.py
+++ b/app/photos/models.py
@@ -39,7 +39,7 @@ class Photo(models.Model):
slideshowimage_height = models.CharField(max_length=4, blank=True, null=True)
slideshowimage_margintop = models.CharField(max_length=4, blank=True, null=True)
slideshowimage_marginleft = models.CharField(max_length=4, blank=True, null=True)
-
+ is_public = models.BooleanField(default=True)
class Meta:
diff --git a/app/projects/admin.py b/app/projects/admin.py
index 94c4780..13357b0 100644
--- a/app/projects/admin.py
+++ b/app/projects/admin.py
@@ -7,6 +7,7 @@ from django.conf import settings
from projects.models.base import Project
from projects.models.fiveby import FiveBy
from projects.models.natparks import NationalParks
+from projects.models.gifs import AnimatedGif
GMAP = GoogleMap(key=settings.GOOGLE_MAPS_API_KEY)
@@ -174,9 +175,17 @@ class CodeAdmin(admin.ModelAdmin):
fieldsets = (
(None, {'fields': ('name','date_created','slug','status','body_html')}),
)
-
-admin.site.register(Code, CodeAdmin)
+class AnimatedGifAdmin(admin.ModelAdmin):
+ list_display = ('title', 'date_created')
+ search_fields = ['title',]
+ fieldsets = (
+ (None, {'fields': ('title','gif','date_created','slug','music_ogg','music_mp3')}),
+ )
+
+
+admin.site.register(AnimatedGif, AnimatedGifAdmin)
+admin.site.register(Code, CodeAdmin)
admin.site.register(Project, ProjectAdmin)
admin.site.register(FiveBy, FiveByAdmin)
-admin.site.register(NationalParks, NationalParksAdmin) \ No newline at end of file
+admin.site.register(NationalParks, NationalParksAdmin)
diff --git a/app/projects/models/__init__.py b/app/projects/models/__init__.py
index 7fe6077..6f61282 100644
--- a/app/projects/models/__init__.py
+++ b/app/projects/models/__init__.py
@@ -1,4 +1,5 @@
from base import Project
from fiveby import FiveBy
from natparks import NationalParks
-from code import Code \ No newline at end of file
+from code import Code
+from gifs import AnimatedGif
diff --git a/app/projects/urls.py b/app/projects/urls.py
index 14722a8..83f07c7 100644
--- a/app/projects/urls.py
+++ b/app/projects/urls.py
@@ -11,6 +11,7 @@ projects = {
urlpatterns = patterns('',
(r'data/(?P<id>\d+)/$', 'projects.views.data_json'),
+ (r'gifs/(?P<slug>[-\w]+)/$', 'projects.views.gif_detail'),
(r'(?P<slug>[-\w]+)/$', 'projects.views.detail'),
(r'^$',list_detail.object_list, dict(projects, template_name='archives/projects.html')),
)
diff --git a/app/projects/views.py b/app/projects/views.py
index 64857a7..e25802b 100644
--- a/app/projects/views.py
+++ b/app/projects/views.py
@@ -9,6 +9,7 @@ from projects.shortcuts import render_to_geojson
from projects.models.base import Project
from projects.models.fiveby import FiveBy
from projects.models.natparks import NationalParks
+from projects.models.gifs import AnimatedGif
projects = {'5x5':'FiveBy','6x6':'SixBy','national-parks':'NationalParks','code':'Code'}
@@ -25,6 +26,10 @@ def detail(request,slug):
template = 'details/%s.html' %(slug)
return object_list(request, queryset=qs, template_name=template,)
+def gif_detail(request,slug):
+ obj = get_object_or_404(AnimatedGif, slug__exact=slug)
+ return render_to_response('details/gifs.html', {'object': obj}, context_instance=RequestContext(request))
+
def data_json(request, id):
qs = NationalParks.objects.filter(pk=id)
@@ -35,4 +40,4 @@ def data_json(request, id):
mimetype = 'application/json',
pretty_print=True
)
- \ No newline at end of file
+