diff --git a/layouts/partials/bootstrap/toggle-item.html b/layouts/partials/bootstrap/toggle-item.html index c4d52a2..156a764 100644 --- a/layouts/partials/bootstrap/toggle-item.html +++ b/layouts/partials/bootstrap/toggle-item.html @@ -2,9 +2,8 @@ {{- $itemName := cond .IsNamedParams (.Get "name") (.Get 0) }} {{- $itemId := replace $itemName " " "-" | lower }} {{- $key := printf "toggle-%s-items" $toggleName }} -{{- .Page.Store.SetInMap $key $itemId (dict - "Id" $itemId - "Name" $itemName - "Inner" .Inner - "Weight" .Ordinal) +{{- .Page.Store.SetInMap $key $itemName (dict + "name" $itemName + "inner" .Inner + "weight" .Ordinal) -}} diff --git a/layouts/partials/bootstrap/toggle.html b/layouts/partials/bootstrap/toggle.html index f2d2234..144db29 100644 --- a/layouts/partials/bootstrap/toggle.html +++ b/layouts/partials/bootstrap/toggle.html @@ -4,17 +4,32 @@ {{- $style := "tabs" }} {{- $fill := true }} {{- $alignment := "" }} +{{- $data := "" }} {{- if .IsNamedParams }} {{- $name = .Get "name" }} {{- with .Get "style" }}{{ $style = . }}{{ end }} {{- with .Get "alignment" }}{{ $alignment = . }}{{ end }} {{- if isset .Params "fill" }}{{ $fill = .Get "fill" }}{{ end }} + {{- with .Get "data" }}{{ $data = . }}{{ end }} {{- else }} {{- $name = .Get 0 }} {{- with .Get 1 }}{{ $style = . }}{{ end }} + {{- with .Get 2 }}{{ $data = . }}{{ end }} {{- end }} -{{- $items := .Page.Store.Get (printf "toggle-%s-items" $name) }} -{{- $items = sort $items "Weight" }} +{{- $items := slice }} +{{- with $data }} + {{- with partial "bootstrap/functions/data" (dict "key" $data) }} + {{- $items = . }} + {{- end }} +{{- else }} + {{- with .Page.Store.Get (printf "toggle-%s-items" $name) }} + {{- $items = . }} + {{- end }} +{{- end }} +{{- if not $items }} + {{- warnf "[toggle] no items specified for %q." $name }} +{{- end }} +{{- $items = sort $items "weight" }} {{- $classes := slice "nav" "mb-2" @@ -28,7 +43,7 @@ id="toggle-{{ $name }}" role="tablist"> {{- range $i, $item := $items }} - {{- $idPrefix := printf "toggle-%s-%s" $name .Id }} + {{- $idPrefix := printf "toggle-%s-%s" $name .name | anchorize }} {{- end }}
{{- range $i, $item := $items }} - {{- $idPrefix := printf "toggle-%s-%s" $name .Id }} + {{- $idPrefix := printf "toggle-%s-%s" $name .name | anchorize }}
- {{ .Inner }} + {{ cond (ne $data "") (.inner | markdownify) .inner }}
{{- end }}