diff options
author | Jef van Schendel <mail@jefvanschendel.nl> | 2012-02-12 16:30:21 +0100 |
---|---|---|
committer | Jef van Schendel <mail@jefvanschendel.nl> | 2012-02-12 16:30:21 +0100 |
commit | c6498b26be26a03fd80f15a5a80f04fcb5a7c5a7 (patch) | |
tree | faa53a60b69f3153ab07daef282a9763e57de3b8 | |
parent | 1fccaf4a81fbbe8c064b91d23a42ad04930caa4e (diff) | |
download | mediagoblin-c6498b26be26a03fd80f15a5a80f04fcb5a7c5a7.tar.lz mediagoblin-c6498b26be26a03fd80f15a5a80f04fcb5a7c5a7.tar.xz mediagoblin-c6498b26be26a03fd80f15a5a80f04fcb5a7c5a7.zip |
Move Attachments from sidebar to default pane
-rw-r--r-- | mediagoblin/templates/mediagoblin/user_pages/media.html | 46 |
1 files changed, 23 insertions, 23 deletions
diff --git a/mediagoblin/templates/mediagoblin/user_pages/media.html b/mediagoblin/templates/mediagoblin/user_pages/media.html index f1a1a5c5..1a2038bd 100644 --- a/mediagoblin/templates/mediagoblin/user_pages/media.html +++ b/mediagoblin/templates/mediagoblin/user_pages/media.html @@ -74,7 +74,29 @@ </h2> {% autoescape False %} <p>{{ media.description_html }}</p> - {% endautoescape %} + {% 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 %} <p class="media_specs"> {% trans date=media.created.strftime("%Y-%m-%d") -%} Added on {{ date }}. @@ -157,28 +179,6 @@ {% endif %} </div> <div class="media_sidebar"> - {% 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 media.tags %} {% include "mediagoblin/utils/tags.html" %} {% endif %} |