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

diff --git a/mediagoblin/static/css/base.css b/mediagoblin/static/css/base.css
index 82444bb9ec0d9058922980a0dff57060dab92cec..83449569ada34845885de5786f367ae528164a5a 100644 (file)
--- a/mediagoblin/static/css/base.css
+++ b/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 */

diff --git a/mediagoblin/templates/mediagoblin/base.html b/mediagoblin/templates/mediagoblin/base.html
index 0d22608bc9d5238c2b13d7a116d67d03a47c319d..e430cfcac8c3b3bd081fd5179e5385fa596d64f6 100644 (file)
--- a/mediagoblin/templates/mediagoblin/base.html
+++ b/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>

diff --git a/mediagoblin/templates/mediagoblin/moderation/user.html b/mediagoblin/templates/mediagoblin/moderation/user.html
index efbaa0a1da88d8bdbea81d6a99dfe220b101ff37..67c3ae27828e24d4600ac6e61e3cf08d6fa76827 100644 (file)
--- a/mediagoblin/templates/mediagoblin/moderation/user.html
+++ b/mediagoblin/templates/mediagoblin/moderation/user.html
@@ -35,10 +35,12 @@
 
 {% block mediagoblin_content -%}
     <div class="row">
-      <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 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">