refactor: move general results template code into results template
Alan Pearce alan@alanpearce.eu
Fri, 17 May 2024 09:19:12 +0200
2 files changed, 71 insertions(+), 65 deletions(-)
M frontend/templates/blocks/options.gotmpl → frontend/templates/blocks/options.gotmpl
@@ -1,71 +1,54 @@-{{- define "results" }} - {{- if gt .Results.Total 0 }} - <section id="results"> - {{- range .Results.Hits }} - {{- with .Data }} - <details id="{{ .Name }}"> - <summary> - {{ .Name }} - </summary> - {{ markdown .Description }} - <dl> - {{- with .Type }} - <dt>Type</dt> - <dd><code>{{ . }}</code></dd> - {{- end }} - {{- with .Default }} - {{- if or .Text .Markdown }} - <dt>Default</dt> - <dd> - {{- if .Markdown }} - {{ markdown .Markdown }} - {{- else }} - <pre><code>{{ .Text }}</code></pre> - {{- end }} - </dd> +{{- define "hits" }} + {{- range . }} + {{- with .Data }} + <details id="{{ .Name }}"> + <summary> + {{ .Name }} + </summary> + {{ markdown .Description }} + <dl> + {{- with .Type }} + <dt>Type</dt> + <dd><code>{{ . }}</code></dd> + {{- end }} + {{- with .Default }} + {{- if or .Text .Markdown }} + <dt>Default</dt> + <dd> + {{- if .Markdown }} + {{ markdown .Markdown }} + {{- else }} + <pre><code>{{ .Text }}</code></pre> {{- end }} - {{- end }} - {{- with .Example }} - {{- if or .Text .Markdown }} - <dt>Example</dt> - <dd> - {{- if .Markdown }} - {{ markdown .Markdown }} - {{- else }} - <pre><code>{{ .Text }}</code></pre> - {{- end }} - </dd> + </dd> + {{- end }} + {{- end }} + {{- with .Example }} + {{- if or .Text .Markdown }} + <dt>Example</dt> + <dd> + {{- if .Markdown }} + {{ markdown .Markdown }} + {{- else }} + <pre><code>{{ .Text }}</code></pre> {{- end }} - {{- end }} - {{- with .RelatedPackages }} - <dt>Related Packages</dt> - <dd>{{ . }}</dd> - {{- end }} - {{- with .Declarations }} - <dt>Declared</dt> - {{- range . }} - <dd> - <a href="{{ .URL }}">{{ .Name }}</a> - </dd> - {{- end }} - {{- end }} - </dl> - </details> - {{- end }} - {{- end }} - <footer> - <nav id="pagination"> - {{- with .Prev }} - <a class="button" href="{{ . }}" rel="prev">Prev</a> + </dd> + {{- end }} {{- end }} - {{- with .Next }} - <a class="button" href="{{ . }}" rel="next">Next</a> + {{- with .RelatedPackages }} + <dt>Related Packages</dt> + <dd>{{ . }}</dd> {{- end }} - </nav> - <span> {{ .Results.Total }} results </span> - </footer> - </section> - {{- else }} - Nothing found + {{- with .Declarations }} + <dt>Declared</dt> + {{- range . }} + <dd> + <a href="{{ .URL }}">{{ .Name }}</a> + </dd> + {{- end }} + {{- end }} + </dl> + </details> + {{- end }} {{- end }} {{- end }}
A frontend/templates/blocks/results.gotmpl
@@ -0,0 +1,23 @@+{{- define "results" }} + {{- with .Results }} + {{- if gt .Total 0 }} + <section id="results"> + {{ block "hits" .Hits }} + {{ end }} + <footer> + <nav id="pagination"> + {{- with $.Prev }} + <a class="button" href="{{ . }}" rel="prev">Prev</a> + {{- end }} + {{- with $.Next }} + <a class="button" href="{{ . }}" rel="next">Next</a> + {{- end }} + </nav> + <span>{{ .Total }} results</span> + </footer> + </section> + {{- else }} + Nothing found + {{- end }} + {{- end }} +{{- end }}