Push photo below preparation text

This commit is contained in:
Claude Paroz 2018-05-27 12:01:15 +02:00
parent 1247a53278
commit 45de848cbe
2 changed files with 9 additions and 4 deletions

View File

@ -49,3 +49,6 @@ class Composition(models.Model):
ingredient = models.ForeignKey(Ingredient, on_delete=models.PROTECT) ingredient = models.ForeignKey(Ingredient, on_delete=models.PROTECT)
quantite = models.DecimalField(max_digits=6, decimal_places=3, null=True, blank=True) 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) 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)

View File

@ -3,19 +3,21 @@
{% block content %} {% block content %}
<h1>{{ recette.nom }}</h1> <h1>{{ recette.nom }}</h1>
{% if recette.photo %}
<div class="photo"><img src="{{ recette.photo.url }}"></div>
{% endif %}
<div>{{ recette.prep|linebreaksbr }}</div> <div>{{ recette.prep|linebreaksbr }}</div>
{% if recette.ingredients.count %} {% if recette.ingredients.count %}
<div class="ingredients">
<h2>Ingrédients</h2> <h2>Ingrédients</h2>
<ul> <ul>
{% for comp in recette.ingredients.all %} {% for comp in recette.ingredients.all %}
<li>{{ comp }}</li> <li>{{ comp }}</li>
{% endfor %} {% endfor %}
</ul> </ul>
</div>
{% endif %}
{% if recette.photo %}
<div class="photo"><img src="{{ recette.photo.url }}"></div>
{% endif %} {% endif %}
{% endblock %} {% endblock %}