From 7bc68035b557b7a0bb30fe38af87ff9f6ad2ae8a Mon Sep 17 00:00:00 2001 From: jpope Date: Mon, 6 Jan 2014 18:31:57 -0600 Subject: [PATCH 1/2] small adjustments to user mod page again --- mediagoblin/static/css/base.css | 6 ------ mediagoblin/templates/mediagoblin/moderation/user.html | 10 ++++++---- 2 files changed, 6 insertions(+), 10 deletions(-) diff --git a/mediagoblin/static/css/base.css b/mediagoblin/static/css/base.css index 82444bb9..83449569 100644 --- 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/moderation/user.html b/mediagoblin/templates/mediagoblin/moderation/user.html index efbaa0a1..67c3ae27 100644 --- a/mediagoblin/templates/mediagoblin/moderation/user.html +++ b/mediagoblin/templates/mediagoblin/moderation/user.html @@ -35,10 +35,12 @@ {% block mediagoblin_content -%}
- - {% trans %}Return to Users Panel{% endtrans %} +
From 9e9c9c509bc78d475183fce088ffff0768ada2c5 Mon Sep 17 00:00:00 2001 From: jpope Date: Mon, 6 Jan 2014 18:40:59 -0600 Subject: [PATCH 2/2] move js back to the head --- mediagoblin/templates/mediagoblin/base.html | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/mediagoblin/templates/mediagoblin/base.html b/mediagoblin/templates/mediagoblin/base.html index 0d22608b..e430cfca 100644 --- a/mediagoblin/templates/mediagoblin/base.html +++ b/mediagoblin/templates/mediagoblin/base.html @@ -37,6 +37,15 @@ href="{{ request.staticdirect('/css/base.css') }}"/> + + + + {# 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 @@
{%- endblock mediagoblin_body %} {% include 'mediagoblin/bits/body_end.html' %} - - - -