Merge pull request #85 from ckan/fix_css_issues_in_non_root_paths

Fix issues with css files when ckan is installed in non-root path
ckan · Jun 16, 2020 · 91a57c0 · 91a57c0
2 parents 00b019b + 6c5cd46
commit 91a57c0
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 3 deletions.
diff --git a/ckanext/showcase/public/ckanext_showcase.css → ...t/showcase/fanstatic/ckanext_showcase.css b/ckanext/showcase/public/ckanext_showcase.css → ...t/showcase/fanstatic/ckanext_showcase.css
diff --git a/...howcase/public/ckeditor-content-style.css → ...case/fanstatic/ckeditor-content-style.css b/...howcase/public/ckeditor-content-style.css → ...case/fanstatic/ckeditor-content-style.css
diff --git a/ckanext/showcase/templates/showcase/edit_base.html b/ckanext/showcase/templates/showcase/edit_base.html
@@ -6,7 +6,7 @@
 
 {% block styles %}
   {{ super() }}
-  <link rel="stylesheet" href="{{ g.site_url }}/ckanext_showcase.css" />
+  {% resource "showcase/ckanext_showcase.css" %}
 {% endblock %}
 
 {% block breadcrumb_content_selected %}{% endblock %}

diff --git a/ckanext/showcase/templates/showcase/read.html b/ckanext/showcase/templates/showcase/read.html
@@ -8,9 +8,9 @@
 
 {% block styles %}
   {{ super() }}
-  <link rel="stylesheet" href="{{ g.site_url }}/ckanext_showcase.css" />
+  {% resource "showcase/ckanext_showcase.css" %}
   {% if editor == 'ckeditor' %}
-    <link rel="stylesheet" href="{{ g.site_url }}/ckeditor-content-style.css" type="text/css">
+    {% resource "showcase/ckeditor-content-style.css" %}
   {% endif %}
 {% endblock %}