From 58432037024ed8e31235008412ebfd540df95db1 Mon Sep 17 00:00:00 2001
From: Claude Paroz <claude@2xlibre.net>
Date: Sun, 14 Oct 2018 18:15:25 +0200
Subject: [PATCH] Add separate photo for instructions

---
 recette/admin.py                               |  6 ++++++
 recette/forms.py                               |  2 +-
 recette/migrations/0004_recette_photo_instr.py | 18 ++++++++++++++++++
 recette/models.py                              |  1 +
 templates/recette.html                         |  7 ++++++-
 5 files changed, 32 insertions(+), 2 deletions(-)
 create mode 100644 recette/migrations/0004_recette_photo_instr.py

diff --git a/recette/admin.py b/recette/admin.py
index a67f5f2..6f6ae45 100644
--- a/recette/admin.py
+++ b/recette/admin.py
@@ -20,6 +20,12 @@ class RecetteForm(forms.ModelForm):
         widget=forms.ClearableFileInput(attrs={'capture': True, 'accept': "image/*"}),
         required=False
     )
+    photo_instr = forms.ImageField(
+        label="Photo des instructions",
+        widget=forms.ClearableFileInput(attrs={'capture': True, 'accept': "image/*"}),
+        required=False
+    )
+
     class Meta:
         model = Recette
         fields = '__all__'
diff --git a/recette/forms.py b/recette/forms.py
index b183aab..d24345d 100644
--- a/recette/forms.py
+++ b/recette/forms.py
@@ -6,7 +6,7 @@ from .models import Recette
 class SearchForm(forms.Form):
     text = forms.CharField(
         widget=forms.TextInput(attrs={'autofocus': True}),
-        required=False
+        label="Texte", required=False
     )
     saison = forms.ChoiceField(choices=(('all', "Toutes"),) + Recette.SAISON_CHOICES)
     veget = forms.BooleanField(label="Végétarien", required=False)
diff --git a/recette/migrations/0004_recette_photo_instr.py b/recette/migrations/0004_recette_photo_instr.py
new file mode 100644
index 0000000..c795841
--- /dev/null
+++ b/recette/migrations/0004_recette_photo_instr.py
@@ -0,0 +1,18 @@
+# Generated by Django 2.0.5 on 2018-10-14 16:04
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('recette', '0003_recette_is_veget'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='recette',
+            name='photo_instr',
+            field=models.ImageField(blank=True, upload_to='photos', verbose_name='Photo des instructions'),
+        ),
+    ]
diff --git a/recette/models.py b/recette/models.py
index feb3468..a74bbbf 100644
--- a/recette/models.py
+++ b/recette/models.py
@@ -32,6 +32,7 @@ class Recette(models.Model):
     )
     nom = models.CharField("Nom", max_length=200)
     photo = models.ImageField("Photo", upload_to='photos', blank=True)
+    photo_instr = models.ImageField("Photo des instructions", upload_to='photos', blank=True)
     nb_pers = models.IntegerField(default=4)
     saison = ChoiceArrayField(
         models.CharField(max_length=10, choices=SAISON_CHOICES, blank=True),
diff --git a/templates/recette.html b/templates/recette.html
index 7b1b07f..6f20d71 100644
--- a/templates/recette.html
+++ b/templates/recette.html
@@ -16,8 +16,13 @@
 </div>
 {% endif %}
 
+{% if recette.photo_instr %}
+<div class="photo"><img src="{{ recette.photo_instr.url }}">
+</div>
+{% endif %}
 {% if recette.photo %}
-<div class="photo"><img src="{{ recette.photo.url }}"></div>
+<div class="photo"{% if recette.ingredients.count or recette.photo_instr %} style="max-width: 50%"{% endif %}><img src="{{ recette.photo.url }}">
+</div>
 {% endif %}
 {% endblock %}