Restore sidebar

diff --git a/mediagoblin/static/css/base.css b/mediagoblin/static/css/base.css
index 04ab18402a88ca31e0e810a7411f8c82ca507bb4..2f36ed48cd44fa044e54d8b197ecd7bc2f980b70 100644 (file)
--- a/mediagoblin/static/css/base.css
+++ b/mediagoblin/static/css/base.css
@@ -150,21 +150,19 @@ footer {
   clear: both;
 }
 
-/* TEMP removal -> permanent removal should also be done in html!
 .media_pane {
-  width: 640px;
+  width: 560px;
   margin-left: 0px;
   margin-right: 10px;
   float: left;  
 }
-*/
 
 img.media_image {
   width: 100%;
 }
 
 .media_sidebar {
-  width: 280px;
+  width: 240px;
   margin-left: 10px;
   margin-right: 0px;
   float: left;

diff --git a/mediagoblin/templates/mediagoblin/user_pages/media.html b/mediagoblin/templates/mediagoblin/user_pages/media.html
index 01dba5968452dea718b7137d4d9518ed415f67c5..f1a1a5c56d378459b820415c95c70dc2735b29b8 100644 (file)
--- a/mediagoblin/templates/mediagoblin/user_pages/media.html
+++ b/mediagoblin/templates/mediagoblin/user_pages/media.html
@@ -40,35 +40,35 @@
 {% endblock mediagoblin_head %}
 
 {% 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(
-                 media.get_display_media(media.media_files)) %}
-        {# if there's a medium file size, that means the medium size
-         #  isn't the original... so link to the original!
-         #}
-        {% if media.media_files.has_key('medium') %}
-          <a href="{{ request.app.public_store.file_url(
-                        media.media_files['original']) }}">
-            <img class="media_image"
-                 src="{{ display_media }}"
-                 alt="Image for {{ media.title }}" />
-          </a>
-        {% else %}
+  {% 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(
+               media.get_display_media(media.media_files)) %}
+      {# if there's a medium file size, that means the medium size
+       #  isn't the original... so link to the original!
+       #}
+      {% if media.media_files.has_key('medium') %}
+        <a href="{{ request.app.public_store.file_url(
+                      media.media_files['original']) }}">
           <img class="media_image"
                src="{{ display_media }}"
                alt="Image for {{ media.title }}" />
-        {% endif %}
-      {% endblock %}
-    </div>
+        </a>
+      {% else %}
+        <img class="media_image"
+             src="{{ display_media }}"
+             alt="Image for {{ media.title }}" />
+      {% endif %}
+    {% endblock %}
+  </div>
+  <div class="media_pane">
     <h2 class="media_title">
       {{ media.title }}
     </h2>
@@ -155,6 +155,8 @@
       {{ render_pagination(request, pagination,
                  media.url_for_self(request.urlgen)) }}
     {% endif %}
+  </div>
+  <div class="media_sidebar">
     {% if media.attachment_files|count %}
       <h3>Attachments</h3>
       <ul>