diff options
| author | Elrond <elrond+mediagoblin.org@samba-tng.org> | 2013-02-13 00:02:56 +0100 |
|---|---|---|
| committer | Elrond <elrond+mediagoblin.org@samba-tng.org> | 2013-02-13 00:02:56 +0100 |
| commit | b4ea20fa98d2ef9a25be6b964e2b9509c32d60d0 (patch) | |
| tree | ecea040820b98dbd04117d4f4967c054ce4c96f1 | |
| parent | fc6616ed26496f112246f5945d8f37ef1d854da3 (diff) | |
| download | mediagoblin-b4ea20fa98d2ef9a25be6b964e2b9509c32d60d0.tar.lz mediagoblin-b4ea20fa98d2ef9a25be6b964e2b9509c32d60d0.tar.xz mediagoblin-b4ea20fa98d2ef9a25be6b964e2b9509c32d60d0.zip | |
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.
| -rw-r--r-- | mediagoblin/templates/mediagoblin/user_pages/media_collect.html | 11 | ||||
| -rw-r--r-- | 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> |