From 9422e8194245c9cdbfa09b38c20173964349e2a2 Mon Sep 17 00:00:00 2001 From: xengineering Date: Thu, 24 Oct 2024 17:24:00 +0200 Subject: view: Order ingredient summary by ingredient name This makes it easier to write a shopping list for the required ingredients. --- view/html/recipe-confirm-deletion.html | 4 ++-- view/html/recipe-edit.html | 22 +++++++++++----------- view/html/recipe.html | 28 +++++++++++----------------- 3 files changed, 24 insertions(+), 30 deletions(-) (limited to 'view/html') diff --git a/view/html/recipe-confirm-deletion.html b/view/html/recipe-confirm-deletion.html index 2bc9429..0e51681 100644 --- a/view/html/recipe-confirm-deletion.html +++ b/view/html/recipe-confirm-deletion.html @@ -9,8 +9,8 @@

Do you really want to delete this recipe?

- - + +
{{ template "footer" }} diff --git a/view/html/recipe-edit.html b/view/html/recipe-edit.html index cd3ba86..9a18e75 100644 --- a/view/html/recipe-edit.html +++ b/view/html/recipe-edit.html @@ -8,24 +8,24 @@

Recipe editor

-
- - - + + + + -

-

-

-

+

+

+

+

-
{{range .Steps}} +
{{range .Recipe.Steps}} {{template "recipe-step" .}}{{end}}
- {{if eq .Id ""}} + {{if eq .Recipe.Id ""}} {{else}} - {{end}} + {{end}}
{{ template "footer" }} diff --git a/view/html/recipe.html b/view/html/recipe.html index 7abcad4..cf30d06 100644 --- a/view/html/recipe.html +++ b/view/html/recipe.html @@ -1,30 +1,24 @@ {{define "recipe"}} -{{- $hasIngredients := false -}} -{{- range .Steps -}} - {{- if gt (len .Ingredients) 0 -}} - {{- $hasIngredients = true -}} - {{- end -}} -{{- end -}} {{ template "head" }}
{{ template "nav" }} -

{{.Title}}

+

{{.Recipe.Title}}

- - -

{{ if ne .Notes "" }} -

{{.Notes}}

{{end}}{{ if ne .Portions "" }} -

Portions: {{.Portions}}

{{end}}{{ if ne .Url "" }} -

Original recipe: link

{{end}} - {{if $hasIngredients}}

Ingredient summary:

- {{end}}{{range .Steps}} + + +

{{ if ne .Recipe.Notes "" }} +

{{.Recipe.Notes}}

{{end}}{{ if ne .Recipe.Portions "" }} +

Portions: {{.Recipe.Portions}}

{{end}}{{ if ne .Recipe.Url "" }} +

Original recipe: link

{{end}}{{if .HasIngredients}} +

Ingredient summary:

+ {{end}}{{range .Recipe.Steps}}

{{.Text}}

{{range $i, $el := .Ingredients}}{{if $i}}, {{end}}{{if ne $el.Amount ""}}{{$el.Amount}} {{end}}{{if ne $el.Unit ""}}{{$el.Unit}} {{end}}{{$el.Type}}{{end}}

-- cgit v1.2.3-70-g09d2