Switch the import of the image media manager over to the new class

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

diff --git a/mediagoblin/edit/forms.py b/mediagoblin/edit/forms.py
index d310c18f72f0bbe4da3f7f9c4208d1decd7b3f37..e0147a0c0ad1ad27acd3788bb8d8a3e74f865466 100644 (file)
--- a/mediagoblin/edit/forms.py
+++ b/mediagoblin/edit/forms.py
@@ -16,9 +16,11 @@
 
 import wtforms
 
-from mediagoblin.tools.text import tag_length_validator, TOO_LONG_TAG_WARNING
-from mediagoblin.tools.translate import fake_ugettext_passthrough as _
+from mediagoblin.tools.text import tag_length_validator
+from mediagoblin.tools.translate import lazy_pass_to_ugettext as _
 from mediagoblin.tools.licenses import licenses_as_choices
+from mediagoblin.auth.forms import normalize_user_or_email_field
+
 
 class EditForm(wtforms.Form):
     title = wtforms.TextField(
@@ -55,21 +57,25 @@ class EditProfileForm(wtforms.Form):
     url = wtforms.TextField(
         _('Website'),
         [wtforms.validators.Optional(),
-         wtforms.validators.URL(message="""This address contains errors""")])
+         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")
+    new_email = wtforms.TextField(
+        _('New email address'),
+        [wtforms.validators.Optional(),
+         normalize_user_or_email_field(allow_user=False)])
     wants_comment_notification = wtforms.BooleanField(
-        _('Comment notification?'),
-        description=_("Check this box to be emailed when someone else comments on your media."))
+        label='',
+        description=_("Email me when others comment on my media"))
+    license_preference = wtforms.SelectField(
+        _('License preference'),
+        [
+            wtforms.validators.Optional(),
+            wtforms.validators.AnyOf([lic[0] for lic in licenses_as_choices()]),
+        ],
+        choices=licenses_as_choices(),
+        description=_('This will be your default license on upload forms.'))
 
 
 class EditAttachmentsForm(wtforms.Form):
@@ -77,3 +83,32 @@ class EditAttachmentsForm(wtforms.Form):
         'Title')
     attachment_file = wtforms.FileField(
         'File')
+
+class EditCollectionForm(wtforms.Form):
+    title = wtforms.TextField(
+        _('Title'),
+        [wtforms.validators.Length(min=0, max=500), wtforms.validators.Required(message=_("The title can't be empty"))])
+    description = wtforms.TextAreaField(
+        _('Description of this collection'),
+        description=_("""You can use
+                      <a href="http://daringfireball.net/projects/markdown/basics">
+                      Markdown</a> for formatting."""))
+    slug = wtforms.TextField(
+        _('Slug'),
+        [wtforms.validators.Required(message=_("The slug can't be empty"))],
+        description=_(
+            "The title part of this collection's address. "
+            "You usually don't need to change this."))
+
+
+class ChangePassForm(wtforms.Form):
+    old_password = wtforms.PasswordField(
+        _('Old password'),
+        [wtforms.validators.Required()],
+        description=_(
+            "Enter your old password to prove you own this account."))
+    new_password = wtforms.PasswordField(
+        _('New password'),
+        [wtforms.validators.Required(),
+         wtforms.validators.Length(min=6, max=30)],
+        id="password")