From cdd61ed323f5b26bb651009124742a8e0f9df2d3 Mon Sep 17 00:00:00 2001
From: Sergio Oliveira <sergio@tracy.com.br>
Date: Mon, 29 Sep 2014 13:44:26 -0300
Subject: [PATCH] Replaced STATIC_URL by static template tag

---
 src/search/templates/search/search.html |  8 ++++----
 src/templates/base.html                 | 20 ++++++++++----------
 src/templates/doughnut-chart.html       |  6 +++---
 src/templates/dpaste/base.html          |  4 ++--
 src/templates/pizza-chart.html          |  4 ++--
 5 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/src/search/templates/search/search.html b/src/search/templates/search/search.html
index 18f6e78..a3b9ac2 100644
--- a/src/search/templates/search/search.html
+++ b/src/search/templates/search/search.html
@@ -1,12 +1,12 @@
 {% extends "base.html" %}
-{% load i18n highlight superarchives %}
+{% load i18n highlight superarchives static %}
 
 {% block title %}{% trans 'search'|title %}{% endblock %}
 
 {% block head_js %}
-<script type="text/javascript" src="{{ STATIC_URL }}third-party/bootstrap-datetimepicker/js/bootstrap-datetimepicker.min.js"></script>
+<script type="text/javascript" src="{% static 'third-party/bootstrap-datetimepicker/js/bootstrap-datetimepicker.min.js' %}"></script>
 {% if use_language %}
-  <script type="text/javascript" src="{{ STATIC_URL }}third-party/bootstrap-datetimepicker/js/locales/bootstrap-datetimepicker.{{ use_language }}.js"></script>
+  <script type="text/javascript" src="{% static 'third-party/bootstrap-datetimepicker/js/locales/bootstrap-datetimepicker.{{ use_language }}.js' %}"></script>
 {% endif %}
 
 <script type="text/javascript">
@@ -32,7 +32,7 @@
 {% endblock %}
 
 {% block head_css %}
-<link rel="stylesheet" href="{{ STATIC_URL }}third-party/bootstrap-datetimepicker/css/bootstrap-datetimepicker.min.css"/>
+<link rel="stylesheet" href="{% static 'third-party/bootstrap-datetimepicker/css/bootstrap-datetimepicker.min.css' %}"/>
 {% endblock %}
 
 {% block main-content %}
diff --git a/src/templates/base.html b/src/templates/base.html
index 25a8fbc..b62de0b 100644
--- a/src/templates/base.html
+++ b/src/templates/base.html
@@ -14,20 +14,20 @@
 
     <title>{% block title %}Colab{% endblock %} - Colab</title>
 
-    <link rel="shortcut icon" type="image/x-icon" href="{{ STATIC_URL }}img/interlegis.ico">
+    <link rel="shortcut icon" type="image/x-icon" href="{% static 'img/interlegis.ico' %}">
 
-    <link rel="stylesheet" href="{{ STATIC_URL }}third-party/bootstrap/css/bootstrap.min.css" type="text/css" media="screen, projection" />
+    <link rel="stylesheet" href="{% static 'third-party/bootstrap/css/bootstrap.min.css' %}" type="text/css" media="screen, projection" />
 
     <link rel="stylesheet"
-          href="{{ STATIC_URL }}third-party/font-awesome/css/font-awesome.min.css"
+          href="{% static 'third-party/font-awesome/css/font-awesome.min.css' %}"
           type="text/css" media="screen" />
 
 
     <!-- JQuery 2+ won't work for IE < 9 -->
-    <script type="text/javascript" src="{{ STATIC_URL }}third-party/jquery-2.0.3.min.js"></script>
-    <script type="text/javascript" src="{{ STATIC_URL }}third-party/jquery.debouncedresize.js"></script>
-    <script type="text/javascript" src="{{ STATIC_URL }}third-party/jquery.cookie.js"></script>
-    <script src="{{ STATIC_URL }}third-party/bootstrap/js/bootstrap.min.js"></script>
+    <script type="text/javascript" src="{% static 'third-party/jquery-2.0.3.min.js' %}"></script>
+    <script type="text/javascript" src="{% static 'third-party/jquery.debouncedresize.js' %}"></script>
+    <script type="text/javascript" src="{% static 'third-party/jquery.cookie.js' %}"></script>
+    <script src="{% static 'third-party/bootstrap/js/bootstrap.min.js' %}"></script>
 
     {% block head_js %}{% endblock %}
     {% block head_css %}{% endblock %}
@@ -36,7 +36,7 @@
       {% conversejs_static %}
     {% endif %}
 
-    <link rel="stylesheet" href="{{ STATIC_URL }}css/screen.css"
+    <link rel="stylesheet" href="{% static 'css/screen.css' %}"
         type="text/css" media="screen" />
 
   {% endblock %}
@@ -206,8 +206,8 @@
       <p class="col-lg-12 text-center">{% trans "Last email imported at" %} {{ last_imported_message.received_time|date:'DATETIME_FORMAT' }}</p>
       {% endif %}
       <p class="col-lg-12 text-center">
-        <a href="{% url 'opendata' %}"><img src="{{ STATIC_URL }}img/opendata3.png"/></a>
-        <a href="http://creativecommons.org/licenses/by-sa/4.0/deed.pt_BR"><img src="{{ STATIC_URL }}img/cc_by_sa.png"/></a>
+        <a href="{% url 'opendata' %}"><img src="{% static 'img/opendata3.png' %}"/></a>
+        <a href="http://creativecommons.org/licenses/by-sa/4.0/deed.pt_BR"><img src="{% static 'img/cc_by_sa.png' %}"/></a>
       </p>
       <p class="col-lg-12 text-center">
         {% trans "The contents of this site is published under license" %}:
diff --git a/src/templates/doughnut-chart.html b/src/templates/doughnut-chart.html
index edbc0fa..fa0aa27 100644
--- a/src/templates/doughnut-chart.html
+++ b/src/templates/doughnut-chart.html
@@ -1,7 +1,7 @@
-{% load i18n %}
+{% load i18n static %}
 
-<script src="{{ STATIC_URL }}third-party/chartjs/js/Chart.min.js"></script>
-<script src="{{ STATIC_URL }}third-party/chroma/js/chroma.min.js"></script>
+<script src="{% static 'third-party/chartjs/js/Chart.min.js' %}"></script>
+<script src="{% static 'third-party/chroma/js/chroma.min.js' %}"></script>
 
 <script>
 $(function () {
diff --git a/src/templates/dpaste/base.html b/src/templates/dpaste/base.html
index 949f3a2..73c578f 100644
--- a/src/templates/dpaste/base.html
+++ b/src/templates/dpaste/base.html
@@ -1,8 +1,8 @@
 {% extends 'base.html' %}
+{% load static %}
 
 {% block head_css %}
-<link rel="stylesheet" href="{{ STATIC_URL }}dpaste/css/theme.css"
-                            type="text/css" media="screen" />
+<link rel="stylesheet" href="{% static 'dpaste/css/theme.css' %}" type="text/css" media="screen" />
 {% endblock %}
 
 {% block header %}
diff --git a/src/templates/pizza-chart.html b/src/templates/pizza-chart.html
index cb558c6..ac860e2 100644
--- a/src/templates/pizza-chart.html
+++ b/src/templates/pizza-chart.html
@@ -1,6 +1,6 @@
-{% load i18n %}
+{% load i18n static %}
 
-<script src="{{ STATIC_URL }}third-party/highcharts/js/highcharts.js"></script>
+<script src="{% static 'third-party/highcharts/js/highcharts.js' %}"></script>
 <script>
 $(function () {
   $('#{{ chart_div }}').highcharts({
--
libgit2 0.21.2