diff options
| author | Nathan Yergler <nathan@yergler.net> | 2011-10-01 12:08:58 -0700 |
|---|---|---|
| committer | Nathan Yergler <nathan@yergler.net> | 2011-10-01 12:08:58 -0700 |
| commit | 6bfbe0242653678c09258b7a642514d706153eac (patch) | |
| tree | d3e0c7f94f566886a6b80ce98d8a003465f4368f /mediagoblin/edit/forms.py | |
| parent | 0a8a3fc1571100aba3bd3a3dec98f5e9e252780b (diff) | |
| parent | 573aba86b58c2ab064d0d57ed0bbae6bdf9a2819 (diff) | |
| download | mediagoblin-6bfbe0242653678c09258b7a642514d706153eac.tar.lz mediagoblin-6bfbe0242653678c09258b7a642514d706153eac.tar.xz mediagoblin-6bfbe0242653678c09258b7a642514d706153eac.zip | |
Merge remote-tracking branch 'refs/remotes/upstream/master' into 569-application-middleware
Conflicts:
mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html
Diffstat (limited to 'mediagoblin/edit/forms.py')
| -rw-r--r-- | mediagoblin/edit/forms.py | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/mediagoblin/edit/forms.py b/mediagoblin/edit/forms.py index 7bf3c6a8..f81d58b2 100644 --- a/mediagoblin/edit/forms.py +++ b/mediagoblin/edit/forms.py @@ -25,13 +25,17 @@ 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') tags = wtforms.TextField( _('Tags'), [tag_length_validator]) + slug = wtforms.TextField( + _('Slug'), + [wtforms.validators.Required(message=_("The slug can't be empty"))], + description=_( + "The title part of this media's URL. " + "You usually don't need to change this.")) + class EditProfileForm(wtforms.Form): bio = wtforms.TextAreaField( @@ -42,6 +46,7 @@ class EditProfileForm(wtforms.Form): [wtforms.validators.Optional(), wtforms.validators.URL(message='Improperly formed URL')]) + class EditAttachmentsForm(wtforms.Form): attachment_name = wtforms.TextField( 'Title') |