diff --git a/templates/macros/rezept.html b/templates/macros/rezept.html index 2272b09..ea636a2 100644 --- a/templates/macros/rezept.html +++ b/templates/macros/rezept.html @@ -55,6 +55,7 @@ {%- if ing.ingredient is defined and ing.ingredient != "" -%} {%- if ing.amounts is defined and ing.amounts != "" and ing.amounts.blocks is defined and ing.amounts.blocks != "" -%} {%- if ing.amounts.blocks != [] -%} + {%- set ingredient_counter = loop.index -%} {%- for amt in ing.amounts.blocks -%} {%- if loop.index == prt_loop -%} {%- if amt.amount is defined and amt.amount != "" and amt.amount != 0 and amt.amount != '0' -%} @@ -66,52 +67,15 @@ >{{ ing.ingredient }}: {{ amt.amount }} {{ amt.unit | default('each') }} {%- if ing.processing is defined and ing.processing != "" and ing.processing.blocks is defined and ing.processing.blocks != "" -%} {%- if ing.processing.blocks != [] -%} - {{- '\n ' -}} + {{- ' | ' -}} + Verarbeitungshinweis #{{- ingredient_counter | string -}} {%- endif -%} {%- endif -%} {%- if ing.notes is defined and ing.notes != "" and ing.notes.blocks is defined and ing.notes.blocks != "" -%} {%- if ing.notes.blocks != [] -%} - {{- '\n ' -}} {%- endif -%} {%- endif -%} {%- if ing.substitutions is defined and ing.substitutions != "" -%} @@ -205,22 +169,106 @@ {%- endif -%} {%- endfor -%} {{- '\n ' -}} + {%- else -%} + {{- '\n ' -}} + {%- endif -%} + {%- else -%} + {{- '\n ' -}} + {%- endif -%} + + + + + {%- if child.ingredients is defined and child.ingredients != "" %} + {%- if child.ingredients.blocks != [] -%} + {{- '\n ' -}} + {%- endif -%} + {%- endif -%} + {%- if ing1.notes is defined and ing1.notes != "" and ing1.notes.blocks is defined and ing1.notes.blocks != "" -%} + {%- if ing1.notes.blocks != [] -%} + {{- '\n ' -}} + {%- endif -%} + {%- endif -%} + {{- '\n ' -}} + {%- endif -%} + {%- endif -%} + {%- endfor -%} + {%- endif -%} + {%- endif -%} + {%- endif -%} + {%- endfor -%} + {{- '\n ' -}} {%- else -%} {{- '\n ' -}} + {%- endif -%} + {%- else -%} + {{- '\n ' -}} {%- endif -%} - {%- else -%} - {{- '\n ' -}} - {%- endif -%} - {%- endfor -%} + {%- endfor -%} + {%- endif -%} {%- endif -%} + {{- '\n ' -}} + {{- '\n ' -}} {%- endif -%} - {{- '\n ' -}} - {{- '\n ' -}} - {%- endif -%} {#- Rezept Schritte...