Merge pull request #54 from transifex/static_files

Handle all static files through the `static` templatetag
transifex · Apr 27, 2012 · 5aad73e · 5aad73e
2 parents 8650f2b + 7d43b8c
commit 5aad73e
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 24 deletions.
diff --git a/transifex/addons/locks/templates/locks/base.html b/transifex/addons/locks/templates/locks/base.html
@@ -1,7 +1,8 @@
 {% load compress %}
+{% load staticfiles %}
 
 {% block headcss %}
 {% compress css %}
-<link media="screen" href="{{ STATIC_URL }}locks/css/icons.css" type="text/css" rel="stylesheet" />
+<link media="screen" href="{% static "locks/css/icons.css" %}" type="text/css" rel="stylesheet" />
 {% endcompress %}
 {% endblock %}
diff --git a/transifex/settings/50-project.conf b/transifex/settings/50-project.conf
@@ -9,7 +9,6 @@ TEMPLATE_CONTEXT_PROCESSORS = [
     "django.contrib.auth.context_processors.auth",
     "django.core.context_processors.debug",
     "django.core.context_processors.i18n",
-    "staticfiles.context_processors.static",
     "django.core.context_processors.media",
     "django.core.context_processors.request",
     "django.contrib.messages.context_processors.messages",

diff --git a/transifex/templates/base-sample.html b/transifex/templates/base-sample.html
@@ -10,15 +10,15 @@
   <title>{% block title %}{% trans "Transifex" %}{% endblock %}</title>
   <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
   {% block basecss %}
-  <link media="screen" href="{{ STATIC_URL }}css/base.css" type="text/css" rel="stylesheet" />
-  <link media="screen" href="{{ STATIC_URL }}css/txo-style.css" type="text/css" rel="stylesheet" />
-  <link media="screen" href="{{ STATIC_URL }}css/stats.css" type="text/css" rel="stylesheet" />
-  <link media="screen" href="{{ STATIC_URL }}css/icons.css" type="text/css" rel="stylesheet" />
-  <link media="screen" href="{{ STATIC_URL }}css/tipsy.css" type="text/css" rel="stylesheet" />
-  <link media="screen" href="{{ STATIC_URL }}css/facebox.css" rel="stylesheet" type="text/css" />
-  <link media="screen" href="{{ STATIC_URL }}css/chosen.css" rel="stylesheet" type="text/css" />
-  <link media="screen" href="{{ STATIC_URL }}css/jquery.autocomplete.css" rel="stylesheet" type="text/css"/>
-  <link media="screen" href="{{ STATIC_URL }}css/tablesorter.css" type="text/css" rel="stylesheet" />
+  <link media="screen" href="{% static "css/base.css" %}" type="text/css" rel="stylesheet" />
+  <link media="screen" href="{% static "css/txo-style.css" %}" type="text/css" rel="stylesheet" />
+  <link media="screen" href="{% static "css/stats.css" %}" type="text/css" rel="stylesheet" />
+  <link media="screen" href="{% static "css/icons.css" %}" type="text/css" rel="stylesheet" />
+  <link media="screen" href="{% static "css/tipsy.css" %}" type="text/css" rel="stylesheet" />
+  <link media="screen" href="{% static "css/facebox.css" %}" rel="stylesheet" %}" type="text/css" />
+  <link media="screen" href="{% static "css/chosen.css" %}" rel="stylesheet" %}" type="text/css" />
+  <link media="screen" href="{% static "css/jquery.autocomplete.css" %}" rel="stylesheet" %}" type="text/css"/>
+  <link media="screen" href="{% static "css/tablesorter.css" %}" type="text/css" rel="stylesheet" />
   {% endblock %}
   {% hook "base.html" headcss %}
   {% block basejs %}
@@ -33,19 +33,19 @@
   <script type="text/javascript" src="{% url jsi18n %}"></script>
 
   {% compress js %}
-  <script type="text/javascript" src="{{ STATIC_URL }}js/lib/chosen.jquery.min.js"></script>
-  <script type="text/javascript" src="{{ STATIC_URL }}js/lib/json2.min.js"></script>
-  <script type="text/javascript" src="{{ STATIC_URL }}js/lib/jquery.placeholder.js"></script>
-  <script type="text/javascript" src="{{ STATIC_URL }}js/lib/jquery.tablesorter.min.js"></script>
-  <script type="text/javascript" src="{{ STATIC_URL }}js/base.js"></script>
-  <script type="text/javascript" src="{{ STATIC_URL }}js/lib/jquery.tipsy.js"></script>
-  <script type="text/javascript" src="{{ STATIC_URL }}js/lib/ajaxupload.js"></script>
-  <script type="text/javascript" src="{{ STATIC_URL }}js/lib/sprintf.js"></script>
-  <script type="text/javascript" src="{{ STATIC_URL }}js/tx.core.js"></script>
-  <script type="text/javascript" src="{{ STATIC_URL }}js/ajaxcsrf.js"></script>
-  <script type="text/javascript" src="{{ STATIC_URL }}js/lib/facebox.js"></script>
-  <script type="text/javascript" src="{{ STATIC_URL }}js/lib/jquery.autocomplete.js"></script>
-  <script type="text/javascript" src="{{ STATIC_URL }}js/lib/amplify.store.min.js"></script>
+  <script type="text/javascript" src="{% static "js/lib/chosen.jquery.min.js" %}"></script>
+  <script type="text/javascript" src="{% static "js/lib/json2.min.js" %}"></script>
+  <script type="text/javascript" src="{% static "js/lib/jquery.placeholder.js" %}"></script>
+  <script type="text/javascript" src="{% static "js/lib/jquery.tablesorter.min.js" %}"></script>
+  <script type="text/javascript" src="{% static "js/base.js" %}"></script>
+  <script type="text/javascript" src="{% static "js/lib/jquery.tipsy.js" %}"></script>
+  <script type="text/javascript" src="{% static "js/lib/ajaxupload.js" %}"></script>
+  <script type="text/javascript" src="{% static "js/lib/sprintf.js" %}"></script>
+  <script type="text/javascript" src="{% static "js/tx.core.js" %}"></script>
+  <script type="text/javascript" src="{% static "js/ajaxcsrf.js" %}"></script>
+  <script type="text/javascript" src="{% static "js/lib/facebox.js" %}"></script>
+  <script type="text/javascript" src="{% static "js/lib/jquery.autocomplete.js" %}"></script>
+  <script type="text/javascript" src="{% static "js/lib/amplify.store.min.js" %}"></script>
   <script type="text/javascript">
   $.facebox.settings.loadingImage = '{% static 'images/loading.gif' %}';
   $.facebox.settings.closeImage = '{% static 'images/closelabel.png' %}';