X-Git-Url: http://git.ithinksw.org/philo.git/blobdiff_plain/ff326d8f22115f25ee8fb449447b1d77b5f5a1e0..bae6b1cbc5eb00d2273c45b55ea0950949fce0a9:/contrib/penfield/models.py?ds=sidebyside

diff --git a/contrib/penfield/models.py b/contrib/penfield/models.py
index ae62c33..8d6de3c 100644
--- a/contrib/penfield/models.py
+++ b/contrib/penfield/models.py
@@ -1,39 +1,33 @@
 from django.db import models
-from philo.models import Entity, MultiNode, Template, register_value_model
-from django.contrib.auth.models import User
+from django.conf import settings
+from philo.models import Tag, Titled, Entity, MultiView, Template, register_value_model
 from django.conf.urls.defaults import url, patterns
 from django.http import Http404, HttpResponse
 from django.template import RequestContext
 from datetime import datetime
 
 
-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')
+	author = models.ForeignKey(getattr(settings, 'PHILO_PERSON_MODULE', 'auth.User'), related_name='blogentries')
 	date = models.DateTimeField(default=datetime.now)
 	content = models.TextField()
 	excerpt = models.TextField()
+	tags = models.ManyToManyField(Tag)
+	
+	class Meta:
+		ordering = ['-date']
+		verbose_name_plural = "Blog Entries"
 
 
 register_value_model(BlogEntry)
 
 
-class BlogNode(MultiNode):
+class BlogView(MultiView):
 	PERMALINK_STYLE_CHOICES = (
 		('D', 'Year, month, and day'),
 		('M', 'Year and month'),
@@ -90,7 +84,8 @@ class BlogNode(MultiNode):
 		return base_patterns + entry_patterns
 	
 	def index_view(self, request):
-		return HttpResponse(self.index_template.django_template.render(RequestContext(request, {'blog': self.blog})), mimetype=self.index_template.mimetype)
+		entries = self.blog.entries.order_by('-date')
+		return HttpResponse(self.index_template.django_template.render(RequestContext(request, {'blog': self.blog, 'entries': entries})), mimetype=self.index_template.mimetype)
 	
 	def archive_view(self, request, year=None, month=None, day=None):
 		entries = self.blog.entries.all()
@@ -125,12 +120,12 @@ class Newsletter(Entity, Titled):
 	pass
 
 
-class NewsStory(Entity, Titled):
+class NewsletterArticle(Entity, Titled):
 	newsletter = models.ForeignKey(Newsletter, related_name='stories')
-	authors = models.ManyToManyField(User, related_name='newsstories')
+	authors = models.ManyToManyField(getattr(settings, 'PHILO_PERSON_MODULE', 'auth.User'), related_name='newsstories')
 	date = models.DateTimeField(default=datetime.now)
 	lede = models.TextField(null=True, blank=True)
 	full_text = models.TextField()
 
 
-register_value_model(NewsStory)
\ No newline at end of file
+register_value_model(NewsletterArticle)
\ No newline at end of file