Merge remote-tracking branch 'upstream/skeletongobblin' into skeleton

mediagoblin/static/css/base.css

@@ -860,12 +860,6 @@ pre {
   .header_right {
     float: none;
   }
-
-  .return_to_panel {
-    float: none;
-    width: 100%;
-    text-align: center;
-  }
 }
 
 /* Exif display */

mediagoblin/templates/mediagoblin/base.html

@@ -37,6 +37,15 @@
           href="{{ request.staticdirect('/css/base.css') }}"/>
     <link rel="shortcut icon"
           href="{{ request.staticdirect('/images/goblin.ico') }}" />
+    <script type="text/javascript"
+            src="{{ request.staticdirect('/js/extlib/jquery.js') }}"></script>
+    <script type="text/javascript"
+            src="{{ request.staticdirect('/js/header_dropdown.js') }}"></script>
+    <script type="text/javascript"
+            src="{{ request.staticdirect('/js/notifications.js') }}"></script>
+    <script>
+      var mark_all_comments_seen_url = "{{ request.urlgen('mediagoblin.notifications.mark_all_comment_notifications_seen') }}"
+    </script>
 
     {# For clarification, the difference between the extra_head.html template
      # and the head template hook is that the former should be used by
@@ -181,14 +190,5 @@
       </div>
     {%- endblock mediagoblin_body %}
     {% include 'mediagoblin/bits/body_end.html' %}
-    <script type="text/javascript"
-            src="{{ request.staticdirect('/js/extlib/jquery.js') }}"></script>
-    <script type="text/javascript"
-            src="{{ request.staticdirect('/js/header_dropdown.js') }}"></script>
-    <script type="text/javascript"
-            src="{{ request.staticdirect('/js/notifications.js') }}"></script>
-    <script>
-      var mark_all_comments_seen_url = "{{ request.urlgen('mediagoblin.notifications.mark_all_comment_notifications_seen') }}"
-    </script>
   </body>
 </html>

mediagoblin/templates/mediagoblin/moderation/user.html

@@ -35,11 +35,13 @@
 
 {% block mediagoblin_content -%}
     <div class="row">
+      <div class="sixteen columns">
         <a href="{{ request.urlgen('mediagoblin.moderation.users') }}"
            class="return_to_panel button_action"
            title="Return to Users Panel">
           {% trans %}Return to Users Panel{% endtrans %}</a>
       </div>
+    </div>
     <div class="row">
       <div class="eight columns">
   {# If no user... #}