Merge pull request #216 from ramonakira/master

Updated to use staticfiles instead of static
django-fiber · Jul 29, 2015 · 3a581ad · 3a581ad
2 parents 995cbd3 + ff4f116
commit 3a581ad
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 4 deletions.
diff --git a/fiber/templates/fiber/ckeditor_js.html b/fiber/templates/fiber/ckeditor_js.html
@@ -1,4 +1,6 @@
-{% load static %}
+{% load staticfiles %}
+{% load get_static_prefix from static %}
+
 <script type="text/javascript">
     var CKEDITOR_BASEPATH = '{% get_static_prefix %}fiber/js/ckeditor-4.4.7-full/';
 </script>

diff --git a/fiber/templates/fiber/header.html b/fiber/templates/fiber/header.html
@@ -1,5 +1,6 @@
 {% load compress %}
-{% load static %}
+{% load staticfiles %}
+{% load get_static_prefix from static %}
 {% load url from future %}
 
 <script src="{% url 'django.views.i18n.javascript_catalog' %}" type="text/javascript"></script>

diff --git a/fiber/templates/fiber/markitup_css.html b/fiber/templates/fiber/markitup_css.html
@@ -1,3 +1,3 @@
-{% load static %}
+{% load staticfiles %}
 <link rel="stylesheet" href="{% static 'fiber/js/markitup-1.1.10/skins/simple/style.css' %}" type="text/css" media="screen" />
 <link rel="stylesheet" href="{% static 'fiber/js/markitup-1.1.10/sets/textile_fiber/style.css' %}" type="text/css" media="screen" />
diff --git a/fiber/templates/fiber/markitup_js.html b/fiber/templates/fiber/markitup_js.html
@@ -1,4 +1,4 @@
-{% load static %}
+{% load staticfiles %}
 <script src="{% static 'fiber/js/markitup-1.1.10/jquery.markitup.js' %}" type="text/javascript"></script>
 <script src="{% static 'fiber/js/markitup-1.1.10/sets/textile_fiber/set.js' %}" type="text/javascript"></script>
 <script src="{% static 'fiber/js/fiber.markitup.js' %}" type="text/javascript"></script>