Move styles into blocks in base.html template

ckan · Sep 20, 2012 · df5ebaf · df5ebaf
1 parent 5e95ee7
commit df5ebaf
Showing 1 changed file with 9 additions and 6 deletions.
diff --git a/ckan/templates/base.html b/ckan/templates/base.html
@@ -10,7 +10,6 @@
 <!--[if gt IE 8]><!--> <html lang="{{ lang }}"> <!--<![endif]-->
 {%- endblock -%}
 
-{% resource g.main_css[6:] %}
   {# Allows custom attributes to be added to the <head> tag #}
   <head{% block headtag %}{% endblock %}>
     {#
@@ -70,17 +69,21 @@
       {% endblock %}
     #}
     {%- block styles %}
+      {% resource g.main_css[6:] %}
     {% endblock %}
 
     {# defined in the config.ini under "ckan.template_head_end" #}
     {% block head_extras %}
       {{ config.get('ckan.template_head_end', '') | safe }}
     {% endblock %}
-    {%- if g.site_custom_css -%}
-    <style>
-      {{ g.site_custom_css | safe }}
-    </style>
-    {%- endif %}
+
+    {%- block custom_styles %}
+      {%- if g.site_custom_css -%}
+      <style>
+        {{ g.site_custom_css | safe }}
+      </style>
+      {%- endif %}
+    {% endblock %}
   </head>
 
   {# Allows custom attributes to be added to the <body> tag #}