aboutsummaryrefslogtreecommitdiffstats
path: root/mediagoblin/templates
diff options
context:
space:
mode:
authorjpope <jpope@jpope.org>2014-01-06 15:19:14 -0600
committerjpope <jpope@jpope.org>2014-01-06 15:19:14 -0600
commit45842f840f7d3c89aa4eff45c4f88f9d4b2162b9 (patch)
tree9ddaac35a528bd2a4227fa55c482f7d35de8fa6e /mediagoblin/templates
parent3bb58e6f0a10a81bd19d6a89b6f092b54afa52c9 (diff)
downloadmediagoblin-45842f840f7d3c89aa4eff45c4f88f9d4b2162b9.tar.lz
mediagoblin-45842f840f7d3c89aa4eff45c4f88f9d4b2162b9.tar.xz
mediagoblin-45842f840f7d3c89aa4eff45c4f88f9d4b2162b9.zip
migrate media page to skeleton
Diffstat (limited to 'mediagoblin/templates')
-rw-r--r--mediagoblin/templates/mediagoblin/user_pages/media.html15
1 files changed, 9 insertions, 6 deletions
diff --git a/mediagoblin/templates/mediagoblin/user_pages/media.html b/mediagoblin/templates/mediagoblin/user_pages/media.html
index 81e5013e..4c2323cf 100644
--- a/mediagoblin/templates/mediagoblin/user_pages/media.html
+++ b/mediagoblin/templates/mediagoblin/user_pages/media.html
@@ -32,9 +32,9 @@
{% template_hook("media_head") %}
{% endblock mediagoblin_head %}
-
{% block mediagoblin_content %}
- <p class="context">
+<div class="row hell">
+ <p class="eleven columns context">
{%- trans user_url=request.urlgen(
'mediagoblin.user_pages.user_home',
user=media.get_uploader.username),
@@ -42,8 +42,11 @@
❖ Browsing media by <a href="{{user_url}}">{{username}}</a>
{%- endtrans -%}
</p>
- {% include "mediagoblin/utils/prev_next.html" %}
- <div class="media_pane">
+ <div class="five columns">
+ {% include "mediagoblin/utils/prev_next.html" %}
+ </div>
+</div>
+ <div class="media_pane eleven columns">
<div class="media_image_container">
{% block mediagoblin_media %}
{% set display_media = request.app.public_store.file_url(
@@ -161,8 +164,8 @@
{{ render_pagination(request, pagination,
media.url_for_self(request.urlgen)) }}
{% endif %}
- </div>
- <div class="media_sidebar">
+ </div><!--end media_pane-->
+ <div class="five columns media_sidebar">
<h3>{% trans %}Added{% endtrans %}</h3>
<p><span title="{{ media.created.strftime("%I:%M%p %Y-%m-%d") }}">
{%- trans formatted_time=timesince(media.created) -%}