From f8d0724daf5e9412262210e37a51b531ecb67f6c Mon Sep 17 00:00:00 2001
From: vabene1111 <vabene1234@googlemail.com>
Date: Tue, 19 Nov 2019 21:02:33 +0100
Subject: [PATCH] manual form render order

---
 cookbook/forms.py                             |  4 +---
 .../templates/forms/edit_internal_recipe.html | 24 ++++++++++++-------
 2 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/cookbook/forms.py b/cookbook/forms.py
index 1990047ca..b5dca7256 100644
--- a/cookbook/forms.py
+++ b/cookbook/forms.py
@@ -35,11 +35,9 @@ class ExternalRecipeForm(forms.ModelForm):
 
 
 class InternalRecipeForm(forms.ModelForm):
-    table_pos = forms.CharField(show_hidden_initial=True, required=False, widget=forms.HiddenInput())
-
     class Meta:
         model = Recipe
-        fields = ('name', 'table_pos', 'instructions', 'time', 'keywords')
+        fields = ('name', 'instructions', 'time', 'keywords')
 
         labels = {
             'name': _('Name'),
diff --git a/cookbook/templates/forms/edit_internal_recipe.html b/cookbook/templates/forms/edit_internal_recipe.html
index 3f747f0ce..18b1cb63a 100644
--- a/cookbook/templates/forms/edit_internal_recipe.html
+++ b/cookbook/templates/forms/edit_internal_recipe.html
@@ -20,12 +20,18 @@
     <form action="." method="post">
         {% csrf_token %}
 
-        {{ form|crispy }}
-        <div id="ingredients-table"></div>
-        <br>
-        <div class="table-controls">
-            <button class="btn" id="new_empty" type="button"><i class="fas fa-plus-circle"></i></button>
-        </div>
+        {% for field in form %}
+            <div class="fieldWrapper">
+                {{ field|as_crispy_field }}
+            </div>
+            {% if field.name == 'name' %}
+                <div id="ingredients-table"></div>
+                <br>
+                <div class="table-controls">
+                    <button class="btn" id="new_empty" type="button"><i class="fas fa-plus-circle"></i></button>
+                </div>
+            {% endif %}
+        {% endfor %}
 
         <input type="hidden" id="ingredients_data_input" name="ingredients">
         <hr>
@@ -45,9 +51,9 @@
 
             var ingredients = {{ ingredients|safe }}
 
-            ingredients.forEach(function (cur, i) {
-                cur.delete = false
-            })
+                ingredients.forEach(function (cur, i) {
+                    cur.delete = false
+                })
 
             var data = ingredients