diff options
| author | Caleb Forbes Davis V <caldavis@gmail.com> | 2011-08-11 00:50:16 -0500 |
|---|---|---|
| committer | Caleb Forbes Davis V <caldavis@gmail.com> | 2011-08-11 00:50:16 -0500 |
| commit | f6bf68cae5f2907924e126a3a2f3a2f015292323 (patch) | |
| tree | 3eb9fb19c26235477a196297863a671349b0b331 | |
| parent | f64e5250906401a3d5a5fc587521bc31e146859c (diff) | |
| download | mediagoblin-f6bf68cae5f2907924e126a3a2f3a2f015292323.tar.lz mediagoblin-f6bf68cae5f2907924e126a3a2f3a2f015292323.tar.xz mediagoblin-f6bf68cae5f2907924e126a3a2f3a2f015292323.zip | |
Feature #446 - Render the submission form using the render_divs macro
- Currently there are individual calls to wtforms_util.render_field_div
for each field in the media submit form, which is too verbose
- Matched the field ordering in submit/form.py to the verbose version
- hacks the correct textareafield rendering with hard-coded rows and
columns.
- TODO - figure out how to pass the textarea dimensions with **kwargs
| -rw-r--r-- | mediagoblin/submit/forms.py | 2 | ||||
| -rw-r--r-- | mediagoblin/templates/mediagoblin/submit/start.html | 5 | ||||
| -rw-r--r-- | mediagoblin/templates/mediagoblin/utils/wtforms.html | 6 |
3 files changed, 7 insertions, 6 deletions
diff --git a/mediagoblin/submit/forms.py b/mediagoblin/submit/forms.py index 241d32dc..4519b057 100644 --- a/mediagoblin/submit/forms.py +++ b/mediagoblin/submit/forms.py @@ -22,11 +22,11 @@ from mediagoblin.util import fake_ugettext_passthrough as _ class SubmitStartForm(wtforms.Form): + file = wtforms.FileField(_('File')) title = wtforms.TextField( _('Title'), [wtforms.validators.Length(min=0, max=500)]) description = wtforms.TextAreaField('Description of this work') - file = wtforms.FileField(_('File')) tags = wtforms.TextField( _('Tags'), [tag_length_validator]) diff --git a/mediagoblin/templates/mediagoblin/submit/start.html b/mediagoblin/templates/mediagoblin/submit/start.html index eb34c2e2..3a40850d 100644 --- a/mediagoblin/templates/mediagoblin/submit/start.html +++ b/mediagoblin/templates/mediagoblin/submit/start.html @@ -24,10 +24,7 @@ method="POST" enctype="multipart/form-data"> <div class="grid_8 prefix_1 suffix_1 form_box"> <h1>{% trans %}Submit yer media{% endtrans %}</h1> - {{ wtforms_util.render_field_div(submit_form.file) }} - {{ wtforms_util.render_field_div(submit_form.title) }} - {{ wtforms_util.render_textarea_div(submit_form.description) }} - {{ wtforms_util.render_field_div(submit_form.tags) }} + {{ wtforms_util.render_divs(submit_form) }} <div class="form_submit_buttons"> <input type="submit" value="{% trans %}Submit{% endtrans %}" class="button" /> </div> diff --git a/mediagoblin/templates/mediagoblin/utils/wtforms.html b/mediagoblin/templates/mediagoblin/utils/wtforms.html index e3d8e137..3b6cff15 100644 --- a/mediagoblin/templates/mediagoblin/utils/wtforms.html +++ b/mediagoblin/templates/mediagoblin/utils/wtforms.html @@ -23,7 +23,11 @@ {% if field.description -%} <div class="form_field_description">{{ _(field.description) }}</div> {%- endif %} - <div class="form_field_input">{{ field }}</div> + {% if field.type == "TextAreaField" %} + <div class="form_field_input">{{ field(rows=8, cols=20) }}</div> + {% else %} + <div class="form_field_input">{{ field }}</div> + {% endif %} {%- if field.errors -%} {% for error in field.errors %} <div class="form_field_error"> |