diff options
Diffstat (limited to 'mediagoblin')
| -rw-r--r-- | mediagoblin/app.py | 5 | ||||
| -rw-r--r-- | mediagoblin/i18n/en/LC_MESSAGES/mediagoblin.po | 2 | ||||
| -rw-r--r-- | mediagoblin/templates/mediagoblin/user_pages/media.html | 25 | ||||
| -rw-r--r-- | mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html | 2 |
4 files changed, 19 insertions, 15 deletions
diff --git a/mediagoblin/app.py b/mediagoblin/app.py index 0f25a4e5..a72b9306 100644 --- a/mediagoblin/app.py +++ b/mediagoblin/app.py @@ -21,7 +21,8 @@ import routes from webob import Request, exc from mediagoblin import routing, middleware -from mediagoblin.tools import common, translate, template, response +from mediagoblin.tools import common, translate, template +from mediagoblin.tools.response import render_404 from mediagoblin.tools import request as mg_request from mediagoblin.mg_globals import setup_globals from mediagoblin.init.celery import setup_celery_from_config @@ -150,7 +151,7 @@ class MediaGoblinApp(object): # Okay, no matches. 404 time! request.matchdict = {} # in case our template expects it - return response.render_404(request)(environ, start_response) + return render_404(request)(environ, start_response) controller = common.import_component(route_match['controller']) request.start_response = start_response diff --git a/mediagoblin/i18n/en/LC_MESSAGES/mediagoblin.po b/mediagoblin/i18n/en/LC_MESSAGES/mediagoblin.po index 5f1b95bc..c6ed08d7 100644 --- a/mediagoblin/i18n/en/LC_MESSAGES/mediagoblin.po +++ b/mediagoblin/i18n/en/LC_MESSAGES/mediagoblin.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PROJECT VERSION\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2011-10-03 21:04-0400\n" +"POT-Creation-Date: 2011-10-03 21:29-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" diff --git a/mediagoblin/templates/mediagoblin/user_pages/media.html b/mediagoblin/templates/mediagoblin/user_pages/media.html index 433f74dc..2c1b7c82 100644 --- a/mediagoblin/templates/mediagoblin/user_pages/media.html +++ b/mediagoblin/templates/mediagoblin/user_pages/media.html @@ -65,17 +65,7 @@ <br /> <h3>{% trans %}Comments{% endtrans %}</h3> - {% if request.user %} - <form action="{{ request.urlgen('mediagoblin.user_pages.media_post_comment', - user= media.uploader().username, - media=media._id) }}" method="POST"> - {{ wtforms_util.render_divs(comment_form) }} - <div class="form_submit_buttons"> - <input type="submit" value="{% trans %}Post comment!{% endtrans %}" class="button" /> - {{ csrf_token }} - </div> - </form> - {% endif %} + <p><a href="#comment_form">{% trans %}Post a comment{% endtrans %}</a></p> {% if comments %} {% for comment in comments %} @@ -108,6 +98,19 @@ </div> {% endfor %} + {% if request.user %} + <a name="comment_form"></a> + <form action="{{ request.urlgen('mediagoblin.user_pages.media_post_comment', + user= media.uploader().username, + media=media._id) }}" method="POST"> + {{ wtforms_util.render_divs(comment_form) }} + <div class="form_submit_buttons"> + <input type="submit" value="{% trans %}Post comment!{% endtrans %}" class="button" /> + {{ csrf_token }} + </div> + </form> + {% endif %} + {{ render_pagination(request, pagination, request.urlgen('mediagoblin.user_pages.media_home', user = media.uploader().username, diff --git a/mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html b/mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html index dd6923a9..8da90f79 100644 --- a/mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html +++ b/mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html @@ -41,7 +41,7 @@ <p class="delete_checkbox_box"> {{ form.confirm }} - {{ _(form.confirm.label.text) }} + <label for="{{ (form.confirm.name) }}">{{ _(form.confirm.label.text) }}</label> </p> <div class="form_submit_buttons"> |