Layout overhaul time!

2 files changed, 31 insertions, 31 deletions

diff --git a/mediagoblin/templates/mediagoblin/user_pages/media.html b/mediagoblin/templates/mediagoblin/user_pages/media.html
index d2503a4e..01dba596 100644
--- a/mediagoblin/templates/mediagoblin/user_pages/media.html
+++ b/mediagoblin/templates/mediagoblin/user_pages/media.html
@@ -41,6 +41,13 @@
 
 {% block mediagoblin_content %}
   <div class="media_pane">
+    {% trans user_url=request.urlgen(
+                'mediagoblin.user_pages.user_home',
+                user=media.get_uploader.username),
+                username=media.get_uploader.username -%}
+      <p class="context">❖ Browsing media by <a href="{{ user_url }}">{{ username }}</a></p>
+    {%- endtrans %}
+    {% include "mediagoblin/utils/prev_next.html" %}
     <div class="media_image_container">
       {% block mediagoblin_media %}
         {% set display_media = request.app.public_store.file_url(
@@ -148,15 +155,6 @@
       {{ render_pagination(request, pagination,
                  media.url_for_self(request.urlgen)) }}
     {% endif %}
-  </div>
-  <div class="media_sidebar">
-    {% trans user_url=request.urlgen(
-                'mediagoblin.user_pages.user_home',
-                user=media.get_uploader.username),
-                username=media.get_uploader.username -%}
-      <p>❖ Browsing media by <a href="{{ user_url }}">{{ username }}</a></p>
-    {%- endtrans %}  
-    {% include "mediagoblin/utils/prev_next.html" %}
     {% if media.attachment_files|count %}
       <h3>Attachments</h3>
       <ul>
diff --git a/mediagoblin/templates/mediagoblin/utils/prev_next.html b/mediagoblin/templates/mediagoblin/utils/prev_next.html
index d0cf3f8c..f1175ce4 100644
--- a/mediagoblin/templates/mediagoblin/utils/prev_next.html
+++ b/mediagoblin/templates/mediagoblin/utils/prev_next.html
@@ -21,26 +21,28 @@
 {% set next_entry_url = media.url_to_next(request.urlgen) %}
 
 {% if prev_entry_url or next_entry_url %}
-  {# There are no previous entries for the very first media entry #}
-  {% if prev_entry_url %}
-    <a class="navigation_button navigation_left" href="{{ prev_entry_url }}">
-      &larr; {% trans %}newer{% endtrans %}
-    </a>
-  {% else %}
-    {# This is the first entry. display greyed-out 'previous' image #}
-    <p class="navigation_button navigation_left">
-      &larr; {% trans %}newer{% endtrans %}
-    </p>
-  {% endif %}
-  {# Likewise, this could be the very last media entry #}
-  {% if next_entry_url %}
-    <a class="navigation_button" href="{{ next_entry_url }}">
-      {% trans %}older{% endtrans %} &rarr;
-    </a>
-  {% else %}
-    {# This is the last entry. display greyed-out 'next' image #}
-    <p class="navigation_button">
-      {% trans %}older{% endtrans %} &rarr;
-    </p>
-  {% endif %}
+  <div class="navigation">
+   {# There are no previous entries for the very first media entry #}
+    {% if prev_entry_url %}
+      <a class="navigation_button navigation_left" href="{{ prev_entry_url }}">
+        &larr; {% trans %}newer{% endtrans %}
+      </a>
+    {% else %}
+      {# This is the first entry. display greyed-out 'previous' image #}
+      <p class="navigation_button navigation_left">
+        &larr; {% trans %}newer{% endtrans %}
+      </p>
+    {% endif %}
+    {# Likewise, this could be the very last media entry #}
+    {% if next_entry_url %}
+      <a class="navigation_button" href="{{ next_entry_url }}">
+        {% trans %}older{% endtrans %} &rarr;
+      </a>
+    {% else %}
+      {# This is the last entry. display greyed-out 'next' image #}
+      <p class="navigation_button">
+        {% trans %}older{% endtrans %} &rarr;
+      </p>
+    {% endif %}
+  </div>
 {% endif %}