diff options
| -rw-r--r-- | app/figments/build.py | 12 | ||||
| -rw-r--r-- | app/figments/models.py | 26 | ||||
| -rw-r--r-- | design/templates/base.html | 8 | ||||
| -rw-r--r-- | design/templates/details/figments.html | 6 |
4 files changed, 35 insertions, 17 deletions
diff --git a/app/figments/build.py b/app/figments/build.py index 58835e5..349a399 100644 --- a/app/figments/build.py +++ b/app/figments/build.py @@ -22,18 +22,6 @@ class BuildFigments(Build): s = render_to_string('details/note.txt', c).encode('utf-8') self.write_file(path, s, 'txt', entry.slug) - def build_detail_epub(self): - ''' - Grab all the notes, render them to a template string and write that out to the filesystem - ''' - for entry in Figment.objects.filter(status__exact=1): - c = Context({'object': entry, 'MEDIA_URL': settings.BAKED_MEDIA_URL, 'IMAGES_URL': settings.BAKED_IMAGES_URL, 'SITE_URL':settings.SITE_URL}) - t = render_to_string('details/fignments.html', c).encode('utf-8') - path = 'figments/' - self.write_file(path, t, 'html', entry.slug) - s = render_to_string('details/note.txt', c).encode('utf-8') - self.write_file(path, s, 'txt', entry.slug) - def build_archive(self): path = 'figments/' c = Context({ diff --git a/app/figments/models.py b/app/figments/models.py index 510bd61..858c6ed 100644 --- a/app/figments/models.py +++ b/app/figments/models.py @@ -2,6 +2,8 @@ import datetime from django.db import models from django.contrib.sitemaps import Sitemap from django.contrib.syndication.views import Feed +from django.db.models.signals import post_save +from django.dispatch import receiver # http://freewisdom.org/projects/python-markdown/ @@ -53,6 +55,20 @@ class Figment(models.Model): def get_series(self): return "\n".join([s.title for s in self.series.all()]) + @classmethod + def from_db(cls, db, field_names, values): + # default implementation of from_db() (could be replaced + # with super()) + if cls._deferred: + instance = cls(**zip(field_names, values)) + else: + instance = cls(*values) + instance._state.adding = False + instance._state.db = db + # customization to store the original field values on the instance + instance._loaded_values = dict(zip(field_names, values)) + return instance + def save(self, *args, **kwargs): if not self.id and not self.pub_date: self.pub_date = datetime.datetime.now() @@ -60,6 +76,16 @@ class Figment(models.Model): super(Figment, self).save() +from .ebook import generate_epub_file + +@receiver(post_save, sender=Figment) +def post_save_events(sender, instance, **kwargs): + if instance.body_markdown != instance._loaded_values['body_markdown']: + print("you updated") + generate_epub_file(instance) + else: + print("no update found, not buidling") + class LatestFull(Feed): title = "luxagraf figments: stories less literally true." diff --git a/design/templates/base.html b/design/templates/base.html index 47659d1..6ccd931 100644 --- a/design/templates/base.html +++ b/design/templates/base.html @@ -34,12 +34,12 @@ </header> <nav role="navigation" class="bl"> <ul> - <li id="stories"><a href="/jrnl/" title="What we've been up to lately">Journal</a></li> - <!--<li id="adventura"><a href="/adventures" title="Our past and current adventures">Adventures</a></li>--> - <li id="photos"><a href="/photos/" title="Photos from travels around the world">Photos</a></li> + <li id="laverdad"><a href="/jrnl/" title="What we've been up to lately">Journal</a></li> + <!--<li id="nota"><a href="/field-notes/" title="Our past and current adventures">Notes</a></li>--> + <li id="fotos"><a href="/photos/" title="Photos from travels around the world">Photos</a></li> <li id="maps"><a href="/map" title="Maps">Map</a></li> <li id="projects" ><a href="/projects/" title="Projects">Projects</a></li> - <li id="etc" class="last"><a href="/about" title="About Luxagraf">About Us</a></li> + <li id="etc" class="last"><a href="/about" title="About Luxagraf">About</a></li> </ul> </nav> </div> diff --git a/design/templates/details/figments.html b/design/templates/details/figments.html index 1f8bfc7..46ac234 100644 --- a/design/templates/details/figments.html +++ b/design/templates/details/figments.html @@ -1,7 +1,11 @@ {% extends 'base.html' %} {% load typogrify_tags %} -{% block primary %} +{% block primary %}<ul class="bl" id="breadcrumbs" itemscope itemtype="http://data-vocabulary.org/Breadcrumb"> + <li><a href="/" title="luxagraf homepage" itemprop="url"><span itemprop="title">Home</span></a> → </li> + <li><a href="/figments/" title="Figments" itemprop="url"><span itemprop="title">Figments</span></a> → </li> + <li>{{object.title}}</li> + </ul> <main role="main"> <article class="h-entry hentry post--article{% with object.get_template_name_display as t %}{%if t == "double" or t == "double-dark" %} post--article--double{%endif%}{%endwith%}" itemscope itemType="http://schema.org/Article"> <header id="header" class="post--header {% with object.get_template_name_display as t %}{%if t == "double" or t == "double-dark" %}post--header--double{%endif%}{%endwith%}"> |