Merge remote branch 'remotes/schendjes/master'

mediagoblin/templates/mediagoblin/user_pages/media.html

@@ -103,11 +103,9 @@
 
     <div class="grid_5 omega">
       {% include "mediagoblin/utils/prev_next.html" %}
-      <h3>Sidebar content here!</h3>
-
-      <p>
         {% if media['uploader'] == request.user['_id'] or 
                                    request.user['is_admin'] %}
+          <h3>Temporary button holder</h3>
           <p>
             <a href="{{ request.urlgen('mediagoblin.edit.edit_media',
                                        user= media.uploader().username,
@@ -120,7 +118,6 @@
                  class="media_icon" />delete
           </p>
         {% endif %}
-      </p>
 
       {% if media.tags %}
         {% include "mediagoblin/utils/tags.html" %}

mediagoblin/templates/mediagoblin/utils/tags.html

@@ -17,7 +17,7 @@
 #}
 
 {% block tags_content -%}
-  <h4>Tags</h4>
+  <h3>Tags</h3>
   <ul class="mediaentry_tags">
     {% for tag in media.tags %}
       <li class="tag">