From 64b0546cc25786905b004b9866192c694afad725 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20P=C3=A9pin?= <martinPepin@cheesecake.lan>
Date: Thu, 26 May 2016 01:09:31 +0200
Subject: [PATCH] =?UTF-8?q?Mise=20=C3=A0=20jour=20des=20urls=20vers=20l'an?=
 =?UTF-8?q?cien=20dossier=20/media?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

On utilise désormais les balises `{% load staticfiles %}` et
`{% static ... %}` pour charger les fichiers au bon endroit.
---
 templates/bda/bda-attrib.html                         |  3 ++-
 templates/bda/bda-revente.html                        |  3 ++-
 templates/bda/bda-success.html                        |  3 ++-
 templates/bda2/bda-attrib.html                        |  3 ++-
 templates/bda2/bda-revente.html                       |  3 ++-
 templates/bda2/bda-success.html                       |  3 ++-
 templates/gestioncof/base.html                        |  4 +++-
 templates/gestioncof/details_demande_petit_cours.html |  3 ++-
 .../gestioncof/details_demande_petit_cours_infos.html |  3 ++-
 templates/gestioncof/inscription-petit-cours.html     | 11 ++++++-----
 templates/gestioncof/petits_cours_demandes_list.html  |  5 +++--
 templates/gestioncof/registration.html                |  5 +++--
 .../traitement_demande_petit_cours_autre_niveau.html  |  3 ++-
 templates/gestioncof/tristate_js.html                 |  7 ++++---
 14 files changed, 37 insertions(+), 22 deletions(-)

diff --git a/templates/bda/bda-attrib.html b/templates/bda/bda-attrib.html
index 382048c4..54cdc2b7 100644
--- a/templates/bda/bda-attrib.html
+++ b/templates/bda/bda-attrib.html
@@ -1,7 +1,8 @@
+{% load staticfiles %}
 {% extends "base_title.html" %}
 
 {% block extra_head %}
-        <link type="text/css" rel="stylesheet" href="{{ MEDIA_URL }}bda.css" />
+	<link type="text/css" rel="stylesheet" href="{% static "css/bda.css" %}" />
 {% endblock %}
 
 {% block realcontent %}
diff --git a/templates/bda/bda-revente.html b/templates/bda/bda-revente.html
index e2a4804b..bc7542fc 100644
--- a/templates/bda/bda-revente.html
+++ b/templates/bda/bda-revente.html
@@ -1,7 +1,8 @@
+{% load staticfiles %}
 {% extends "base_title.html" %}
 
 {% block extra_head %}
-        <link type="text/css" rel="stylesheet" href="{{ MEDIA_URL }}bda.css" />
+	<link type="text/css" rel="stylesheet" href="{% static "css/bda.css" %}" />
 {% endblock %}
 
 {% block realcontent %}
diff --git a/templates/bda/bda-success.html b/templates/bda/bda-success.html
index 004503fe..f7bbe349 100644
--- a/templates/bda/bda-success.html
+++ b/templates/bda/bda-success.html
@@ -1,7 +1,8 @@
+{% load staticfiles %}
 {% extends "base_title.html" %}
 
 {% block extra_head %}
-        <link type="text/css" rel="stylesheet" href="{{ MEDIA_URL }}bda.css" />
+	<link type="text/css" rel="stylesheet" href="{% static "css/bda.css" %}" />
 {% endblock %}
 
 {% block realcontent %}
diff --git a/templates/bda2/bda-attrib.html b/templates/bda2/bda-attrib.html
index 2cc20a29..cd91a478 100644
--- a/templates/bda2/bda-attrib.html
+++ b/templates/bda2/bda-attrib.html
@@ -1,7 +1,8 @@
+{% load staticfiles %}
 {% extends "base_title.html" %}
 
 {% block extra_head %}
-        <link type="text/css" rel="stylesheet" href="{{ MEDIA_URL }}bda.css" />
+	<link type="text/css" rel="stylesheet" href="{% static "css/bda.css" %}" />
 {% endblock %}
 
 {% block realcontent %}
diff --git a/templates/bda2/bda-revente.html b/templates/bda2/bda-revente.html
index e2a4804b..bc7542fc 100644
--- a/templates/bda2/bda-revente.html
+++ b/templates/bda2/bda-revente.html
@@ -1,7 +1,8 @@
+{% load staticfiles %}
 {% extends "base_title.html" %}
 
 {% block extra_head %}
-        <link type="text/css" rel="stylesheet" href="{{ MEDIA_URL }}bda.css" />
+	<link type="text/css" rel="stylesheet" href="{% static "css/bda.css" %}" />
 {% endblock %}
 
 {% block realcontent %}
diff --git a/templates/bda2/bda-success.html b/templates/bda2/bda-success.html
index 004503fe..f7bbe349 100644
--- a/templates/bda2/bda-success.html
+++ b/templates/bda2/bda-success.html
@@ -1,7 +1,8 @@
+{% load staticfiles %}
 {% extends "base_title.html" %}
 
 {% block extra_head %}
-        <link type="text/css" rel="stylesheet" href="{{ MEDIA_URL }}bda.css" />
+	<link type="text/css" rel="stylesheet" href="{% static "css/bda.css" %}" />
 {% endblock %}
 
 {% block realcontent %}
diff --git a/templates/gestioncof/base.html b/templates/gestioncof/base.html
index 862830e4..7834cfce 100644
--- a/templates/gestioncof/base.html
+++ b/templates/gestioncof/base.html
@@ -1,8 +1,10 @@
+{% load staticfiles %}
+
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" lang="fr">
     <head>
         <title>{{ site.name }}</title>
-        <link type="text/css" rel="stylesheet" href="{{ MEDIA_URL }}cof.css" />
+	<link type="text/css" rel="stylesheet" href="{% static "css/cof.css" %}" />
         <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
         {% block extra_head %}{% endblock %}
     </head>
diff --git a/templates/gestioncof/details_demande_petit_cours.html b/templates/gestioncof/details_demande_petit_cours.html
index b30e3187..c12e5c53 100644
--- a/templates/gestioncof/details_demande_petit_cours.html
+++ b/templates/gestioncof/details_demande_petit_cours.html
@@ -1,3 +1,4 @@
+{% load staticfiles %}
 {% extends "base_title_petitscours.html" %}
 
 {% block realcontent %}
@@ -5,7 +6,7 @@
     {% include "details_demande_petit_cours_infos.html" %}
     <hr />
     <ul>
-        <li><strong>Traitée</strong>: <img src="{{ MEDIA_URL }}/images/{% if demande.traitee %}yes.png{% else %}no.png{% endif %}" /></li>
+        <li><strong>Traitée</strong>: <img src="{% static "/images/{% if demande.traitee %}yes.png{% else %}no.png{% endif %}" %}" /></li>
         {% if demande.traitee %}
         <li><strong>Traitée par</strong>: {{ demande.traitee_par }}</li>
         <li><strong>Traitée le</strong>: {{ demande.processed }}</li>
diff --git a/templates/gestioncof/details_demande_petit_cours_infos.html b/templates/gestioncof/details_demande_petit_cours_infos.html
index 90a62f8b..1a4a654c 100644
--- a/templates/gestioncof/details_demande_petit_cours_infos.html
+++ b/templates/gestioncof/details_demande_petit_cours_infos.html
@@ -1,3 +1,4 @@
+{% load staticfiles %}
     <ul>
         <li><strong>Date</strong>: {{ demande.created }}</li>
         <li><strong>Nom/prénom</strong>: {{ demande.name }}</li>
@@ -8,6 +9,6 @@
         <li><strong>Fréquence</strong>: {{ demande.freq }}</li>
         <li><strong>Matières</strong>: {% for matiere in demande.matieres.all %}{% if forloop.counter0 > 0 %}, {% endif %}{{ matiere }}{% endfor %}</li>
         <li><strong>Niveau souhaité</strong>: {{ demande.get_niveau_display }}</li>
-        <li><strong>Agrégé requis</strong>: <img src="{{ MEDIA_URL }}/images/{% if demande.agrege_requis %}yes.png{% else %}no.png{% endif %}" /></li>
+	<li><strong>Agrégé requis</strong>: <img src="{% static "/images/{% if demande.agrege_requis %}yes.png{% else %}no.png{% endif %}" %}" /></li>
         <li><strong>Remarques</strong>: {{ demande.remarques }}</li>
     </ul>
diff --git a/templates/gestioncof/inscription-petit-cours.html b/templates/gestioncof/inscription-petit-cours.html
index a084e1cc..84ef9618 100644
--- a/templates/gestioncof/inscription-petit-cours.html
+++ b/templates/gestioncof/inscription-petit-cours.html
@@ -1,11 +1,12 @@
+{% load staticfiles %}
 {% extends "base_title.html" %}
 
 {% block extra_head %}
-<link href="{{ STATIC_URL }}grappelli/jquery/ui/css/custom-theme/jquery-ui-1.8.custom.css" rel="stylesheet" type="text/css" media="screen" title="no title" charset="utf-8" />
-<script src="{{ STATIC_URL }}grappelli/jquery/jquery-1.6.2.min.js" type="text/javascript"></script>
-<script src="{{ STATIC_URL }}grappelli/jquery/ui/js/jquery-ui-1.8.15.custom.min.js" type="text/javascript"></script>
-<link href="{{ STATIC_URL }}grappelli/css/tools.css" rel="stylesheet" type="text/css" />
-<link href="{{ STATIC_URL }}grappelli/css/jquery-ui-grappelli-extensions.css" rel="stylesheet" type="text/css" />
+<link href="{% static "grappelli/jquery/ui/css/custom-theme/jquery-ui-1.8.custom.css" %}" rel="stylesheet" type="text/css" media="screen" title="no title" charset="utf-8" />
+<script src="{% static "grappelli/jquery/jquery-1.6.2.min.js" %}" type="text/javascript"></script>
+<script src="{% static "grappelli/jquery/ui/js/jquery-ui-1.8.15.custom.min.js" %}" type="text/javascript"></script>
+<link href="{% static "grappelli/css/tools.css" %}" rel="stylesheet" type="text/css" />
+<link href="{% static "grappelli/css/jquery-ui-grappelli-extensions.css" %}" rel="stylesheet" type="text/css" />
 {% endblock %}
 
 {% block realcontent %}
diff --git a/templates/gestioncof/petits_cours_demandes_list.html b/templates/gestioncof/petits_cours_demandes_list.html
index 8674f4aa..d2a26d79 100644
--- a/templates/gestioncof/petits_cours_demandes_list.html
+++ b/templates/gestioncof/petits_cours_demandes_list.html
@@ -1,3 +1,4 @@
+{% load staticfiles %}
 {% extends "base_title_petitscours.html" %}
 
 {% block realcontent %}
@@ -18,8 +19,8 @@
                 <td>{{ demande.name }}</td>
                 <td>{% for matiere in demande.matieres.all %}{% if forloop.counter0 > 0 %}, {% endif %}{{ matiere }}{% endfor %}</td>
                 <td>{{ demande.created|date:"d E Y" }}</td>
-                <td style="text-align: center;"><img src="{{ MEDIA_URL }}/images/{% if demande.traitee %}yes.png{% else %}no.png{% endif %}" /></td>
-                <td>{% if demande.traitee_par %}{{ demande.traitee_par.username }}{% else %}<img src="{{ MEDIA_URL }}/images/none.png" />{% endif %}</td>
+		<td style="text-align: center;"><img src="{% static "/images/{% if demande.traitee %}yes.png{% else %}no.png{% endif %}" %}" /></td>
+		<td>{% if demande.traitee_par %}{{ demande.traitee_par.username }}{% else %}<img src="{% static "/images/none.png" %}" />{% endif %}</td>
                 <td><a href="{% url "petits-cours-demande-details" demande.id %}" class="see_detail">Détails</a></td>
             </tr>
         {% endfor %}
diff --git a/templates/gestioncof/registration.html b/templates/gestioncof/registration.html
index 83aba51b..3ce928e8 100644
--- a/templates/gestioncof/registration.html
+++ b/templates/gestioncof/registration.html
@@ -1,8 +1,9 @@
+{% load staticfiles %}
 {% extends "base_title.html" %}
 
 {% block extra_head %}
-                <script src="{{ MEDIA_URL }}js/jquery.min.js" type="text/javascript"></script>
-                <script src="{{ STATIC_URL }}autocomplete_light/autocomplete.js" type="text/javascript"></script>
+		<script src="{% static "js/jquery.min.js" %}" type="text/javascript"></script>
+		<script src="{% static "autocomplete_light/autocomplete.js" %}" type="text/javascript"></script>
 {% endblock %}
 
 {% block realcontent %}
diff --git a/templates/gestioncof/traitement_demande_petit_cours_autre_niveau.html b/templates/gestioncof/traitement_demande_petit_cours_autre_niveau.html
index 5b7967ab..1ad9051b 100644
--- a/templates/gestioncof/traitement_demande_petit_cours_autre_niveau.html
+++ b/templates/gestioncof/traitement_demande_petit_cours_autre_niveau.html
@@ -1,3 +1,4 @@
+{% load staticfiles %}
 {% extends "base_title_petitscours.html" %}
 
 {% block realcontent %}
@@ -15,7 +16,7 @@
         </ul>
     </div>
     {% endif %}
-    <script src="{{ MEDIA_URL }}js/jquery.min.js" type="text/javascript"></script>
+    <script src="{% static "js/jquery.min.js" %}" type="text/javascript"></script>
     {% if proposals %}
     <form method="post">
     {% csrf_token %}
diff --git a/templates/gestioncof/tristate_js.html b/templates/gestioncof/tristate_js.html
index 4e292f9d..17b2d09a 100644
--- a/templates/gestioncof/tristate_js.html
+++ b/templates/gestioncof/tristate_js.html
@@ -1,9 +1,10 @@
+{% load staticfiles %}
                 <script type="text/javascript">
 var supernifty_tristate = function() {
   var
-    YES = { image: "{{ MEDIA_URL }}/images/yes.png", state: "yes" },
-    NO = { image: "{{ MEDIA_URL }}/images/no.png", state: "no" },
-    NONE = { image: "{{ MEDIA_URL }}/images/none.png", state: "none" };
+    YES = { image: "{% static "/images/yes.png" %}", state: "yes" },
+    NO = { image: "{% static "/images/no.png" %}", state: "no" },
+    NONE = { image: "{% static "/images/none.png" %}", state: "none" };
 
   function tristate_elements() {
     if ( document.getElementsByClassName != undefined ) {