X-Git-Url: http://git.ithinksw.org/philo.git/blobdiff_plain/f423a5130b54cd17f1f8990e7ab242496d3e3657..eb0a6631378eac6a857d9a8e71c58610aae22e67:/contrib/penfield/models.py

diff --git a/contrib/penfield/models.py b/contrib/penfield/models.py
index 4eb76ae..12a19f8 100644
--- a/contrib/penfield/models.py
+++ b/contrib/penfield/models.py
@@ -7,17 +7,37 @@ from django.template import RequestContext
 from datetime import datetime
 
 
-class TitledContent(models.Model):
+class Titled(models.Model):
 	title = models.CharField(max_length=255)
 	slug = models.SlugField()
+	
+	def __unicode__(self):
+		return self.title
+	
+	class Meta:
+		abstract = True
+
+
+class Blog(Entity, Titled):
+	pass
+
+
+class BlogEntry(Entity, Titled):
+	blog = models.ForeignKey(Blog, related_name='entries')
+	author = models.ForeignKey(User, related_name='blogentries')
+	date = models.DateTimeField(default=datetime.now)
 	content = models.TextField()
 	excerpt = models.TextField()
 	
 	class Meta:
-		abstract = True
+		ordering = ['date']
+		verbose_name_plural = "Blog Entries"
+
 
+register_value_model(BlogEntry)
 
-class Blog(MultiNode):
+
+class BlogNode(MultiNode):
 	PERMALINK_STYLE_CHOICES = (
 		('D', 'Year, month, and day'),
 		('M', 'Year and month'),
@@ -26,7 +46,7 @@ class Blog(MultiNode):
 		('N', 'No base')
 	)
 	
-	title = models.CharField(max_length=255)
+	blog = models.ForeignKey(Blog, related_name='nodes')
 	
 	index_template = models.ForeignKey(Template, related_name='blog_index_related')
 	archive_template = models.ForeignKey(Template, related_name='blog_archive_related')
@@ -74,23 +94,24 @@ class Blog(MultiNode):
 		return base_patterns + entry_patterns
 	
 	def index_view(self, request):
-		return HttpResponse(self.index_template.django_template.render(RequestContext(request, {'blog': self})), mimetype=self.index_template.mimetype)
+		return HttpResponse(self.index_template.django_template.render(RequestContext(request, {'blog': self.blog})), mimetype=self.index_template.mimetype)
 	
 	def archive_view(self, request, year=None, month=None, day=None):
-		entries = self.entries.all()
+		entries = self.blog.entries.all()
 		if year:
 			entries = entries.filter(date__year=year)
 		if month:
 			entries = entries.filter(date__month=month)
 		if day:
 			entries = entries.filter(date__day=day)
-		return HttpResponse(self.archive_template.django_template.render(RequestContext(request, {'blog': self, 'year': year, 'month': month, 'day': day, 'entries': entries})), mimetype=self.archive_template.mimetype)
+		return HttpResponse(self.archive_template.django_template.render(RequestContext(request, {'blog': self.blog, 'year': year, 'month': month, 'day': day, 'entries': entries})), mimetype=self.archive_template.mimetype)
 	
 	def tag_view(self, request, tag=None):
-		return HttpResponse(self.tag_template.django_template.render(RequestContext(request, {'blog': self, 'tag': tag, 'entries': None})), mimetype=self.tag_template.mimetype)
+		# return HttpResponse(self.tag_template.django_template.render(RequestContext(request, {'blog': self.blog, 'tag': tag, 'entries': None})), mimetype=self.tag_template.mimetype)
+		raise Http404
 	
 	def entry_view(self, request, slug, year=None, month=None, day=None):
-		entries = self.entries.all()
+		entries = self.blog.entries.all()
 		if year:
 			entries = entries.filter(date__year=year)
 		if month:
@@ -101,13 +122,19 @@ class Blog(MultiNode):
 			entry = entries.get(slug=slug)
 		except:
 			raise Http404
-		return HttpResponse(self.entry_template.django_template.render(RequestContext(request, {'blog': self, 'entry': entry})), mimetype=self.entry_template.mimetype)
+		return HttpResponse(self.entry_template.django_template.render(RequestContext(request, {'blog': self.blog, 'entry': entry})), mimetype=self.entry_template.mimetype)
 
 
-class BlogEntry(Entity, TitledContent):
-	blog = models.ForeignKey(Blog, related_name='entries')
-	author = models.ForeignKey(User, related_name='blogentries')
+class Newsletter(Entity, Titled):
+	pass
+
+
+class NewsStory(Entity, Titled):
+	newsletter = models.ForeignKey(Newsletter, related_name='stories')
+	authors = models.ManyToManyField(User, related_name='newsstories')
 	date = models.DateTimeField(default=datetime.now)
+	lede = models.TextField(null=True, blank=True)
+	full_text = models.TextField()
 
 
-register_value_model(BlogEntry)
\ No newline at end of file
+register_value_model(NewsStory)
\ No newline at end of file