reflect thread.html changes in templates

This commit is contained in:
f0x 2024-07-30 17:21:31 +02:00
parent 3012b8a04a
commit 99a79266f6
2 changed files with 66 additions and 414 deletions

View file

@ -1,349 +0,0 @@
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="UTF-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<meta name="robots" content="noindex, nofollow">
<meta name="og:locale" content="en">
<meta property="og:type" content="article">
<meta property="og:title" content="Post by @admin@localhost:8080">
<meta property="og:url" content="http://localhost:8080/@admin/statuses/01F8MH75CBF9JFX4ZAD54N0W0R">
<meta property="og:site_name" content="localhost:8080">
<meta property="og:description" content="hello world! #welcome ! first post on the instance !">
<meta property="og:article:publisher" content="http://localhost:8080/@admin">
<meta property="og:article:author" content="http://localhost:8080/@admin">
<meta property="og:article:modified_time" content="2021-10-20T11:36:45.000Z">
<meta property="og:article:published_time" content="2021-10-20T11:36:45.000Z">
<meta property="og:image"
content="http://localhost:8080/fileserver/01F8MH17FWEB39HZJ76B6VXSKF/attachment/small/01F8MH6NEM8D7527KZAECTCR76.webp">
<meta property="og:image:alt" content="Black and white image of some 50&#39;s style text saying: Welcome On Board">
<meta property="og:image:width" content="512">
<meta property="og:image:height" content="268">
<link rel="icon" href="http://localhost:8080/assets/logo.webp" type="image/webp">
<link rel="apple-touch-icon" href="http://localhost:8080/assets/logo.webp" type="image/webp">
<link rel="apple-touch-startup-image" href="http://localhost:8080/assets/logo.webp" type="image/webp">
<link rel="preload" href="/assets/fonts/noto-sans-v27-latin-regular.woff2" as="font" type="font/woff2" crossorigin>
<link rel="preload" href="/assets/fonts/noto-sans-v27-latin-700.woff2" as="font" type="font/woff2" crossorigin>
<link rel="stylesheet" href="/assets/dist/default.css">
<link rel="stylesheet" href="/assets/dist/style.css">
<link rel="stylesheet" href="/@admin/custom.css">
<script type="text/javascript" src="/assets/dist/frontend.js" async="" defer=""></script>
<title>Post by @admin@localhost:8080</title>
</head>
<body class="page">
<script type="text/javascript" src="//localhost:35729/livereload.js?snipver=1" async="" defer=""></script>
<header class="page-header">
<a aria-label="GoToSocial Testrig Instance. Go to instance homepage" href="/" class="nounderline">
<picture>
<img src="http://localhost:8080/assets/logo.webp" alt="Instance Logo" title="Instance Logo" />
</picture>
<h1>GoToSocial Testrig Instance</h1>
</a>
</header>
<div class="page-content">
<main class="thread-wrapper" data-nosnippet>
<section class="thread thread-main" aria-labelledby="thread-summary">
<div class="col-header wrap">
<h2 id="thread-summary">Single post</h2>
<a href="#replies">jump to replies</a>
</div>
<article class="status expanded" id="01F8MH75CBF9JFX4ZAD54N0W0R" role="region"
aria-label="@admin, Oct 20, 2021, language Engels (English), has media, 1 reply, 1 favourite">
<header class="status-header">
<address>
<a href="http://localhost:8080/@admin" rel="author" title="Open profile">
<picture class="avatar" aria-hidden="true">
<img src="http://localhost:8080/assets/default_avatars/GoToSocial_icon4.webp" alt="Avatar for admin"
title="Avatar for admin">
</picture>
<div class="author-strapline">
<span class="displayname text-cutoff">admin</span>
<span class="sr-only">,</span>
<span class="username text-cutoff">@admin</span>
</div>
<span class="sr-only">(open profile)</span>
</a>
</address>
</header>
<div class="status-body">
<div class="text">
<div class="content" lang="en">
hello world! #welcome ! first post on the instance <picture>
<source class="emoji"
srcset="http://localhost:8080/fileserver/01AY6P665V14JJR0AFVRT7311Y/emoji/static/01F8MH9H8E4VG3KDYJR9EGPXCQ.png"
type="image/png" media="(prefers-reduced-motion: reduce)" width="25" height="25" /><img
class="emoji"
src="http://localhost:8080/fileserver/01AY6P665V14JJR0AFVRT7311Y/emoji/original/01F8MH9H8E4VG3KDYJR9EGPXCQ.png"
title=":rainbow:" alt=":rainbow:" loading="lazy" width="25" height="25" /></picture> !
</div>
</div>
<div class="media photoswipe-gallery odd single" role="group" aria-label="1 attachment">
<div class="media-wrapper">
<details class="image-spoiler media-spoiler" open>
<summary>
<div class="show sensitive button" aria-hidden="true">Show sensitive media</div>
<span class="eye button" role="button" tabindex="0" aria-label="Toggle media">
<i class="hide fa fa-fw fa-eye-slash" aria-hidden="true"></i>
<i class="show fa fa-fw fa-eye" aria-hidden="true"></i>
</span>
<img
src="http://localhost:8080/fileserver/01F8MH17FWEB39HZJ76B6VXSKF/attachment/small/01F8MH6NEM8D7527KZAECTCR76.webp"
loading="lazy" alt="Black and white image of some 50&#39;s style text saying: Welcome On Board"
title="Black and white image of some 50&#39;s style text saying: Welcome On Board" width="1200"
height="630" />
</summary>
<a class="photoswipe-slide"
href="http://localhost:8080/fileserver/01F8MH17FWEB39HZJ76B6VXSKF/attachment/original/01F8MH6NEM8D7527KZAECTCR76.jpg"
target="_blank" data-pswp-width="1200px" data-pswp-height="630px" data-cropped="true"
alt="Black and white image of some 50&#39;s style text saying: Welcome On Board"
title="Black and white image of some 50&#39;s style text saying: Welcome On Board">
<img
src="http://localhost:8080/fileserver/01F8MH17FWEB39HZJ76B6VXSKF/attachment/small/01F8MH6NEM8D7527KZAECTCR76.webp"
loading="lazy" alt="Black and white image of some 50&#39;s style text saying: Welcome On Board"
title="Black and white image of some 50&#39;s style text saying: Welcome On Board" width="1200"
height="630" />
</a>
</details>
</div>
</div>
</div>
<aside class="status-info" aria-hidden="true">
<dl class="status-stats">
<div class="stats-grouping">
<div class="stats-item published-at text-cutoff">
<dt class="sr-only">Published</dt>
<dd>
<time datetime="2021-10-20T11:36:45.000Z">Oct 20, 2021, 13:36</time>
</dd>
</div>
<div class="stats-grouping">
<div class="stats-item" title="Replies">
<dt>
<span class="sr-only">Replies</span>
<i class="fa fa-reply-all" aria-hidden="true"></i>
</dt>
<dd>1</dd>
</div>
<div class="stats-item" title="Faves">
<dt>
<span class="sr-only">Favourites</span>
<i class="fa fa-star" aria-hidden="true"></i>
</dt>
<dd>1</dd>
</div>
<div class="stats-item" title="Boosts">
<dt>
<span class="sr-only">Reblogs</span>
<i class="fa fa-retweet" aria-hidden="true"></i>
</dt>
<dd>0</dd>
</div>
</div>
</div>
<div class="stats-item language" title="Engels (English)">
<dt class="sr-only">Language</dt>
<dd>
<span class="sr-only">Engels (English)</span>
<span aria-hidden="true">en</span>
</dd>
</div>
</dl>
</aside>
<a href="http://localhost:8080/@admin/statuses/01F8MH75CBF9JFX4ZAD54N0W0R" class="status-link" data-nosnippet
title="Open thread at this post">
Open thread at this post
</a>
</article>
</section>
<section class="thread thread-replies" aria-labelledby="replies" open>
<div class="col-header wrap replies">
<h2 id="replies">1 reply</h2>
<a href="#thread-summary">back to top</a>
</div>
<article class="status" id="01HE7XJ1CG84TBKH5V9XKBVGF5" role="region"
aria-label="@Some_User@example.org, Nov 02, 2023, language Engels (English), has media">
<header class="status-header">
<address>
<a href="http://example.org/@Some_User" rel="author nofollow noreferrer noopener" target="_blank"
title="Open remote profile (opens in a new window)">
<picture class="avatar" aria-hidden="true">
<img src="http://localhost:8080/assets/default_avatars/GoToSocial_icon4.webp"
alt="Avatar for Some_User" title="Avatar for Some_User">
</picture>
<div class="author-strapline">
<span class="displayname text-cutoff">some user</span>
<span class="sr-only">,</span>
<span class="username text-cutoff">@Some_User@example.org</span>
</div>
<span class="sr-only">(open profile)</span>
</a>
</address>
</header>
<div class="status-body">
<details class="text-spoiler">
<summary>
<span class="spoiler-text" lang="en">some unknown media included</span>
<span class="button" role="button" tabindex="0">Toggle visibility</span>
</summary>
<div class="text">
<div class="content" lang="en">
<p>hi <span class="h-card"><a href="http://localhost:8080/@admin" class="u-url mention"
rel="nofollow noreferrer noopener" target="_blank">@<span>admin</span></a></span> here's some
media for ya</p>
</div>
</div>
</details>
<div class="media photoswipe-gallery odd " role="group" aria-label="3 attachments">
<div class="media-wrapper">
<details class="image-spoiler media-spoiler">
<summary>
<div class="show sensitive button" aria-hidden="true">Show sensitive media</div>
<span class="eye button" role="button" tabindex="0" aria-label="Toggle media">
<i class="hide fa fa-fw fa-eye-slash" aria-hidden="true"></i>
<i class="show fa fa-fw fa-eye" aria-hidden="true"></i>
</span>
<img
src="http://localhost:8080/fileserver/01FHMQX3GAABWSM0S2VZEC2SWC/attachment/small/01HE7Y3C432WRSNS10EZM86SA5.webp"
loading="lazy" alt="Photograph of a sloth, Public Domain."
title="Photograph of a sloth, Public Domain." width="3000" height="2000" />
</summary>
<a class="photoswipe-slide"
href="http://localhost:8080/fileserver/01FHMQX3GAABWSM0S2VZEC2SWC/attachment/original/01HE7Y3C432WRSNS10EZM86SA5.jpg"
target="_blank" data-pswp-width="3000px" data-pswp-height="2000px" data-cropped="true"
alt="Photograph of a sloth, Public Domain." title="Photograph of a sloth, Public Domain.">
<img
src="http://localhost:8080/fileserver/01FHMQX3GAABWSM0S2VZEC2SWC/attachment/small/01HE7Y3C432WRSNS10EZM86SA5.webp"
loading="lazy" alt="Photograph of a sloth, Public Domain."
title="Photograph of a sloth, Public Domain." width="3000" height="2000" />
</a>
</details>
</div>
<div class="media-wrapper">
<details class="unknown-spoiler media-spoiler">
<summary>
<div class="show sensitive button" aria-hidden="true">Show sensitive media</div>
<span class="eye button" role="button" tabindex="0" aria-label="Toggle media">
<i class="hide fa fa-fw fa-eye-slash" aria-hidden="true"></i>
<i class="show fa fa-fw fa-eye" aria-hidden="true"></i>
</span>
</summary>
<a class="unknown-attachment"
href="http://example.org/fileserver/01HE7Y659ZWZ02JM4AWYJZ176Q/attachment/original/01HE7ZGJYTSYMXF927GF9353KR.svg"
rel="nofollow noreferrer noopener" target="_blank"
title="Open external media: SVG line art of a sloth, public domain&#10;&#13;http://example.org/fileserver/01HE7Y659ZWZ02JM4AWYJZ176Q/attachment/original/01HE7ZGJYTSYMXF927GF9353KR.svg">
<div class="placeholder" aria-hidden="true">
<i class="placeholder-external-link fa fa-external-link"></i>
<i class="placeholder-icon fa fa-file-text"></i>
<div class="placeholder-link-to">External media</div>
</div>
</a>
</details>
</div>
<div class="media-wrapper">
<details class="unknown-spoiler media-spoiler">
<summary>
<div class="show sensitive button" aria-hidden="true">Show sensitive media</div>
<span class="eye button" role="button" tabindex="0" aria-label="Toggle media">
<i class="hide fa fa-fw fa-eye-slash" aria-hidden="true"></i>
<i class="show fa fa-fw fa-eye" aria-hidden="true"></i>
</span>
</summary>
<a class="unknown-attachment"
href="http://example.org/fileserver/01HE7Y659ZWZ02JM4AWYJZ176Q/attachment/original/01HE892Y8ZS68TQCNPX7J888P3.mp3"
rel="nofollow noreferrer noopener" target="_blank"
title="Open external media: Jolly salsa song, public domain.&#10;&#13;http://example.org/fileserver/01HE7Y659ZWZ02JM4AWYJZ176Q/attachment/original/01HE892Y8ZS68TQCNPX7J888P3.mp3">
<div class="placeholder" aria-hidden="true">
<i class="placeholder-external-link fa fa-external-link"></i>
<i class="placeholder-icon fa fa-file-text"></i>
<div class="placeholder-link-to">External media</div>
</div>
</a>
</details>
</div>
</div>
</div>
<aside class="status-info" aria-hidden="true">
<dl class="status-stats">
<div class="stats-grouping">
<div class="stats-item published-at text-cutoff">
<dt class="sr-only">Published</dt>
<dd>
<time datetime="2023-11-02T10:44:25.000Z">Nov 02, 2023, 11:44</time>
</dd>
</div>
<div class="stats-grouping">
<div class="stats-item" title="Replies">
<dt>
<span class="sr-only">Replies</span>
<i class="fa fa-reply-all" aria-hidden="true"></i>
</dt>
<dd>0</dd>
</div>
<div class="stats-item" title="Faves">
<dt>
<span class="sr-only">Favourites</span>
<i class="fa fa-star" aria-hidden="true"></i>
</dt>
<dd>0</dd>
</div>
<div class="stats-item" title="Boosts">
<dt>
<span class="sr-only">Reblogs</span>
<i class="fa fa-retweet" aria-hidden="true"></i>
</dt>
<dd>0</dd>
</div>
</div>
</div>
<div class="stats-item language" title="Engels (English)">
<dt class="sr-only">Language</dt>
<dd>
<span class="sr-only">Engels (English)</span>
<span aria-hidden="true">en</span>
</dd>
</div>
</dl>
</aside>
<a href="http://example.org/@Some_User/statuses/01HE7XJ1CG84TBKH5V9XKBVGF5" class="status-link" data-nosnippet
rel="nofollow noreferrer noopener" target="_blank" title="Open remote post (opens in a new window)">
Open remote post (opens in a new window)
</a>
</article>
</section>
</main>
</div>
<footer class="page-footer">
<nav>
<ul class="nodot">
<li id="about">
<a href="/about" class="nounderline">
About GoToSocial Testrig Instance
</a>
</li>
<li id="version">
<a href="https://github.com/superseriousbusiness/gotosocial" class="nounderline"
rel="nofollow noreferrer noopener" target="_blank">
<span aria-hidden="true">🦥</span>
Source - GoToSocial 0.0.0-testrig
<span aria-hidden="true">🦥</span>
</a>
</li>
<li id="contact">
<a href="/@admin" class="nounderline">
Contact account - admin
</a>
</li>
<li id="email">
<a href="mailto:admin@example.org" class="nounderline" rel="nofollow noreferrer noopener" target="_blank">
Email - admin@example.org
</a>
</li>
</ul>
</nav>
</footer>
</body>
</html>

View file

@ -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 . }}
</section>
<section class="thread thread-replies" aria-labelledby="replies" open>
<div class="col-header replies{{- if not .context.ThreadRepliesShown }} hidden-only{{- end -}}">
<div class="col-header wrap replies{{- if not .context.ThreadRepliesShown }} hidden-only{{- end -}}">
<h2 id="replies">{{- template "repliesSummary" . -}}</h2>
<a href="#thread-summary">back to top</a>
</div>
{{- end }}
{{- end -}}
{{- with . }}
<main class="thread-wrapper" data-nosnippet>
<section class="thread thread-main" aria-labelledby="thread-summary">
<div class="col-header">
<h2 id="thread-summary">{{- template "threadSummary" . -}}</h2>
{{- if .context.ThreadRepliesShown }}
<a href="#replies">jump to replies</a>
{{- end }}
</div>
{{- range $status := .context.Statuses }}
<article
class="status{{- if $status.ThreadContextStatus }} expanded{{- end -}}{{- if $status.Indent }} indent-{{ $status.Indent }}{{- end -}}"
{{- includeAttr "status_attributes.tmpl" $status | indentAttr 3 }}
>
{{- include "status.tmpl" $status | indent 3 }}
</article>
{{- if and $status.ThreadLastMain $.context.ThreadReplies }}
{{- include "repliesStart" $ | indent 1 }}
{{- end }}
{{- end }}
{{- if .context.ThreadReplies }}
</section>
{{- end }}
</main>
{{- end }}
{{- end -}}
{{- with . }}
<main class="thread-wrapper" data-nosnippet>
<section class="thread thread-main" aria-labelledby="thread-summary">
<div class="col-header wrap">
<h2 id="thread-summary">{{- template "threadSummary" . -}}</h2>
{{- if .context.ThreadRepliesShown }}
<a href="#replies">jump to replies</a>
{{- end }}
</div>
{{- range $status := .context.Statuses }}
<article
class="status{{- if $status.ThreadContextStatus }} expanded{{- end -}}{{- if $status.Indent }} indent-{{ $status.Indent }}{{- end -}}"
{{- includeAttr "status_attributes.tmpl" $status | indentAttr 3 }}>
{{- include "status.tmpl" $status | indent 3 }}
</article>
{{- if and $status.ThreadLastMain $.context.ThreadReplies }}
{{- include "repliesStart" $ | indent 1 }}
{{- end }}
{{- end }}
{{- if .context.ThreadReplies }}
</section>
{{- end }}
</main>
{{- end }}