From 55a04f01b881830f164e8a1b0a695dead6cddba3 Mon Sep 17 00:00:00 2001
From: Joar Wandborg <joar@wandborg.se>
Date: Tue, 22 Jan 2013 14:38:53 +0100
Subject: [PATCH] Moved MediaComment form descriptions to apt. place

---
 mediagoblin/templates/mediagoblin/user_pages/media.html | 3 ---
 mediagoblin/user_pages/forms.py                         | 7 +++++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/mediagoblin/templates/mediagoblin/user_pages/media.html b/mediagoblin/templates/mediagoblin/user_pages/media.html
index 29d7874c..7e184257 100644
--- a/mediagoblin/templates/mediagoblin/user_pages/media.html
+++ b/mediagoblin/templates/mediagoblin/user_pages/media.html
@@ -105,9 +105,6 @@
         <form action="{{ request.urlgen('mediagoblin.user_pages.media_post_comment', 
                                          user= media.get_uploader.username,
                                          media_id=media.id) }}" method="POST" id="form_comment">
-          <p>
-            {% trans %}You can use <a href="http://daringfireball.net/projects/markdown/basics">Markdown</a> for formatting.{% endtrans %}
-          </p>
           {{ wtforms_util.render_divs(comment_form) }}
           <div class="form_submit_buttons">
             <input type="submit" value="{% trans %}Add this comment{% endtrans %}" class="button_action" />
diff --git a/mediagoblin/user_pages/forms.py b/mediagoblin/user_pages/forms.py
index 9e8ccf01..c7398d84 100644
--- a/mediagoblin/user_pages/forms.py
+++ b/mediagoblin/user_pages/forms.py
@@ -20,8 +20,11 @@ from mediagoblin.tools.translate import fake_ugettext_passthrough as _
 
 class MediaCommentForm(wtforms.Form):
     comment_content = wtforms.TextAreaField(
-        '',
-        [wtforms.validators.Required()])
+        _('Comment'),
+        [wtforms.validators.Required()],
+        description=_(u'You can use '
+                      u'<a href="http://daringfireball.net/projects/markdown/basics">'
+                      u'Markdown</a> for formatting.'))
 
 class ConfirmDeleteForm(wtforms.Form):
     confirm = wtforms.BooleanField(
-- 
2.25.1