heckyel/mediagoblin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add Markdown for submit page, edit page, profile edit page; thus fixing ticket #690

Browse Source
This commit is contained in:
Jef van Schendel 2012-01-04 17:48:16 +01:00
parent 8545cfc97d
commit 9c196287ad
4 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
mediagoblin/edit/forms.py
View File

@ -23,7 +23,11 @@ class EditForm(wtforms.Form):
title = wtforms.TextField( title = wtforms.TextField(
_('Title'), _('Title'),
[wtforms.validators.Length(min=0, max=500)]) [wtforms.validators.Length(min=0, max=500)])
description = wtforms.TextAreaField('Description of this work') description = wtforms.TextAreaField(
_('Description of this work'),
description=_("""You can use
<a href="http://daringfireball.net/projects/markdown/basics">
Markdown</a> for formatting."""))
tags = wtforms.TextField( tags = wtforms.TextField(
_('Tags'), _('Tags'),
[tag_length_validator], [tag_length_validator],
@ -40,7 +44,11 @@ class EditForm(wtforms.Form):
class EditProfileForm(wtforms.Form): class EditProfileForm(wtforms.Form):
bio = wtforms.TextAreaField( bio = wtforms.TextAreaField(
_('Bio'), _('Bio'),
[wtforms.validators.Length(min=0, max=500)]) [wtforms.validators.Length(min=0, max=500)],
description=_(
"""You can use
<a href="http://daringfireball.net/projects/markdown/basics">
Markdown</a> for formatting."""))
url = wtforms.TextField( url = wtforms.TextField(
_('Website'), _('Website'),
[wtforms.validators.Optional(), [wtforms.validators.Optional(),

5
mediagoblin/submit/forms.py
View File

@ -27,7 +27,10 @@ class SubmitStartForm(wtforms.Form):
_('Title'), _('Title'),
[wtforms.validators.Length(min=0, max=500)]) [wtforms.validators.Length(min=0, max=500)])
description = wtforms.TextAreaField( description = wtforms.TextAreaField(
_('Description of this work')) _('Description of this work'),
description=_("""You can use
<a href="http://daringfireball.net/projects/markdown/basics">
Markdown</a> for formatting."""))
tags = wtforms.TextField( tags = wtforms.TextField(
_('Tags'), _('Tags'),
[tag_length_validator], [tag_length_validator],

2
mediagoblin/templates/mediagoblin/user_pages/media.html
View File

@ -96,7 +96,7 @@
user= media.get_uploader.username, user= media.get_uploader.username,
media=media._id) }}" method="POST" id="form_comment"> media=media._id) }}" method="POST" id="form_comment">
<p> <p>
{% trans %}Type your comment here. You can use <a href="http://daringfireball.net/projects/markdown/basics" target="_blank">Markdown</a> for formatting.{% endtrans %} {% trans %}Type your comment here. You can use <a href="http://daringfireball.net/projects/markdown/basics">Markdown</a> for formatting.{% endtrans %}
</p> </p>
{{ wtforms_util.render_divs(comment_form) }} {{ wtforms_util.render_divs(comment_form) }}
<div class="form_submit_buttons"> <div class="form_submit_buttons">

2
mediagoblin/templates/mediagoblin/utils/wtforms.html
View File

@ -29,7 +29,7 @@
{% endfor %} {% endfor %}
{%- endif %} {%- endif %}
{% if field.description -%} {% if field.description -%}
<p class="form_field_description">{{ _(field.description) }}</p> <p class="form_field_description">{{ _(field.description)|safe }}</p>
{%- endif %} {%- endif %}
</div> </div>
{%- endmacro %} {%- endmacro %}