From c369fbac1e32b4e0ea9ace81d537540e3c0ff222 Mon Sep 17 00:00:00 2001 From: Claude Paroz Date: Sun, 27 May 2018 11:22:55 +0200 Subject: [PATCH] Show number of search results --- recette/forms.py | 5 ++++- recette/static/css/main.css | 1 + recette/views.py | 8 +++++++- templates/index.html | 3 +++ 4 files changed, 15 insertions(+), 2 deletions(-) diff --git a/recette/forms.py b/recette/forms.py index d63d18f..b183aab 100644 --- a/recette/forms.py +++ b/recette/forms.py @@ -4,7 +4,10 @@ from .models import Recette class SearchForm(forms.Form): - text = forms.CharField(widget=forms.TextInput(attrs={'autofocus': True})) + text = forms.CharField( + widget=forms.TextInput(attrs={'autofocus': True}), + required=False + ) saison = forms.ChoiceField(choices=(('all', "Toutes"),) + Recette.SAISON_CHOICES) veget = forms.BooleanField(label="Végétarien", required=False) diff --git a/recette/static/css/main.css b/recette/static/css/main.css index 1aaa53e..89b62be 100644 --- a/recette/static/css/main.css +++ b/recette/static/css/main.css @@ -1,2 +1,3 @@ +div.results { margin-top: 1em; } div.photo { float: right; } div.photo img { max-width: 100%; } diff --git a/recette/views.py b/recette/views.py index 3093ce2..14c4185 100644 --- a/recette/views.py +++ b/recette/views.py @@ -7,10 +7,16 @@ from .models import Recette def home(request): form = SearchForm(request.POST or None) recettes = [] + num_results = None if request.method == 'POST': recettes = form.search() + num_results = recettes.count() - return render(request, 'index.html', context={'form': form, 'recettes': recettes}) + return render(request, 'index.html', context={ + 'form': form, + 'recettes': recettes, + 'num_results': num_results, + }) def recette(request, pk): diff --git a/templates/index.html b/templates/index.html index 9b40938..9727e7d 100644 --- a/templates/index.html +++ b/templates/index.html @@ -8,6 +8,9 @@ +{% if num_results is not None %} +
{{ num_results }} résultat(s)
+{% endif %}