aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJakob Kramer <jakob.kramer@gmx.de>2012-07-07 21:37:46 +0200
committerJoar Wandborg <git@wandborg.com>2012-07-07 21:44:04 +0200
commit62b7d1b287ece7596c54829b20a6e079ef09e3f5 (patch)
tree50c3f1a80b2967b83593a8065f4287c0c76c682b
parentf4cc3a9d52c68aaf2a81b01af6dc78ce93ffb59e (diff)
downloadmediagoblin-62b7d1b287ece7596c54829b20a6e079ef09e3f5.tar.lz
mediagoblin-62b7d1b287ece7596c54829b20a6e079ef09e3f5.tar.xz
mediagoblin-62b7d1b287ece7596c54829b20a6e079ef09e3f5.zip
put attachments into sidebar
also added {% trans %} tags
-rw-r--r--mediagoblin/templates/mediagoblin/user_pages/media.html48
1 files changed, 26 insertions, 22 deletions
diff --git a/mediagoblin/templates/mediagoblin/user_pages/media.html b/mediagoblin/templates/mediagoblin/user_pages/media.html
index 21990442..15ac4988 100644
--- a/mediagoblin/templates/mediagoblin/user_pages/media.html
+++ b/mediagoblin/templates/mediagoblin/user_pages/media.html
@@ -93,28 +93,6 @@
{% autoescape False %}
<p>{{ media.description_html }}</p>
{% endautoescape %}
- {% if media.attachment_files|count %}
- <h3>Attachments</h3>
- <ul>
- {% for attachment in media.attachment_files %}
- <li>
- <a href="{{ request.app.public_store.file_url(attachment.filepath) }}">
- {{ attachment.name }}
- </a>
- </li>
- {% endfor %}
- </ul>
- {% endif %}
- {% if app_config['allow_attachments']
- and request.user
- and (media.uploader == request.user._id
- or request.user.is_admin) %}
- <p>
- <a href="{{ request.urlgen('mediagoblin.edit.attachments',
- user=media.get_uploader.username,
- media=media._id) }}">Add attachment</a>
- </p>
- {% endif %}
{% if comments %}
<a
{% if not request.user %}
@@ -185,6 +163,32 @@
{% include "mediagoblin/utils/exif.html" %}
+ {% if media.attachment_files|count %}
+ <h3>{% trans %}Attachments{% endtrans %}</h3>
+ <ul>
+ {% for attachment in media.attachment_files %}
+ <li>
+ <a href="{{ request.app.public_store.file_url(attachment.filepath) }}">
+ {{ attachment.name }}
+ </a>
+ </li>
+ {% endfor %}
+ </ul>
+ {% endif %}
+ {% if app_config['allow_attachments']
+ and request.user
+ and (media.uploader == request.user._id
+ or request.user.is_admin) %}
+ {% if not media.attachment_files|count %}
+ <h3>{% trans %}Attachments{% endtrans %}</h3>
+ {% endif %}
+ <p>
+ <a href="{{ request.urlgen('mediagoblin.edit.attachments',
+ user=media.get_uploader.username,
+ media=media._id) }}">{% trans %}Add attachment{% endtrans %}</a>
+ </p>
+ {% endif %}
+
{% block mediagoblin_sidebar %}
{% endblock %}
</div>