Restore sidebar

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;

mediagoblin/templates/mediagoblin/user_pages/media.html

@@ -40,7 +40,6 @@
 {% 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),
@@ -69,6 +68,7 @@
       {% 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>