From 79e2baa696508317f9dc6edd1648e14907b6d542 Mon Sep 17 00:00:00 2001
From: Otto Naderer <otto.naderer@aec.at>
Date: Mon, 24 Oct 2016 18:43:54 +0200
Subject: [PATCH] added blog entry categories

---
 blogapp/admin.py                         | 13 ++++++++++++-
 blogapp/models.py                        |  9 +++++++++
 blogapp/templates/blogapp/blogindex.html |  4 +++-
 static/general.css                       |  2 +-
 4 files changed, 25 insertions(+), 3 deletions(-)

diff --git a/blogapp/admin.py b/blogapp/admin.py
index 547ccfe..0fc6575 100644
--- a/blogapp/admin.py
+++ b/blogapp/admin.py
@@ -1,6 +1,6 @@
 from django import forms
 from django.forms import ModelForm, Textarea
-from blogapp.models import blogentry, blogcomment
+from blogapp.models import blogentry, blogcomment, blogcategory
 from django.contrib import admin
 
 class blogentryAdminForm(forms.ModelForm):
@@ -12,6 +12,12 @@ class blogentryAdminForm(forms.ModelForm):
             'body': forms.Textarea(attrs={'cols': 80, 'rows': 20}),
         }
 
+
+class blogcategoryAdminForm(forms.ModelForm):
+    class Meta:
+        model = blogcategory
+        fields = '__all__'
+
 class blogentryAdmin(admin.ModelAdmin):
 	form = blogentryAdminForm
 	list_display = ('header', )
@@ -19,5 +25,10 @@ class blogentryAdmin(admin.ModelAdmin):
 class blogcommentAdmin(admin.ModelAdmin):
 	list_display = ('date', )
 
+class blogcategoryAdmin(admin.ModelAdmin):
+    form = blogentryAdminForm
+    list_display = ('name',)
+
 admin.site.register(blogentry, blogentryAdmin)
 admin.site.register(blogcomment, blogcommentAdmin)
+admin.site.register(blogcategory, blogcategoryAdmin)
diff --git a/blogapp/models.py b/blogapp/models.py
index 53058ee..2b870e0 100644
--- a/blogapp/models.py
+++ b/blogapp/models.py
@@ -1,12 +1,21 @@
 from django.db import models
 from django.contrib.auth.models import User
 
+class blogcategory(models.Model):
+    name = models.CharField(max_length=100)
+
+    def __str__(self):
+        return self.name
+
+
+
 class blogentry(models.Model):
     user = models.ForeignKey(User)
     date = models.DateTimeField('date')
     header = models.CharField(max_length=100)
     intro = models.CharField(max_length=1000)
     body = models.CharField(max_length=10000)
+    categories = models.ManyToManyField('blogcategory')
     published = models.BooleanField(default=False)
 
 class blogcomment(models.Model):
diff --git a/blogapp/templates/blogapp/blogindex.html b/blogapp/templates/blogapp/blogindex.html
index 53f7015..4dd35e6 100644
--- a/blogapp/templates/blogapp/blogindex.html
+++ b/blogapp/templates/blogapp/blogindex.html
@@ -10,7 +10,9 @@
 {% if blogentry.published %}
 <h1>{{ blogentry.header }}</h1>
 <small>posted on: {{blogentry.date}} by {{blogentry.user.username}}</small>
-<p>{{blogentry.intro|linebreaks}}</p><a href="{% url 'detail' blogentry.id %}">Read more...</a><br/>
+<p>{{blogentry.intro|linebreaks}}
+<small>Filed under: {% for category in blogentry.categories.all %} {{ category }} {% endfor %}</small>
+</p><a href="{% url 'detail' blogentry.id %}">Read more...</a><br/>
 {% endif %}
 {% endfor %}
 {% else %}
diff --git a/static/general.css b/static/general.css
index d9f4cff..63ffb57 100644
--- a/static/general.css
+++ b/static/general.css
@@ -46,7 +46,7 @@ div#main{
 
 img#intext{
 	padding-top:1em;
-	padding-bottom:1em;
+
 	display: block;
 	margin-left: auto;
 	margin-right: auto;