From 45de848cbe887ee26deef3a761dcf34b2dc2ebb5 Mon Sep 17 00:00:00 2001
From: Claude Paroz <claude@2xlibre.net>
Date: Sun, 27 May 2018 12:01:15 +0200
Subject: [PATCH] Push photo below preparation text

---
 recette/models.py      |  3 +++
 templates/recette.html | 10 ++++++----
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/recette/models.py b/recette/models.py
index b6fee15..a18e0d6 100644
--- a/recette/models.py
+++ b/recette/models.py
@@ -49,3 +49,6 @@ class Composition(models.Model):
     ingredient = models.ForeignKey(Ingredient, on_delete=models.PROTECT)
     quantite = models.DecimalField(max_digits=6, decimal_places=3, null=True, blank=True)
     unite = models.ForeignKey(Unite, null=True, blank=True, on_delete=models.PROTECT)
+
+    def __str__(self):
+        return "%s %s %s" % (self.quantite, self.unite.nom, self.ingredient.nom)
diff --git a/templates/recette.html b/templates/recette.html
index 062d145..f634389 100644
--- a/templates/recette.html
+++ b/templates/recette.html
@@ -3,19 +3,21 @@
 {% block content %}
 <h1>{{ recette.nom }}</h1>
 
-{% if recette.photo %}
-<div class="photo"><img src="{{ recette.photo.url }}"></div>
-{% endif %}
-
 <div>{{ recette.prep|linebreaksbr }}</div>
 
 {% if recette.ingredients.count %}
+<div class="ingredients">
 <h2>Ingrédients</h2>
 <ul>
     {% for comp in recette.ingredients.all %}
     <li>{{ comp }}</li>
     {% endfor %}
 </ul>
+</div>
+{% endif %}
+
+{% if recette.photo %}
+<div class="photo"><img src="{{ recette.photo.url }}"></div>
 {% endif %}
 {% endblock %}