Merge branch 'dataviewer-iframe' of github.com:okfn/ckan into datavie…

…wer-iframe
ckan · Sep 20, 2012 · 54f94db · 54f94db
2 parents 20212ea + d6189db
commit 54f94db
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 6 deletions.
diff --git a/ckan/public/base/datapreview/resource.config b/ckan/public/base/datapreview/resource.config
@@ -28,6 +28,7 @@ datapreview =
     vendor/recline/recline.js
     datapreview.js
 
+    vendor/bootstrap/2.0.3/bootstrap.css
     vendor/slickgrid/2.0.1/slick.grid.css
     vendor/leaflet/0.4.4/leaflet.css
 

diff --git a/.../vendor/bootstrap/2.0.3/bootstrap.min.css → ...view/vendor/bootstrap/2.0.3/bootstrap.css b/.../vendor/bootstrap/2.0.3/bootstrap.min.css → ...view/vendor/bootstrap/2.0.3/bootstrap.css
diff --git a/ckan/public/base/datapreview/vendor/bootstrap/img/glyphicons-halflings.png b/ckan/public/base/datapreview/vendor/bootstrap/img/glyphicons-halflings.png
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 #}

diff --git a/ckan/templates/package/resource_preview.html b/ckan/templates/package/resource_preview.html
@@ -16,3 +16,11 @@
     var preload_resource = {{ h.literal(c.resource_json) }};
   </script>
 {% endblock %}
+
+
+{# remove any ckan styles #}
+{% block styles %}
+{% endblock %}
+
+{% block custom_styles %}
+{% endblock %}