diff --git a/default.nix b/default.nix
index 08a7788..93a8474 100644
--- a/default.nix
+++ b/default.nix
@@ -1,25 +1,17 @@
{ pkgs ? import {} }:
-pkgs.python3.pkgs.buildPythonPackage rec {
- pname= "site-musique";
- version = "1.0";
+pkgs.stdenv.mkDerivation rec {
+ name= "site-musique";
inherit (pkgs) stdenv;
src = ./.;
- propagatedBuildInputs = [ pkgs.python3.pkgs.django_2_2 pkgs.python3.pkgs.pillow ];
-
- postFixup = ''
- wrapPythonProgramsIn $out/bin/manage.py
- #HACK wrapper breaks django manage.py
- sed -i "$out/bin/.manage.py-wrapped" -e '
- 0,/sys.argv\[0\].*;/s/sys.argv\[0\][^;]*;//
- '
+ installPhase = ''
+ mkdir -p $out/
+ cp -R . $out/
'';
- doCheck = false;
-
meta = {
description = "Site de présentation de l'association Musique Fraternité de Meyenheim";
homepage = https://musique-meyenheim.fr;
diff --git a/site_statique/templates/site_statique/salle.html b/site_statique/templates/site_statique/salle.html
index b8e343a..a1fec7f 100644
--- a/site_statique/templates/site_statique/salle.html
+++ b/site_statique/templates/site_statique/salle.html
@@ -68,6 +68,30 @@
+
+
{% include "contact.html" with responsable="Céline TREHIOU" email="salle@musique-meyenheim.fr" adresse="Mme TREHIOU Céline4 rue St Michel68890 MEYENHEIM" %}
{% endblock %}
diff --git a/templates/footer.html b/templates/footer.html
index 2f9127c..69f2cce 100644
--- a/templates/footer.html
+++ b/templates/footer.html
@@ -1,4 +1,4 @@
-
- {% if evenement.illustration_set.count > 1 %}
-
-
-
-
-
{{ evenement.description }}
-
- {% for illustration in evenement.illustration_set.all %}
-
-
-
-
-

-
-
-
-
- {% endfor %}
- {% else %}
- {% with evenement.illustration_set.all|first as illustration %}
-
+
-
{{ evenement.description }}
+
-
-
-
-

-
+
+
+
+

+
+
-
- {% endwith %}
- {% endif %}
diff --git a/timeline/views.py b/timeline/views.py
index 8dac944..1bbd9c1 100644
--- a/timeline/views.py
+++ b/timeline/views.py
@@ -1,9 +1,9 @@
from django.shortcuts import render
-from .models import Evenement
+from .models import Timeline
def index(request):
- liste_evenements = Evenement.objects.order_by('-date')
+ liste_evenements = Timeline.objects.order_by('-date')
context = {
'liste_evenements': liste_evenements,
}