diff options
| author |  tobi <31960611+tsmethurst@users.noreply.github.com> | 2023-12-27 11:23:52 +0100 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2023-12-27 11:23:52 +0100 |
| commit | 0ff52b71f2c0e970b1f0d43793c019bbed93e112 (patch) | |
| tree | eff120472b4b6f837121536ada03f530d213b13e /web/template/thread.tmpl | |
| parent | [bugfix] :innocent: (#2476) (diff) | |
| download | gotosocial-0ff52b71f2c0e970b1f0d43793c019bbed93e112.tar.xz | |
[chore] Refactor HTML templates and CSS (#2480)
* [chore] Refactor HTML templates and CSS
* eslint
* ignore "Local"
* rss tests
* fiddle with OG just a tiny bit
* dick around with polls a bit more so SR stops saying "clickable"
* remove break
* oh lord
* don't lazy load avatar
* fix ogmeta tests
* clean up some cruft
* catch remaining calls to c.HTML
* fix error rendering + stack overflow in tag
* allow templating attributes
* fix indent
* set aria-hidden on status complementary content, since it's already present in the label anyway
* tidy up templating calls a little
* try to make styling a bit more consistent + readable
* fix up some remaining CSS issues
* fix up reports
Diffstat (limited to 'web/template/thread.tmpl')
| -rw-r--r-- | web/template/thread.tmpl | 59 |
1 files changed, 41 insertions, 18 deletions
diff --git a/web/template/thread.tmpl b/web/template/thread.tmpl index f2b61019d..2231a5ab8 100644 --- a/web/template/thread.tmpl +++ b/web/template/thread.tmpl @@ -17,22 +17,45 @@ // along with this program. If not, see <http://www.gnu.org/licenses/>. */ -}} -{{ template "header.tmpl" .}} -<main> - <section data-nosnippet class="thread"> - {{range .context.Ancestors}} - <article class="toot" id="{{.ID}}"> - {{ template "status.tmpl" .}} - </article> - {{end}} - <article class="toot expanded" id="{{.status.ID}}"> - {{ template "status.tmpl" .status}} - </article> - {{range .context.Descendants}} - <article class="toot" id="{{.ID}}"> - {{ template "status.tmpl" .}} - </article> - {{end}} - </section> +{{- define "threadLength" -}} + {{- with $length := add (len $.context.Ancestors) (len $.context.Descendants) | increment -}} + {{- if eq $length 1 -}} + {{- $length }} post + {{- else -}} + {{- $length }} posts + {{- end -}} + {{- end -}} +{{- end -}} + +{{- with . }} +<main data-nosnippet class="thread" aria-labelledby="thread-summary"> + <div class="col-header"> + <h2 id="thread-summary">Thread with {{ template "threadLength" . -}}</h2> + <a href="#{{- .status.ID -}}">jump to expanded post</a> + </div> + {{- range .context.Ancestors }} + <article + class="status" + {{- includeAttr "status_attributes.tmpl" . | indentAttr 2 }} + > + {{- include "status.tmpl" . | indent 2 }} + </article> + {{- end }} + {{- with .status }} + <article + class="status expanded" + {{- includeAttr "status_attributes.tmpl" . | indentAttr 2 }} + > + {{- include "status.tmpl" . | indent 2 }} + </article> + {{- end }} + {{- range .context.Descendants }} + <article + class="status" + {{- includeAttr "status_attributes.tmpl" . | indentAttr 2 }} + > + {{- include "status.tmpl" . | indent 2 }} + </article> + {{- end }} </main> -{{ template "footer.tmpl" .}}
\ No newline at end of file +{{- end }}
\ No newline at end of file |