projects
/
mediagoblin.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Normalize MediaFile.name (make it a foreignkey)
[mediagoblin.git]
/
mediagoblin
/
submit
/
forms.py
diff --git
a/mediagoblin/submit/forms.py
b/mediagoblin/submit/forms.py
index 200ce4e455989d3c984b746ab41cd50bd8839cae..7d9e8fcf83c299e3280485723e3cee718cb279ca 100644
(file)
--- a/
mediagoblin/submit/forms.py
+++ b/
mediagoblin/submit/forms.py
@@
-1,5
+1,5
@@
# GNU MediaGoblin -- federated, autonomous media hosting
# 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
#
# 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
@@
-17,8
+17,9
@@
import wtforms
import wtforms
-from mediagoblin.
util
import tag_length_validator
+from mediagoblin.
tools.text
import tag_length_validator
from mediagoblin.tools.translate import fake_ugettext_passthrough as _
from mediagoblin.tools.translate import fake_ugettext_passthrough as _
+from mediagoblin.tools.licenses import licenses_as_choices
class SubmitStartForm(wtforms.Form):
class SubmitStartForm(wtforms.Form):
@@
-27,7
+28,16
@@
class SubmitStartForm(wtforms.Form):
_('Title'),
[wtforms.validators.Length(min=0, max=500)])
description = wtforms.TextAreaField(
_('Title'),
[wtforms.validators.Length(min=0, max=500)])
description = wtforms.TextAreaField(
- _('Description of this work'))
+ _('Description of this work'),
+ description=_("""You can use
+ <a href="http://daringfireball.net/projects/markdown/basics">
+ Markdown</a> for formatting."""))
tags = wtforms.TextField(
_('Tags'),
tags = wtforms.TextField(
_('Tags'),
- [tag_length_validator])
+ [tag_length_validator],
+ description=_(
+ "Separate tags by commas."))
+ license = wtforms.SelectField(
+ _('License'),
+ [wtforms.validators.Optional(),],
+ choices=licenses_as_choices())