Merge remote branch 'remotes/aaronw/feature410_markdown_bio'

mediagoblin/db/models.py

@@ -46,7 +46,8 @@ class User(Document):
         'verification_key': unicode,
         'is_admin': bool,
         'url' : unicode,
-        'bio' : unicode
+        'bio' : unicode,     # May contain markdown
+        'bio_html': unicode, # May contain plaintext, or HTML
         }
 
     required_fields = ['username', 'created', 'pw_hash', 'email']

mediagoblin/edit/views.py

@@ -101,6 +101,10 @@ def edit_profile(request):
     if request.method == 'POST' and form.validate():
             user['url'] = request.POST['url']
             user['bio'] = request.POST['bio']
+
+            md = markdown.Markdown(safe_mode = 'escape')
+            user['bio_html'] = clean_html(md.convert(user['bio']))
+
             user.save()
 
             messages.add_message(request, 

mediagoblin/templates/mediagoblin/utils/profile.html

@@ -18,9 +18,9 @@
 
 {% block profile_content -%}
   {% if user.bio %}
-    <p>
-      {{ user.bio }}
-    </p>
+    {% autoescape False %}
+    <p>{{ user.bio_html }}</p>
+    {% endautoescape %}
   {% endif %}
   {% if user.url %}
     <p>