diff --git a/themes/nipponalba/layouts/_default/single.html b/themes/nipponalba/layouts/_default/single.html index 558ba097..b7c23f08 100644 --- a/themes/nipponalba/layouts/_default/single.html +++ b/themes/nipponalba/layouts/_default/single.html @@ -26,10 +26,10 @@
-
+
{{ $pathJSON := (print .Permalink "bridgy.json") }} {{ $relpathJSON := (print .RelPermalink "bridgy.json") }} -{{ if fileExists $pathJSON }} +{{ if fileExists $relpathJSON }}
{{ $mJSON := getJSON $pathJSON }} Syndicated to Pleroma @@ -42,19 +42,22 @@
+

Interactions

-
+
-{{ $pathJSON := (print "data" (strings.TrimSuffix "/" .Permalink) ".json") }} +{{ $pathJSON := (print "data" (strings.TrimSuffix "/" .RelPermalink) ".json") }} {{ if fileExists $pathJSON }}
- {{ $mJSON := getJSON $pathJSON }} - {{ partial "webmention.html" $mJSON }} +{{ $mJSON := getJSON $pathJSON }} +

Likes

{{ partial "likes.html" $mJSON }}
+

Shares

{{ partial "shares.html" $mJSON }}
+

Comments & Replies

{{ partial "webmention.html" $mJSON }}
{{ end }} diff --git a/themes/nipponalba/layouts/partials/likes.html b/themes/nipponalba/layouts/partials/likes.html new file mode 100644 index 00000000..f21a0b30 --- /dev/null +++ b/themes/nipponalba/layouts/partials/likes.html @@ -0,0 +1,5 @@ +{{ range . }} +{{ if eq .mention_type "like" }} +{{ .author.name }} +{{ end }} +{{ end }} diff --git a/themes/nipponalba/layouts/partials/shares.html b/themes/nipponalba/layouts/partials/shares.html new file mode 100644 index 00000000..1ce58325 --- /dev/null +++ b/themes/nipponalba/layouts/partials/shares.html @@ -0,0 +1,5 @@ +{{ range . }} +{{ if eq .mention_type "repost" }} +{{ .author.name }} +{{ end }} +{{ end }} diff --git a/themes/nipponalba/layouts/partials/syndication.html b/themes/nipponalba/layouts/partials/syndication.html new file mode 100644 index 00000000..6aad83d8 --- /dev/null +++ b/themes/nipponalba/layouts/partials/syndication.html @@ -0,0 +1,3 @@ +{{ range . }} +Syndicated to Pleroma +{{ end }} diff --git a/themes/nipponalba/layouts/partials/webmention.html b/themes/nipponalba/layouts/partials/webmention.html index add7c677..bc50c84b 100644 --- a/themes/nipponalba/layouts/partials/webmention.html +++ b/themes/nipponalba/layouts/partials/webmention.html @@ -1,20 +1,19 @@ {{ range . }} +
{{ if eq .mention_type "mention" }} -
{{ .author.name }} mentioned this post in the post {{ .title }}
-{{ end }} -{{ if eq .mention_type "like" }} -
{{ .author.name }} liked
+
{{ .author.name }} mentioned this post in the post {{ .title }}
+
{{ .content | safeHTML }}

+
{{ end }} {{ if eq .mention_type "reply" }} -
{{ .author.name }} replied to this post here
+
{{ .author.name }} replied to this post here
+
{{ .content | safeHTML }}

+
{{ end }} {{ if eq .mention_type "bookmark" }} -
{{ .author.name }} bookmarked this post
-{{ end }} -{{ if eq .mention_type "repost" }} -
{{ .author.name }} reposted this article
+
{{ .author.name }} bookmarked this post
{{ end }} {{ if eq .mention_type "rsvp" }} -
{{ .author.name }} responded to the rsvp here
+
{{ .author.name }} responded to the rsvp here
{{ end }} {{ end }} diff --git a/themes/nipponalba/static/css/style.css b/themes/nipponalba/static/css/style.css index 426ec633..0888e230 100644 --- a/themes/nipponalba/static/css/style.css +++ b/themes/nipponalba/static/css/style.css @@ -378,7 +378,9 @@ pre { border-bottom: 1px solid var(--text-colour); } .post .post-footer-page { - padding: 0 0 100px 0; + padding: 0 0 0 0; + width:100%; + display:block; } .post .post-footer .meta, .post .post-footer-page .meta { max-width: 100%; @@ -450,6 +452,79 @@ pre { display:inline; float:left; } +.post .post-footer-page{ +display:block; +width:100% +} +.interactions{ + margin:20px 0 10px 0; + padding:0; + display:inline-flex; + float:left; + height:30px; + width:100%; + border-top:1px dotted var(--text-colour); +} +.webmention-form{ + display:inline-flex; + margin-top:20px; + width: 100%; +} +.webmention-form label{ + display:inline; + float:left; + margin-bottom:10px; +} +.webmention-form input[type=url]{ + width:60%; +} +.webmentions{ + display:block; + margin-top: 0 20px 0 0 ; + padding: 0 0 200px 0; +} +.webmentions .remote_profile{ + width: 50px; + border-radius: 50%; + display:inline; + float:left; + vertical-align:top; + border:0; + padding:0; +} +.webmentions .interaction{ + border:1px dotted var(--text-colour); + padding: 10px; + display:block; + margin:0; + min-height:60px; + vertical-align:top; +} +.webmentions .interaction .intactivity{ + font-size:13px; + font-style:italic; +} +.webmentions .interaction time{ + font-size:12px; +} +.webmentions .interaction h4{ + line-height:15px; + padding:0; + margin:0; +} +.webmentions .interaction.like, .webmentions .interaction.share{ + border:0; + color: var(--text-colour); + padding:2px; + margin:30px 0 0 0; + display:flex; + width:100%; + min-height:30px; +} +.webmentions .interaction.like img, .webmentions .interaction.share img{ + display:inline-flex; + float:left; +} .footer { clear: both; text-align: center;