mirrors/recipes
1
0
Fork 0
mirror of https://github.com/TandoorRecipes/recipes.git synced 2026-01-01 04:10:06 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' into recipe-serving-count

Browse Source
This commit is contained in:
vabene1111
2020-12-28 10:19:52 +01:00
committed by GitHub
parent 6f3068a28c 95461316a5
commit c4273a4c3f
59 changed files with 12191 additions and 5803 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
cookbook/templates/forms/ingredients.html
View File

@@ -23,7 +23,7 @@
<h4>{% trans 'Units' %}</h4>
<form action="{% url 'edit_food' %}" method="post"
onsubmit="return confirm('{% trans 'Are you sure that you want to merge these two units ?' %}')">
onsubmit="return confirm('{% trans 'Are you sure that you want to merge these two units?' %}')">
{% csrf_token %}
{{ units_form|crispy }}
<button class="btn btn-danger" type="submit"
@@ -33,7 +33,7 @@
<h4>{% trans 'Ingredients' %}</h4>
<form action="{% url 'edit_food' %}" method="post"
onsubmit="return confirm('{% trans 'Are you sure that you want to merge these two ingredients ?' %}')">
onsubmit="return confirm('{% trans 'Are you sure that you want to merge these two ingredients?' %}')">
{% csrf_token %}
{{ food_form|crispy }}
<button class="btn btn-danger" type="submit">