Merge remote-tracking branch 'refs/remotes/rodney757/issue643' into mergetest

[mediagoblin.git] / mediagoblin / user_pages / forms.py

diff --git a/mediagoblin/user_pages/forms.py b/mediagoblin/user_pages/forms.py
index bf4566309d4b6feb514cf8b3675e9f869da740b3..9a1936805500f6cfda70204575e68651160f0046 100644 (file)
--- a/mediagoblin/user_pages/forms.py
+++ b/mediagoblin/user_pages/forms.py
@@ -1,5 +1,5 @@
 # GNU MediaGoblin -- federated, autonomous media hosting
-# Copyright (C) 2011 MediaGoblin contributors.  See AUTHORS.
+# Copyright (C) 2011, 2012 MediaGoblin contributors.  See AUTHORS.
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License as published by
@@ -15,16 +15,37 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 import wtforms
-
-from mediagoblin.util import fake_ugettext_passthrough as _
-
+from wtforms.ext.sqlalchemy.fields import QuerySelectField
+from mediagoblin.tools.translate import lazy_pass_to_ugettext as _
 
 class MediaCommentForm(wtforms.Form):
     comment_content = wtforms.TextAreaField(
         _('Comment'),
-        [wtforms.validators.Required()])
-
+        [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('I am sure I want to delete this',
-                                [wtforms.validators.Required()])
+    confirm = wtforms.BooleanField(
+        _('I am sure I want to delete this'))
+
+class ConfirmCollectionItemRemoveForm(wtforms.Form):
+    confirm = wtforms.BooleanField(
+        _('I am sure I want to remove this item from the collection'))
+
+class MediaCollectForm(wtforms.Form):
+    collection = QuerySelectField(
+        _('Collection'),
+        allow_blank=True, blank_text=_('-- Select --'), get_label='title',)
+    note = wtforms.TextAreaField(
+        _('Include a note'),
+        [wtforms.validators.Optional()],)
+    collection_title = wtforms.TextField(
+        _('Title'),
+        [wtforms.validators.Length(min=0, max=500)])
+    collection_description = wtforms.TextAreaField(
+        _('Description of this collection'),
+        description=_("""You can use
+                      <a href="http://daringfireball.net/projects/markdown/basics">
+                      Markdown</a> for formatting."""))