From 99a79266f6f7105f8cd05325fc75a5b9f044e8d2 Mon Sep 17 00:00:00 2001 From: f0x Date: Tue, 30 Jul 2024 17:21:31 +0200 Subject: [PATCH] reflect thread.html changes in templates --- web/assets/static-pages/thread.html | 349 ---------------------------- web/template/thread.tmpl | 131 +++++------ 2 files changed, 66 insertions(+), 414 deletions(-) delete mode 100644 web/assets/static-pages/thread.html diff --git a/web/assets/static-pages/thread.html b/web/assets/static-pages/thread.html deleted file mode 100644 index a24f9b4c8..000000000 --- a/web/assets/static-pages/thread.html +++ /dev/null @@ -1,349 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Post by @admin@localhost:8080 - - - - -
- - - Instance Logo - -

GoToSocial Testrig Instance

- -
-
-
-
-
-

Single post

- jump to replies -
- -
-
-
-

1 reply

- back to top -
-
-
-
- - -
- some user - , - @Some_User@example.org -
- (open profile) - -
-
-
-
- - some unknown media included - Toggle visibility - -
-
-

hi @admin here's some - media for ya

-
-
-
-
-
-
- - - - - - - Photograph of a sloth, Public Domain. - - - Photograph of a sloth, Public Domain. - -
-
-
-
- - - - - - - - - - -
-
-
-
- - - - - - - - - - -
-
-
-
- - - Open remote post (opens in a new window) - -
-
-
-
- - - - \ No newline at end of file diff --git a/web/template/thread.tmpl b/web/template/thread.tmpl index 0cf9ecb05..361efe3cc 100644 --- a/web/template/thread.tmpl +++ b/web/template/thread.tmpl @@ -18,81 +18,82 @@ */ -}} {{- define "repliesSummary" -}} - {{- if .context.ThreadRepliesShown -}} - {{- if .context.ThreadRepliesHidden -}} - {{- if eq .context.ThreadRepliesShown 1 -}} - {{- /* Some replies are hidden. */ -}} - {{ .context.ThreadRepliesShown }} visible reply - {{- else if gt .context.ThreadRepliesShown 1 -}} - {{ .context.ThreadRepliesShown }} visible replies - {{- end -}} - ; {{ .context.ThreadRepliesHidden }} more {{ if eq .context.ThreadRepliesHidden 1 }}reply{{ else }}replies{{ end }} hidden or not public - {{- else -}} - {{- /* No hidden replies. */ -}} - {{- if eq .context.ThreadReplies 1 -}} - {{ .context.ThreadReplies }} reply - {{- else if gt .context.ThreadReplies 1 -}} - {{ .context.ThreadReplies }} replies - {{- end -}} - {{- end -}} - {{- else -}} - {{- .context.ThreadRepliesHidden }} {{ if eq .context.ThreadRepliesHidden 1 }}reply{{ else }}replies{{ end }} hidden or not public - {{- end -}} +{{- if .context.ThreadRepliesShown -}} +{{- if .context.ThreadRepliesHidden -}} +{{- if eq .context.ThreadRepliesShown 1 -}} +{{- /* Some replies are hidden. */ -}} +{{ .context.ThreadRepliesShown }} visible reply +{{- else if gt .context.ThreadRepliesShown 1 -}} +{{ .context.ThreadRepliesShown }} visible replies +{{- end -}} +; {{ .context.ThreadRepliesHidden }} more {{ if eq .context.ThreadRepliesHidden 1 }}reply{{ else }}replies{{ end }} +hidden or not public +{{- else -}} +{{- /* No hidden replies. */ -}} +{{- if eq .context.ThreadReplies 1 -}} +{{ .context.ThreadReplies }} reply +{{- else if gt .context.ThreadReplies 1 -}} +{{ .context.ThreadReplies }} replies +{{- end -}} +{{- end -}} +{{- else -}} +{{- .context.ThreadRepliesHidden }} {{ if eq .context.ThreadRepliesHidden 1 }}reply{{ else }}replies{{ end }} hidden or +not public +{{- end -}} {{- end -}} {{- define "threadSummary" -}} - {{- if .context.ThreadHidden -}} - {{- if eq .context.ThreadShown 1 -}} - Single visible post - {{- else if gt .context.ThreadShown 1 -}} - Thread of {{ .context.ThreadShown }} visible posts - {{- end -}} - ; {{ .context.ThreadHidden }} more {{ if eq .context.ThreadHidden 1 }}post{{ else }}posts{{ end }} hidden or not public - {{- else -}} - {{- /* No hidden posts */ -}} - {{- if eq .context.ThreadLength 1 -}} - Single post - {{- else if gt .context.ThreadLength 1 -}} - Thread of {{ .context.ThreadLength }} posts - {{- end -}} - {{- end -}} +{{- if .context.ThreadHidden -}} +{{- if eq .context.ThreadShown 1 -}} +Single visible post +{{- else if gt .context.ThreadShown 1 -}} +Thread of {{ .context.ThreadShown }} visible posts +{{- end -}} +; {{ .context.ThreadHidden }} more {{ if eq .context.ThreadHidden 1 }}post{{ else }}posts{{ end }} hidden or not public +{{- else -}} +{{- /* No hidden posts */ -}} +{{- if eq .context.ThreadLength 1 -}} +Single post +{{- else if gt .context.ThreadLength 1 -}} +Thread of {{ .context.ThreadLength }} posts +{{- end -}} +{{- end -}} {{- end -}} {{- define "repliesStart" -}} {{- with . }}
-
+

{{- template "repliesSummary" . -}}

back to top
-{{- end }} -{{- end -}} - -{{- with . }} -
-
-
-

{{- template "threadSummary" . -}}

- {{- if .context.ThreadRepliesShown }} - jump to replies - {{- end }} -
- - {{- range $status := .context.Statuses }} -
- {{- include "status.tmpl" $status | indent 3 }} -
- {{- if and $status.ThreadLastMain $.context.ThreadReplies }} - {{- include "repliesStart" $ | indent 1 }} - {{- end }} - {{- end }} - - {{- if .context.ThreadReplies }} -
{{- end }} -
-{{- end }} \ No newline at end of file + {{- end -}} + + {{- with . }} +
+
+
+

{{- template "threadSummary" . -}}

+ {{- if .context.ThreadRepliesShown }} + jump to replies + {{- end }} +
+ + {{- range $status := .context.Statuses }} +
+ {{- include "status.tmpl" $status | indent 3 }} +
+ {{- if and $status.ThreadLastMain $.context.ThreadReplies }} + {{- include "repliesStart" $ | indent 1 }} + {{- end }} + {{- end }} + + {{- if .context.ThreadReplies }} +
+ {{- end }} +
+ {{- end }} \ No newline at end of file