heckyel/mediagoblin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
jpope777 2014-01-06 19:05:23 -06:00
commit a42c871161
3 changed files with 15 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
mediagoblin/static/css/base.css
View File

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

18
mediagoblin/templates/mediagoblin/base.html
View File

@ -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>

10
mediagoblin/templates/mediagoblin/moderation/user.html
View File

@ -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">