Merge branch 'master' into navigation

[philo.git] / contrib / penfield / admin.py

diff --git a/contrib/penfield/admin.py b/contrib/penfield/admin.py
index efe13e4..5faf4ef 100644 (file)
--- a/contrib/penfield/admin.py
+++ b/contrib/penfield/admin.py
@@ -1,6 +1,6 @@
-from models import BlogEntry, Blog, BlogView
 from django.contrib import admin
-from philo.admin import EntityAdmin
+from philo.admin import EntityAdmin, AddTagAdmin
+from philo.contrib.penfield.models import BlogEntry, Blog, BlogView, Newsletter, NewsletterArticle, NewsletterIssue, NewsletterView
 
 
 class TitledAdmin(EntityAdmin):
@@ -12,14 +12,34 @@ class BlogAdmin(TitledAdmin):
        pass
 
 
-class BlogEntryAdmin(TitledAdmin):
-       pass
+class BlogEntryAdmin(TitledAdmin, AddTagAdmin):
+       filter_horizontal = ['tags']
 
 
 class BlogViewAdmin(EntityAdmin):
        pass
 
 
+class NewsletterAdmin(TitledAdmin):
+       pass
+
+
+class NewsletterArticleAdmin(TitledAdmin, AddTagAdmin):
+       filter_horizontal = TitledAdmin.filter_horizontal + ('tags', 'authors')
+
+
+class NewsletterIssueAdmin(TitledAdmin):
+       filter_horizontal = TitledAdmin.filter_horizontal + ('articles',)
+
+
+class NewsletterViewAdmin(EntityAdmin):
+       pass
+
+
 admin.site.register(Blog, BlogAdmin)
 admin.site.register(BlogEntry, BlogEntryAdmin)
-admin.site.register(BlogView, BlogViewAdmin)
\ No newline at end of file
+admin.site.register(BlogView, BlogViewAdmin)
+admin.site.register(Newsletter, NewsletterAdmin)
+admin.site.register(NewsletterArticle, NewsletterArticleAdmin)
+admin.site.register(NewsletterIssue, NewsletterIssueAdmin)
+admin.site.register(NewsletterView, NewsletterViewAdmin)
\ No newline at end of file