From 856fe9e8c74e7c8096f7fb04d7b0932171223752 Mon Sep 17 00:00:00 2001 From: r Date: Sun, 8 Nov 2020 13:13:05 +0000 Subject: Fix CSS issues - fix text wrapping on reply popup - fix margin for media links --- templates/status.tmpl | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) (limited to 'templates') diff --git a/templates/status.tmpl b/templates/status.tmpl index 432c9a6..4cdb459 100644 --- a/templates/status.tmpl +++ b/templates/status.tmpl @@ -70,19 +70,15 @@
{{if .InReplyToID}} -
- - in reply to {{if .IDNumbers}}#{{index .IDNumbers .InReplyToID}}{{end}} {{if .Pleroma.InReplyToAccountAcct}}@{{.Pleroma.InReplyToAccountAcct}}{{else if not .IDNumbers}}{{.InReplyToID}}{{end}} - -
+ + in reply to {{if .IDNumbers}}#{{index .IDNumbers .InReplyToID}}{{end}} {{if .Pleroma.InReplyToAccountAcct}}@{{.Pleroma.InReplyToAccountAcct}}{{else if not .IDNumbers}}{{.InReplyToID}}{{end}} + {{if index .IDReplies .ID}} - {{end}} {{end}} {{if .ShowReplies}} {{if index .IDReplies .ID}} replies: {{end}} {{range index .IDReplies .ID}} -
- #{{.Number}} -
+ #{{.Number}} {{end}} {{end}}
-- cgit v1.2.3 From c3d90539e9a7addd3c41f44b864b14bde60958dc Mon Sep 17 00:00:00 2001 From: r Date: Sat, 14 Nov 2020 14:08:16 +0000 Subject: Add notification interval setting It replaces the "Auto refresh notifications" checkbox --- templates/header.tmpl | 4 ++-- templates/settings.tmpl | 15 +++++++++++---- 2 files changed, 13 insertions(+), 6 deletions(-) (limited to 'templates') diff --git a/templates/header.tmpl b/templates/header.tmpl index 0c81b72..df2b6af 100644 --- a/templates/header.tmpl +++ b/templates/header.tmpl @@ -14,8 +14,8 @@ {{if $.Ctx.AntiDopamineMode}} {{end}} - {{if .AutoRefresh}} - + {{if .RefreshInterval}} + {{end}} {{if gt .Count 0}}({{.Count}}){{end}} {{.Title}} diff --git a/templates/settings.tmpl b/templates/settings.tmpl index 972e1a2..baeb64d 100644 --- a/templates/settings.tmpl +++ b/templates/settings.tmpl @@ -22,6 +22,17 @@ +
+ + +
@@ -38,10 +49,6 @@
-
- - -
-- cgit v1.2.3 From b35d62ecbb96b6d5f83b0453ca16e8dc45b39657 Mon Sep 17 00:00:00 2001 From: r Date: Sat, 28 Nov 2020 12:58:18 +0000 Subject: Fix RTL display name rendering Wrap all the inline display names in a tag --- templates/nav.tmpl | 2 +- templates/notification.tmpl | 2 +- templates/status.tmpl | 4 ++-- templates/user.tmpl | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) (limited to 'templates') diff --git a/templates/nav.tmpl b/templates/nav.tmpl index f3db9f1..97898c8 100644 --- a/templates/nav.tmpl +++ b/templates/nav.tmpl @@ -8,7 +8,7 @@
{{range .Notifications}} -
+
{{if eq .Type "follow"}}
-- cgit v1.2.3 From 17f02deff72cd79a61731923a5459fd289f811c6 Mon Sep 17 00:00:00 2001 From: r Date: Sat, 16 Jan 2021 10:38:32 +0000 Subject: Show emojis in poll options --- templates/status.tmpl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'templates') diff --git a/templates/status.tmpl b/templates/status.tmpl index 6071b2f..e842a96 100644 --- a/templates/status.tmpl +++ b/templates/status.tmpl @@ -139,12 +139,12 @@ {{range $i, $o := .Poll.Options}}
{{if (or $s.Poll.Expired $s.Poll.Voted)}} -
{{$o.Title}} - {{$o.VotesCount}} votes
+
{{EmojiFilter $o.Title $s.Emojis}} - {{$o.VotesCount}} votes
{{else}} {{end}}
-- cgit v1.2.3 From 3f776ee8c88b7af93f54f9f0869ca13ffa14aeea Mon Sep 17 00:00:00 2001 From: r Date: Sat, 16 Jan 2021 18:03:47 +0000 Subject: Show attachment file name instead of the type --- templates/status.tmpl | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) (limited to 'templates') diff --git a/templates/status.tmpl b/templates/status.tmpl index e842a96..a46129f 100644 --- a/templates/status.tmpl +++ b/templates/status.tmpl @@ -91,7 +91,9 @@ {{if eq .Type "image"}} {{if $.Ctx.HideAttachments}} - [image] + + {{if .Description}}[{{.Description}}]{{else}}[image]{{end}} + {{else}} status-image @@ -103,7 +105,9 @@ {{else if eq .Type "audio"}} {{if $.Ctx.HideAttachments}} - [audio] + + {{if .Description}}[{{.Description}}]{{else}}[audio]{{end}} + {{else}}
diff --git a/templates/notification.tmpl b/templates/notification.tmpl index 567bcf0..4eed61b 100644 --- a/templates/notification.tmpl +++ b/templates/notification.tmpl @@ -11,6 +11,7 @@ {{if .ReadID}}
+
{{end}} @@ -57,11 +58,13 @@
+
-
+
diff --git a/templates/postform.tmpl b/templates/postform.tmpl index f00c300..b81126c 100644 --- a/templates/postform.tmpl +++ b/templates/postform.tmpl @@ -1,6 +1,7 @@ {{with .Data}}
+ {{if .ReplyContext}} diff --git a/templates/requestlist.tmpl b/templates/requestlist.tmpl index 232b56d..eec75f2 100644 --- a/templates/requestlist.tmpl +++ b/templates/requestlist.tmpl @@ -16,11 +16,13 @@
+ -
+
diff --git a/templates/settings.tmpl b/templates/settings.tmpl index baeb64d..4a72b6a 100644 --- a/templates/settings.tmpl +++ b/templates/settings.tmpl @@ -4,6 +4,7 @@
+
{{$defFormat := .Settings.DefaultFormat}} diff --git a/templates/status.tmpl b/templates/status.tmpl index a46129f..a1e2d9f 100644 --- a/templates/status.tmpl +++ b/templates/status.tmpl @@ -38,23 +38,27 @@ {{if .Muted}} + {{else}}
+
{{end}} {{if .Bookmarked}}
+
{{else}}
+
@@ -62,6 +66,7 @@ {{if eq $.Ctx.UserID .Account.ID}}
+
{{end}} @@ -143,6 +148,7 @@ {{if .Poll}}
+ {{range $i, $o := .Poll.Options}}
@@ -195,6 +201,7 @@ {{$rt := "retweet"}} {{if .Reblogged}} {{$rt = "unretweet"}} {{end}} + @@ -209,6 +216,7 @@ {{$like := "like"}} {{if .Favourited}} {{$like = "unlike"}} {{end}} + diff --git a/templates/user.tmpl b/templates/user.tmpl index 5ef411a..af6a8d1 100644 --- a/templates/user.tmpl +++ b/templates/user.tmpl @@ -23,11 +23,13 @@ {{if .User.Pleroma.Relationship.Following}} + {{else}}
+
{{end}} @@ -35,6 +37,7 @@ -
+
{{end}} @@ -42,11 +45,13 @@ {{if .User.Pleroma.Relationship.Subscribing}}
+
{{else}}
+
{{end}} @@ -55,11 +60,13 @@ {{if .User.Pleroma.Relationship.Blocking}}
+
{{else}}
+
{{end}} @@ -67,11 +74,13 @@ {{if .User.Pleroma.Relationship.Muting}}
+
{{else}}
+
{{end}} @@ -80,11 +89,13 @@ {{if .User.Pleroma.Relationship.ShowingReblogs}}
+
{{else}}
+
{{end}} -- cgit v1.2.3 From ac342dde079a0ca156c36a402a3c0ba86d78821d Mon Sep 17 00:00:00 2001 From: r Date: Sat, 23 Jan 2021 08:44:05 +0000 Subject: Add remote timeline --- templates/nav.tmpl | 7 ++++--- templates/root.tmpl | 2 +- templates/timeline.tmpl | 10 ++++++++++ 3 files changed, 15 insertions(+), 4 deletions(-) (limited to 'templates') diff --git a/templates/nav.tmpl b/templates/nav.tmpl index fdff885..98f0532 100644 --- a/templates/nav.tmpl +++ b/templates/nav.tmpl @@ -17,9 +17,9 @@ home direct local - twkn - search - about + remote + twkn + search
settings @@ -28,6 +28,7 @@ + about
diff --git a/templates/root.tmpl b/templates/root.tmpl index ef25c90..b1305f5 100644 --- a/templates/root.tmpl +++ b/templates/root.tmpl @@ -6,7 +6,7 @@ {{.Title}} - + diff --git a/templates/timeline.tmpl b/templates/timeline.tmpl index eabb3ed..bde050a 100644 --- a/templates/timeline.tmpl +++ b/templates/timeline.tmpl @@ -2,6 +2,16 @@ {{template "header.tmpl" (WithContext .CommonData $.Ctx)}}
{{.Title}}
+{{if eq .Type "remote"}} +
+ + + + + +
+{{end}} + {{range .Statuses}} {{template "status.tmpl" (WithContext . $.Ctx)}} {{end}} -- cgit v1.2.3