X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=mediagoblin%2Fedit%2Fforms.py;h=e2882adad02d41440a0c621c4edae6a19d88a3d0;hb=e17525189943a091468541b93a357a64c32e2b51;hp=c5ab9fd94f3390f2c9aa9ec6f45c40266406fe19;hpb=7dc3a66f924c734cbee68677e84f5b656eefe280;p=mediagoblin.git

diff --git a/mediagoblin/edit/forms.py b/mediagoblin/edit/forms.py
index c5ab9fd9..e2882ada 100644
--- a/mediagoblin/edit/forms.py
+++ b/mediagoblin/edit/forms.py
@@ -1,5 +1,5 @@
 # GNU MediaGoblin -- federated, autonomous media hosting
-# Copyright (C) 2011 Free Software Foundation, Inc
+# 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
@@ -14,33 +14,63 @@
 # You should have received a copy of the GNU Affero General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-
 import wtforms
 
-from mediagoblin.util import tag_length_validator, TOO_LONG_TAG_WARNING
-from mediagoblin.util import fake_ugettext_passthrough as _
-
+from mediagoblin.tools.text import tag_length_validator, TOO_LONG_TAG_WARNING
+from mediagoblin.tools.translate import fake_ugettext_passthrough as _
+from mediagoblin.tools.licenses import licenses_as_choices
 
 class EditForm(wtforms.Form):
     title = wtforms.TextField(
         _('Title'),
         [wtforms.validators.Length(min=0, max=500)])
-    slug = wtforms.TextField(
-        _('Slug'),
-        [wtforms.validators.Required(message=_("The slug can't be empty"))])
-    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'),
-        [tag_length_validator])
+        [tag_length_validator],
+        description=_(
+            "Separate tags by commas."))
+    slug = wtforms.TextField(
+        _('Slug'),
+        [wtforms.validators.Required(message=_("The slug can't be empty"))],
+        description=_(
+            "The title part of this media's address. "
+            "You usually don't need to change this."))
+    license = wtforms.SelectField(
+        _('License'),
+        [wtforms.validators.Optional(),],
+        choices=licenses_as_choices())
 
 class EditProfileForm(wtforms.Form):
     bio = wtforms.TextAreaField(
         _('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(
         _('Website'),
         [wtforms.validators.Optional(),
-         wtforms.validators.URL(message='Improperly formed URL')])
+         wtforms.validators.URL(message=_("This address contains errors"))])
+
+
+class EditAccountForm(wtforms.Form):
+    old_password = wtforms.PasswordField(
+        _('Old password'),
+        description=_(
+            "Enter your old password to prove you own this account."))
+    new_password = wtforms.PasswordField(
+        _('New password'),
+        [wtforms.validators.Length(min=6, max=30)],
+        id="password")
+    wants_comment_notification = wtforms.BooleanField(
+        _(''),
+        description=_("Email me when others comment on my media"))
+
 
 class EditAttachmentsForm(wtforms.Form):
     attachment_name = wtforms.TextField(