-
Notifications
You must be signed in to change notification settings - Fork 18
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #350 from bottlerocket-os/main
Move to Prod: FAQ fix
- Loading branch information
Showing
13 changed files
with
63 additions
and
48 deletions.
There are no files selected for viewing
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,14 @@ | ||
|
|
||
| {{- $questions := .questions -}} | ||
| {{- range .groups -}} | ||
| {{- $group_name := . -}} | ||
| <h2>{{ $group_name }}</h2> | ||
|
|
||
| <div class="pl-5"> | ||
| {{- range (sort (index $questions $group_name) "question" ) -}} | ||
| <h3 id="{{.hash}}">{{ .question }} </h3> | ||
| {{ .answer }} | ||
| {{- end -}} | ||
| </div> | ||
| <hr /> | ||
| {{- end -}} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,15 @@ | ||
| <ol> | ||
| {{- $questions := .questions -}} | ||
| {{- range .groups -}} | ||
| {{- $group_name := . -}} | ||
| <li>{{ $group_name }} | ||
| <ol> | ||
| {{- range (sort (index $questions $group_name) "question" ) -}} | ||
| <li> | ||
| <a href="#{{ .hash }}">{{ .question }}</a> | ||
| </li> | ||
| {{- end -}} | ||
| </ol> | ||
| </li> | ||
| {{ end }} | ||
| </ol> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,49 +1,35 @@ | ||
| {{ $groups := slice }} | ||
| {{ $headless := .Site.GetPage "/faqitems" }} | ||
| {{ $faqItems := $headless.Resources.Match "*" }} | ||
| {{ range $faqItems }} | ||
| {{ $groups = $groups | append .Params.group }} | ||
| {{ end }} | ||
| {{ $groups = uniq $groups }} | ||
| <ul> | ||
| {{ $.Scratch.Set "groupindex" 0 }} | ||
| {{ range $groups }} | ||
|
|
||
| {{ $group := . }} | ||
| {{ $.Scratch.Set "groupindex" | ||
| (add ($.Scratch.Get "groupindex") 1) | ||
| }} | ||
| <li> {{ $.Scratch.Get "groupindex" }}. {{ $group }} | ||
| <ol> | ||
| {{ $.Scratch.Set "qindex" 0 }} | ||
| {{ range where $faqItems "Params.group" $group }} | ||
| {{ $.Scratch.Set "qindex" | ||
| (add ($.Scratch.Get "qindex") 1) | ||
| }} | ||
| <li><a href="#{{$.Scratch.Get "groupindex"}}_{{$.Scratch.Get "qindex"}}">{{ .Params.question }}</a></li> | ||
| {{ end }} | ||
| </ol> | ||
| </li> | ||
| {{ end }} | ||
| </ul> | ||
| {{- $groups := slice -}} | ||
| {{- $headless := .Site.GetPage "/faqitems" -}} | ||
| {{- $faq_items := $headless.Resources.Match "*" -}} | ||
|
|
||
| {{- $grouped := dict -}} | ||
|
|
||
| {{- $hash_links := slice -}} | ||
|
|
||
| {{- range $k, $v := $faq_items -}} | ||
| {{- $hash := (index (split (path.BaseName ($v.Page.File)) "-") 0) -}} | ||
| {{- $hash_links = $hash_links | append $hash -}} | ||
| {{- $group := $v.Params.group -}} | ||
|
|
||
| {{- if not ( reflect.IsSlice (index $grouped $group) ) -}} | ||
| {{- $grouped = merge $grouped (dict $group ( slice ) ) -}} | ||
| {{- end -}} | ||
|
|
||
| {{- $this_item := dict "hash" $hash "question" $v.Page.Params.question "answer" $v.Page.Content -}} | ||
| {{- $this_group := index $grouped $group | append $this_item -}} | ||
| {{- $grouped = merge $grouped (dict $group ( $this_group ) ) -}} | ||
|
|
||
| {{- $groups = $groups | append .Params.group -}} | ||
| {{- end -}} | ||
|
|
||
| {{- $unique_hashes := $hash_links | uniq | len -}} | ||
| {{- $total_faq_items := $faq_items | len -}} | ||
| {{- if ne $unique_hashes $total_faq_items -}} | ||
| {{- errorf "Oops! You have %d faq items and %d unique hash links. Check for duplicate IDs in faq file names." $total_faq_items $unique_hashes -}} | ||
| {{- end -}} | ||
|
|
||
| {{- $faq := dict "groups" (sort (uniq $groups) ) "questions" $grouped -}} | ||
|
|
||
| {{- partial "faq-index.html" $faq -}} | ||
| <hr /> | ||
| {{ $.Scratch.Set "groupindex" 0 }} | ||
| {{ range $groups }} | ||
| {{ $group := . }} | ||
| {{ $.Scratch.Set "groupindex" | ||
| (add ($.Scratch.Get "groupindex") 1) | ||
| }} | ||
| <h2>{{ $.Scratch.Get "groupindex" }}. {{ $group }}</h2> | ||
| <div class="pl-5"> | ||
| {{ $.Scratch.Set "qindex" 0 }} | ||
| {{ range where $faqItems "Params.group" $group }} | ||
| {{ $.Scratch.Set "qindex" | ||
| (add ($.Scratch.Get "qindex") 1) | ||
| }} | ||
| <h3 id="{{ $.Scratch.Get "groupindex" }}_{{ $.Scratch.Get "qindex" }}">{{ $.Scratch.Get "groupindex" }}.{{ $.Scratch.Get "qindex" }} {{ .Params.question }}</h3> | ||
| {{ .Content }} | ||
| {{ end }} | ||
| </div> | ||
|
|
||
| <hr /> | ||
| {{ end }} | ||
| {{- partial "faq-body.html" $faq -}} |