From a5c62483c96590448494cb247b14424d123b58a0 Mon Sep 17 00:00:00 2001
From: Otto Naderer <otto.naderer@aec.at>
Date: Thu, 11 Jan 2018 21:36:41 +0100
Subject: [PATCH] introduced mistune markdown parser for articles tweaked media
 serving settings for devel server

---
 blogapp/views.py     |   8 ++++++++
 db.sqlite3           | Bin 188416 -> 192512 bytes
 imageapp/admin.py    |   2 +-
 polysite/settings.py |   3 +++
 static/general.css   |   2 +-
 5 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/blogapp/views.py b/blogapp/views.py
index 4ef418f..93a9bd1 100644
--- a/blogapp/views.py
+++ b/blogapp/views.py
@@ -3,6 +3,11 @@ from django.shortcuts import render, get_object_or_404
 from django.template import RequestContext
 from django import forms
 import datetime
+import mistune
+
+class CustomRenderer(mistune.Renderer):
+    def image(self, src, title, alt_text):
+        return '<div id="textimg"><img src="' + src + '"/><br>Title: ' + title + '<br>Alt: ' + alt_text + '</div>'
 
 class BlogCommentForm(forms.Form):
     guestname = forms.CharField()
@@ -16,6 +21,9 @@ def listall(request):
 
 def detail(request, blogentry_id):
     blogdetail = get_object_or_404(blogentry, pk=blogentry_id)
+    renderer = CustomRenderer()
+    md = mistune.Markdown(renderer = renderer, hard_wrap = True)
+    blogdetail.body = md(blogdetail.body)
 
     form = BlogCommentForm()
     context = {'blogentry': blogdetail, 'commentform': form}
diff --git a/db.sqlite3 b/db.sqlite3
index 92cace203cb88ce65690d8bbd7fa212791ae93ee..5387b9ae63a21339767c6bca450f6abe48414bc4 100644
GIT binary patch
delta 2142
zcmb`IacJCB9LMwC-F3a(rLTv~!G<p0WVY4j@{-G4F5RYeR{t1N*(SnuWq0ePcVSI(
zOLFUK-EJN2K-i#DBtr%&2!gEWak3!((b+K&9nMWhm1!sQA4NpeKlBe}zND)RI$4<u
z$(LX9e!tKAz26JJcj!#)(08$^HOw}OqEh7H$ODddWWlyZVU7b)xA;1|=ans~B1kl+
zQ_ojh06I^h^UXwI7D)nFL7^To8tvXu(QKC7Mb=SmhaEI^T{Rp|;IZ7z<8D5~Vys|Z
z5i!#Q)ezeZe?Gl-)xubs#iAnSl(fucWEl&5^W$GOytg`mPEzP3nnM@Sr|2A-K_8$d
znnrJ<H$D0da1ix`Ls5{3gaCl;fuca$0%Zb?2O0~M4m28Qt2_5D=w6>drzrFn`UCxj
zenvl_@6kN^8hwc_pijtrXV8b}G-{wzWT}Ud5KQJvyD!L>HeVQD;=aUup?!(^((296
zfc5R`6Z9-al0S$xpw_m}+K#sMF+VcL7#zPGAC2D^`zWTyqV#NI`~<zKFA=2>jy@cX
z_Tt^cX8A@H-3wR2z4fJ~lsKFfL{ZMSldu%n4oFxpyTh;l<0P8xGaPFa_Kzh8D@CKM
zmXZoPmK@U5;gU_v{^V}6G@2YZa9{xb%a&N4SFl8OisP{$$Wk8NVAuaYoa}R2NoN%v
z6L?xq3;DL?Ctklz<_mDbmpP1O!p}3yhcAO&R|G-fB`%kfb0W^i?<!ouIYkmUk>>?o
z%ExZSuHVsq22~;OG}%vCPUCEzz7>2K?E2E5Wf3l9IWa5B86h9NL->EOc}2pUl$LQ8
z@65N}O}I!(q6nDFq|-Pjdwug@CgFvjg^=}H+Tr!Jk;pMBa;!0KN7m4jq$S>Ty<Y(|
zC8mySxwhG>W#HxryKWundliALsKt_MF*HLzQ6s&utE*UZRK2Uqd*%v!4b%&TLUq)s
zm<B^@hQsPb&FJW4=rM+7$yGA9o4V>$G^5<n*|YG?Qk|M*usnG^z|bU~p`UZu5zW?E
z)zEadSYrEi&A0ZE_o6<~QE{BAt)x<=Qkg54J0D^9`k5G}?O5KCjc^aBKhR$>_o)`?
z)BBwTf8wrL*045MaX8zoS%d13X_ZyZP@NR9YI@3cMu$~9Rkci88z#XiO)r*Jn~X08
z?jjAx<f=xQO)ee<PDN!kz5I~PmQ;Jt(yEST8cERU{<;bN9VP`$oqi043-NHQm1>)1
zCgM-VS{vhk(jA9;!jY{Lk>09Y%wW+Tk#v4UDA(}FD8FZDH?agfT+Lb)_tZ4J{%CN9
zVELvqBq!!1`EXAtfQ;}~2JaE%{X)&yx3`)x?H7uMQ5=-hnlx0Z*#TtXAX<R%nV^SA
zayBb@6VvbzjE9j<p>L3mUPfMHd;mTDU}!72U3OvL>2|Y+d?)wlG-TZ?Gq97)G)bXr
z=q!2*O*Y1BXw&_nUa;7mmo75Abol1<L+;rNu(!Fg@Dn;dwbC8C3MbuN-;(vPEJM5V
z8{tF?NB%rw_g;eMPJabEfY<T`d=Y@nUOfjz=uKUQD}XyQ2V306CAiv~xd@*E#Bmi2
g7#?9D;J%ZEQy~KKc5Z~P0`K=tFbdq4uELRj0Bh(<>;M1&

delta 432
zcmZ{fKS%;$7{<Tv^}IWkyH||}3hIK0BD_mYEs^LCP7#f*S7R*=4NY-^G=zf^@wFK>
zhLj!jZ7I1pRhvU$e~F+XXlW_xiq;-@hL;}?@AFvKKC9}>cPJBt5Z&>w3VjJWQ8pVo
zmDyYoS~jMPIV#yDV|K|FmOi=;Ex~UK=cTT;L?|2yg$K28A{mJ#qeFT;>?ms2UsDI7
zgbjiX-nmUzv5=o(jeQylO4ua$f$#W+FZhUe*t7#?9eJ}td;LL4O%tr(DyC3YPt}~7
zE@uo?PD>twhG&2UE@&&CZ_=H>u3&0h@B`J{;sOyD${ADi**@weQDbfD%EPx}FzM#U
zF(^`&Pl201J;NqtU!(BJtQ4q%GgUtt1HqI*$rANM$(A!K3eT3n0vV7KyhQGl+e4wp
zHBDKr1RA@jK)(ZP1aGnCK#r_-2IH<}U1KlLV2PThcoi>m{$@p8`?+}c4J^9&`aMj#
gz(Iu(Xy?UYhy$-afJ9mG0lNQk|Mv~B+$$`91H}r4pa1{>

diff --git a/imageapp/admin.py b/imageapp/admin.py
index 2b5364c..4542ba7 100644
--- a/imageapp/admin.py
+++ b/imageapp/admin.py
@@ -10,7 +10,7 @@ class BlogImageAdminForm(forms.ModelForm):
 
 class BlogImageAdmin(admin.ModelAdmin):
 	form = BlogImageAdminForm
-	list_display = ('date', )
+	list_display = ('id', 'caption')
 
 admin.site.register(BlogImage, BlogImageAdmin)
 
diff --git a/polysite/settings.py b/polysite/settings.py
index 0bbe9e6..fd27e4f 100644
--- a/polysite/settings.py
+++ b/polysite/settings.py
@@ -128,3 +128,6 @@ STATIC_URL = '/static/'
 STATICFILES_DIRS = [
     os.path.join(BASE_DIR, "static"),
 ]
+
+MEDIA_ROOT = os.path.join(BASE_DIR, "media")
+MEDIA_URL = 'http://127.0.0.1:8000/media/'
diff --git a/static/general.css b/static/general.css
index 63ffb57..74b3519 100644
--- a/static/general.css
+++ b/static/general.css
@@ -44,7 +44,7 @@ div#main{
 	padding-top: 1em;
 }
 
-img#intext{
+div#textimg{
 	padding-top:1em;
 
 	display: block;