diff options
| author | jpope777 <jpope@jpope.org> | 2014-01-06 19:05:23 -0600 |
|---|---|---|
| committer | jpope777 <jpope@jpope.org> | 2014-01-06 19:05:23 -0600 |
| commit | a42c871161cfa3e2247b9e38e24ce77b2cd8ced8 (patch) | |
| tree | 4c287f2d5a0dd5fd80c4bd457c358ad9cef87915 | |
| parent | 1b6831193f29f18094563d35721059bc5b6dd760 (diff) | |
| parent | 9e9c9c509bc78d475183fce088ffff0768ada2c5 (diff) | |
| download | mediagoblin-a42c871161cfa3e2247b9e38e24ce77b2cd8ced8.tar.lz mediagoblin-a42c871161cfa3e2247b9e38e24ce77b2cd8ced8.tar.xz mediagoblin-a42c871161cfa3e2247b9e38e24ce77b2cd8ced8.zip | |
Merge remote-tracking branch 'upstream/skeletongobblin' into skeleton
| -rw-r--r-- | mediagoblin/static/css/base.css | 6 | ||||
| -rw-r--r-- | mediagoblin/templates/mediagoblin/base.html | 18 | ||||
| -rw-r--r-- | mediagoblin/templates/mediagoblin/moderation/user.html | 10 |
3 files changed, 15 insertions, 19 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/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') }}"/> <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 efbaa0a1..67c3ae27 100644 --- 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"> |