Merge

stephenmcd · Feb 6, 2017 · c34e3ba · c34e3ba
2 parents 88e4905 + 23c15f8
commit c34e3ba
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 11 deletions.
diff --git a/mezzanine/core/templates/admin/base_site.html b/mezzanine/core/templates/admin/base_site.html
@@ -3,14 +3,7 @@
 
 {% block title %}{{ title }} | Mezzanine{% endblock %}
 
-{% block extrahead %}
-<link rel="stylesheet" href="{% static "mezzanine/css/admin/global.css" %}">
-<style>
-    /* These are set in PageAdmin's view methods, and mezzanine.utils.admin.SingletonAdmin */
-    {% if hide_delete_link or singleton %}.submit-row .deletelink {display:none !important;}{% endif %}
-    {% if hide_slug_field %}.slug {display:none !important;}{% endif %}
-    {% if singleton %}.change-view-save-another {display:none !important;}{% endif %}
-</style>
+{% block javascripts %}
 <script>
     {% url "static_proxy" as static_proxy_url %}
     {% url "fb_browse" as fb_browse_url %}
@@ -30,11 +23,10 @@
     window.__admin_menu_collapsed = {{ settings.ADMIN_MENU_COLLAPSED|lower }};
     window.__language_code = '{{ LANGUAGE_CODE }}';
 </script>
-
 {% if not settings.GRAPPELLI_INSTALLED %}
 <script src="{% static "mezzanine/js/"|add:settings.JQUERY_FILENAME %}"></script>
 {% endif %}
-
+{{ block.super }}
 <script>
 jQuery(function($) {
     $('.admin-title').click(function() {location = window.__admin_url;});
@@ -43,7 +35,17 @@
     $("#id_sitepermissions-__prefix__-sites").parent().parent().parent().remove();
 });
 </script>
+{% endblock %}
 
+{% block stylesheets %}
+{{ block.super }}
+<link rel="stylesheet" href="{% static "mezzanine/css/admin/global.css" %}">
+<style>
+    /* These are set in PageAdmin's view methods, and mezzanine.utils.admin.SingletonAdmin */
+    {% if hide_delete_link or singleton %}.submit-row .deletelink {display:none !important;}{% endif %}
+    {% if hide_slug_field %}.slug {display:none !important;}{% endif %}
+    {% if singleton %}.change-view-save-another {display:none !important;}{% endif %}
+</style>
 {% endblock %}
 
 {% block rtl_styles %}

diff --git a/mezzanine/core/templates/includes/editable_loader.html b/mezzanine/core/templates/includes/editable_loader.html
@@ -2,7 +2,6 @@
 
 {% if has_site_permission %}
 <link rel="stylesheet" href="{% static "mezzanine/css/editable.css" %}">
-{{ richtext_media|safe }}
 <script>
 {% url "displayable_links_js" as link_list_url %}
 {% url "fb_browse" as fb_browse_url %}
@@ -15,6 +14,7 @@
 window.__language_code = '{{ LANGUAGE_CODE }}';
 window.__tinymce_css = '{% static "mezzanine/css/tinymce.css" %}';
 </script>
+{{ richtext_media|safe }}
 <script src="{% static "mezzanine/js/jquery.tools.toolbox.expose.js" %}"></script>
 <script src="{% static "mezzanine/js/jquery.tools.overlay.js" %}"></script>
 <script src="{% static "mezzanine/js/jquery.form.js" %}"></script>