diff options
| author | Christopher Allan Webber <cwebber@dustycloud.org> | 2013-05-10 16:33:52 -0500 |
|---|---|---|
| committer | Christopher Allan Webber <cwebber@dustycloud.org> | 2013-05-10 16:33:52 -0500 |
| commit | 94fadafe0908e497b9562f6e2689d83d07c5147d (patch) | |
| tree | a7d0b33e7e99139fda43f151dae3d9702a957383 /mediagoblin/templates | |
| parent | 0dfa20c984c9e60b02ea9d68db179109028cbe2b (diff) | |
| parent | 99338b6a6419e6d8c044b82b2dd398a435e477f0 (diff) | |
| download | mediagoblin-94fadafe0908e497b9562f6e2689d83d07c5147d.tar.lz mediagoblin-94fadafe0908e497b9562f6e2689d83d07c5147d.tar.xz mediagoblin-94fadafe0908e497b9562f6e2689d83d07c5147d.zip | |
Merge remote-tracking branch 'refs/remotes/dthompson/453_disable_comments'
Diffstat (limited to 'mediagoblin/templates')
| -rw-r--r-- | mediagoblin/templates/mediagoblin/user_pages/media.html | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/mediagoblin/templates/mediagoblin/user_pages/media.html b/mediagoblin/templates/mediagoblin/user_pages/media.html index 7dea3f09..6d32d009 100644 --- a/mediagoblin/templates/mediagoblin/user_pages/media.html +++ b/mediagoblin/templates/mediagoblin/user_pages/media.html @@ -43,7 +43,7 @@ {%- endtrans -%} </p> {% include "mediagoblin/utils/prev_next.html" %} - <div class="media_pane"> + <div class="media_pane"> <div class="media_image_container"> {% block mediagoblin_media %} {% set display_media = request.app.public_store.file_url( @@ -71,7 +71,7 @@ {{ media.title }} </h2> {% if request.user and - (media.uploader == request.user.id or + (media.uploader == request.user.id or request.user.is_admin) %} {% set edit_url = request.urlgen('mediagoblin.edit.edit_media', user= media.get_uploader.username, @@ -90,11 +90,13 @@ {% if not request.user %} href="{{ request.urlgen('mediagoblin.auth.login') }}" {% endif %} - class="button_action" id="button_addcomment" title="Add a comment"> - {% trans %}Add a comment{% endtrans %} + {% if app_config['allow_comments'] %} + class="button_action" id="button_addcomment" title="Add a comment"> + {% trans %}Add a comment{% endtrans %} + {% endif %} </a> {% if request.user %} - <form action="{{ request.urlgen('mediagoblin.user_pages.media_post_comment', + <form action="{{ request.urlgen('mediagoblin.user_pages.media_post_comment', user= media.get_uploader.username, media_id=media.id) }}" method="POST" id="form_comment"> {{ wtforms_util.render_divs(comment_form) }} @@ -160,7 +162,7 @@ {% include "mediagoblin/utils/license.html" %} {% include "mediagoblin/utils/exif.html" %} - + {%- if media.attachment_files|count %} <h3>{% trans %}Attachments{% endtrans %}</h3> <ul> |