From b4ea20fa98d2ef9a25be6b964e2b9509c32d60d0 Mon Sep 17 00:00:00 2001
From: Elrond <elrond+mediagoblin.org@samba-tng.org>
Date: Wed, 13 Feb 2013 00:02:56 +0100
Subject: [PATCH] Add markdown notice to collection description.

Use wtforms_util.render_field_div on the collection
description, so that the markdown notice in the wtform is
actually rendered to html.
---
 .../mediagoblin/user_pages/media_collect.html         | 11 ++---------
 mediagoblin/templates/mediagoblin/utils/wtforms.html  |  2 +-
 2 files changed, 3 insertions(+), 10 deletions(-)

diff --git a/mediagoblin/templates/mediagoblin/user_pages/media_collect.html b/mediagoblin/templates/mediagoblin/user_pages/media_collect.html
index 8cdb64fe..8b19e8c0 100644
--- a/mediagoblin/templates/mediagoblin/user_pages/media_collect.html
+++ b/mediagoblin/templates/mediagoblin/user_pages/media_collect.html
@@ -57,8 +57,7 @@
       </div>
 
       <div id="new_collection" class="subform">
-
-      <h3>{% trans %}Add a new collection{% endtrans %}</h3>
+        <h3>{% trans %}Add a new collection{% endtrans %}</h3>
 
       <p class="form_field_label"> 
 	<label for="{{ (form.collection_title.name) }}">{{ _(form.collection_title.label.text) }}</label>
@@ -66,13 +65,7 @@
       <div class="form_field_input">
 	{{ form.collection_title }}
       </div>
-      <p class="form_field_label"> 
-	<label for="{{ (form.collection_description.name) }}">{{ _(form.collection_description.label.text) }}</label>
-      </p>
-      <div class="form_field_input">
-	{{ form.collection_description }}
-      </div>	
-
+        {{- wtforms_util.render_field_div(form.collection_description) }}
       </div>
       <p class="form_field_label"> 
 	<label for="{{ (form.note.name) }}">{{ _(form.note.label.text) }}</label>
diff --git a/mediagoblin/templates/mediagoblin/utils/wtforms.html b/mediagoblin/templates/mediagoblin/utils/wtforms.html
index 58ecb8e0..df2354ed 100644
--- a/mediagoblin/templates/mediagoblin/utils/wtforms.html
+++ b/mediagoblin/templates/mediagoblin/utils/wtforms.html
@@ -28,7 +28,7 @@
         <p class="form_field_error">{{ _(error) }}</p>
       {% endfor %}
     {%- endif %}
-    {% if field.description -%}
+    {%- if field.description %}
       <p class="form_field_description">{{ _(field.description)|safe }}</p>
     {%- endif %}
   </div>
-- 
2.25.1