diff options
author | r <r@freesoftwareextremist.com> | 2021-01-30 04:13:22 +0000 |
---|---|---|
committer | r <r@freesoftwareextremist.com> | 2021-01-30 04:13:22 +0000 |
commit | 9f34b607498c09b4a21bdcc82b3295f6c94bd058 (patch) | |
tree | c5a528cad05227f15f30b07f6d0056045176166b /templates | |
parent | c3f39210d8451d65f3ecaa88046380f42dc536a1 (diff) | |
parent | 3ac95ab3b117ee8867a30c8e4b30ab37411e5ccf (diff) | |
download | bloat-9f34b607498c09b4a21bdcc82b3295f6c94bd058.tar.gz bloat-9f34b607498c09b4a21bdcc82b3295f6c94bd058.zip |
Merge branch 'master' into absolute_fluoride
Diffstat (limited to 'templates')
-rw-r--r-- | templates/header.tmpl | 4 | ||||
-rw-r--r-- | templates/nav.tmpl | 10 | ||||
-rw-r--r-- | templates/notification.tmpl | 50 | ||||
-rw-r--r-- | templates/postform.tmpl | 2 | ||||
-rw-r--r-- | templates/requestlist.tmpl | 36 | ||||
-rw-r--r-- | templates/root.tmpl | 2 | ||||
-rw-r--r-- | templates/settings.tmpl | 16 | ||||
-rw-r--r-- | templates/status.tmpl | 32 | ||||
-rw-r--r-- | templates/timeline.tmpl | 10 | ||||
-rw-r--r-- | templates/user.tmpl | 26 |
10 files changed, 162 insertions, 26 deletions
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}} <meta name="antidopamine_mode" content="{{$.Ctx.AntiDopamineMode}}"> {{end}} - {{if .AutoRefresh}} - <meta http-equiv="refresh" content="30"> + {{if .RefreshInterval}} + <meta http-equiv="refresh" content="{{.RefreshInterval}}"> {{end}} <title> {{if gt .Count 0}}({{.Count}}){{end}} {{.Title}} </title> <link rel="stylesheet" href="/static/style.css"> diff --git a/templates/nav.tmpl b/templates/nav.tmpl index f3db9f1..98f0532 100644 --- a/templates/nav.tmpl +++ b/templates/nav.tmpl @@ -8,7 +8,7 @@ </div> <div class="user-info-details-container"> <div class="user-info-details-name"> - <span class="status-dname"> {{EmojiFilter .User.DisplayName .User.Emojis}} </span> + <bdi class="status-dname"> {{EmojiFilter .User.DisplayName .User.Emojis}} </bdi> <a class="nav-link" href="/user/{{.User.ID}}" accesskey="0" title="User profile (0)"> <span class="status-uname"> @{{.User.Acct}} </span> </a> @@ -17,16 +17,18 @@ <a class="nav-link" href="/timeline/home" accesskey="1" title="Home timeline (1)">home</a> <a class="nav-link" href="/timeline/direct" accesskey="2" title="Direct timeline (2)">direct</a> <a class="nav-link" href="/timeline/local" accesskey="3" title="Local timeline (3)">local</a> - <a class="nav-link" href="/timeline/twkn" accesskey="4" title="The Whole Known Netwwork (4)">twkn</a> - <a class="nav-link" href="/search" accesskey="5" title="Search (5)">search</a> - <a class="nav-link" href="/about" accesskey="6" title="About (6)">about</a> + <a class="nav-link" href="/timeline/remote" accesskey="4" title="Remote timeline (4)">remote</a> + <a class="nav-link" href="/timeline/twkn" accesskey="5" title="The Whole Known Netwwork (5)">twkn</a> + <a class="nav-link" href="/search" accesskey="6" title="Search (6)">search</a> </div> <div> <a class="nav-link" href="/settings" target="_top" accesskey="7" title="Settings (7)">settings</a> <form class="signout" action="/signout" method="post" target="_top"> <input type="hidden" name="csrf_token" value="{{$.Ctx.CSRFToken}}"> + <input type="hidden" name="referrer" value="{{$.Ctx.Referrer}}"> <input type="submit" value="signout" class="btn-link nav-link" accesskey="8" title="Signout (8)"> </form> + <a class="nav-link" href="/about" accesskey="9" title="About (9)">about</a> </div> </div> </div> diff --git a/templates/notification.tmpl b/templates/notification.tmpl index 10eaafc..4eed61b 100644 --- a/templates/notification.tmpl +++ b/templates/notification.tmpl @@ -11,13 +11,14 @@ {{if .ReadID}} <form class="notification-read" action="/notifications/read?max_id={{.ReadID}}" method="post" target="_self"> <input type="hidden" name="csrf_token" value="{{$.Ctx.CSRFToken}}"> + <input type="hidden" name="referrer" value="{{$.Ctx.Referrer}}"> <input type="submit" value="read" class="btn-link" accesskey="C" title="Clear unread notifications (C)"> </form> {{end}} </div> {{range .Notifications}} -<div class="status-container-container {{if .Pleroma}}{{if not .Pleroma.IsSeen}}unread{{end}}{{end}}"> +<div class="notification-container {{.Type}} {{if .Pleroma}}{{if not .Pleroma.IsSeen}}unread{{end}}{{end}}"> {{if eq .Type "follow"}} <div class="notification-follow-container"> <div class="status-profile-img-container"> @@ -27,7 +28,7 @@ </div> <div class="notification-follow"> <div class="notification-info-text"> - <span class="status-dname"> {{EmojiFilter .Account.DisplayName .Account.Emojis}} </span> + <bdi class="status-dname"> {{EmojiFilter .Account.DisplayName .Account.Emojis}} </bdi> <span class="notification-text"> followed you - <time datetime="{{FormatTimeRFC3339 .CreatedAt}}" title="{{FormatTimeRFC822 .CreatedAt}}">{{TimeSince .CreatedAt}}</time> </span> @@ -38,6 +39,37 @@ </div> </div> + {{else if eq .Type "follow_request"}} + <div class="notification-follow-container"> + <div class="status-profile-img-container"> + <a class="img-link" href="/user/{{.Account.ID}}"> + <img class="status-profile-img" src="{{.Account.AvatarStatic}}" title="@{{.Account.Acct}}" alt="profile-avatar" height="48" /> + </a> + </div> + <div class="notification-follow"> + <div class="notification-info-text"> + <bdi class="status-dname"> {{EmojiFilter .Account.DisplayName .Account.Emojis}} </bdi> + <span class="notification-text"> wants to follow you - + <time datetime="{{FormatTimeRFC3339 .CreatedAt}}" title="{{FormatTimeRFC822 .CreatedAt}}">{{TimeSince .CreatedAt}}</time> + </span> + </div> + <div> + <a href="/user/{{.Account.ID}}"> <span class="status-uname"> @{{.Account.Acct}} </span> </a> + </div> + <form class="d-inline" action="/accept/{{.Account.ID}}" method="post" target="_self"> + <input type="hidden" name="csrf_token" value="{{$.Ctx.CSRFToken}}"> + <input type="hidden" name="referrer" value="{{$.Ctx.Referrer}}"> + <input type="submit" value="accept" class="btn-link"> + </form> + - + <form class="d-inline" action="/reject/{{.Account.ID}}" method="post" target="_self"> + <input type="hidden" name="csrf_token" value="{{$.Ctx.CSRFToken}}"> + <input type="hidden" name="referrer" value="{{$.Ctx.Referrer}}"> + <input type="submit" value="reject" class="btn-link"> + </form> + </div> + </div> + {{else if eq .Type "mention"}} {{template "status" (WithContext .Status $.Ctx)}} @@ -68,6 +100,20 @@ </span> </div> {{template "status" (WithContext .Status $.Ctx)}} + + {{else}} + <div class="retweet-info"> + <a class="img-link" href="/user/{{.Account.ID}}"> + <img class="status-profile-img" src="{{.Account.AvatarStatic}}" title="@{{.Account.Acct}}" alt="avatar" height="48" /> + </a> + <a href="/user/{{.Account.ID}}"> + <span class="status-uname"> @{{.Account.Acct}} </span> + </a> + <span class="notification-text"> {{.Type}} - + <time datetime="{{FormatTimeRFC3339 .CreatedAt}}" title="{{FormatTimeRFC822 .CreatedAt}}">{{TimeSince .CreatedAt}}</time> + </span> + </div> + {{if .Status}}{{template "status" (WithContext .Status $.Ctx)}}{{end}} {{end}} </div> {{end}} diff --git a/templates/postform.tmpl b/templates/postform.tmpl index b38cb9d..b81126c 100644 --- a/templates/postform.tmpl +++ b/templates/postform.tmpl @@ -1,6 +1,7 @@ {{with .Data}} <form class="post-form" action="/post" method="POST" enctype="multipart/form-data" target="_self"> <input type="hidden" name="csrf_token" value="{{$.Ctx.CSRFToken}}"> + <input type="hidden" name="referrer" value="{{$.Ctx.Referrer}}"> {{if .ReplyContext}} <input type="hidden" name="reply_to_id" value="{{.ReplyContext.InReplyToID}}" /> <label for="post-content" class="post-form-title"> Reply to {{.ReplyContext.InReplyToName}} </label> @@ -43,6 +44,7 @@ </span> </div> <button type="submit" accesskey="P" title="Post (P)"> Post </button> + <button type="reset" title="Reset"> Reset </button> </form> {{end}} diff --git a/templates/requestlist.tmpl b/templates/requestlist.tmpl new file mode 100644 index 0000000..eec75f2 --- /dev/null +++ b/templates/requestlist.tmpl @@ -0,0 +1,36 @@ +{{with .Data}} +<div> + {{range .}} + <div class="user-list-item"> + <div class="user-list-profile-img"> + <a class="img-link" href="/user/{{.ID}}"> + <img class="status-profile-img" src="{{.AvatarStatic}}" title="@{{.Acct}}" alt="avatar" height="48" /> + </a> + </div> + <div class="user-list-name"> + <div> + <div class="status-dname"> {{EmojiFilter .DisplayName .Emojis}} </div> + <a class="img-link" href="/user/{{.ID}}"> + <div class="status-uname"> @{{.Acct}} </div> + </a> + </div> + <form class="d-inline" action="/accept/{{.ID}}" method="post" target="_self"> + <input type="hidden" name="csrf_token" value="{{$.Ctx.CSRFToken}}"> + <input type="hidden" name="referrer" value="{{$.Ctx.Referrer}}"> + <input type="submit" value="accept" class="btn-link"> + </form> + - + <form class="d-inline" action="/reject/{{.ID}}" method="post" target="_self"> + <input type="hidden" name="csrf_token" value="{{$.Ctx.CSRFToken}}"> + <input type="hidden" name="referrer" value="{{$.Ctx.Referrer}}"> + <input type="submit" value="reject" class="btn-link"> + </form> + </div> + </div> + {{else}} + <div class="no-data-found">No data found</div> + {{end}} +</div> +{{else}} +<div class="no-data-found">No data found</div> +{{end}} 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 @@ <link rel="icon" type="image/png" href="/static/favicon.png"> <title>{{.Title}}</title> </head> -<frameset cols="420px,*"> +<frameset cols="424px,*"> <frameset rows="316px,*"> <frame name="nav" src="/nav"> <frame name="notification" src="/notifications"> diff --git a/templates/settings.tmpl b/templates/settings.tmpl index 972e1a2..4a72b6a 100644 --- a/templates/settings.tmpl +++ b/templates/settings.tmpl @@ -4,6 +4,7 @@ <form id="settings-form" action="/settings" method="POST"> <input type="hidden" name="csrf_token" value="{{$.Ctx.CSRFToken}}"> + <input type="hidden" name="referrer" value="{{$.Ctx.Referrer}}"> <div class="settings-form-field"> <label for="visibility"> Default format </label> {{$defFormat := .Settings.DefaultFormat}} @@ -23,6 +24,17 @@ </select> </div> <div class="settings-form-field"> + <label for="notification-interval"> Refresh Notifications </label> + <select id="notification-interval" name="notification_interval"> + <option value="0" {{if eq .Settings.NotificationInterval 0}}selected{{end}}>Disabled</option> + <option value="30" {{if eq .Settings.NotificationInterval 30}}selected{{end}}>After 30s</option> + <option value="60" {{if eq .Settings.NotificationInterval 60}}selected{{end}}>After 1m</option> + <option value="120" {{if eq .Settings.NotificationInterval 120}}selected{{end}}>After 2m</option> + <option value="300" {{if eq .Settings.NotificationInterval 300}}selected{{end}}>After 5m</option> + <option value="600" {{if eq .Settings.NotificationInterval 600}}selected{{end}}>After 10m</option> + </select> + </div> + <div class="settings-form-field"> <input id="copy-scope" name="copy_scope" type="checkbox" value="true" {{if .Settings.CopyScope}}checked{{end}}> <label for="copy-scope"> Copy scope when replying </label> </div> @@ -39,10 +51,6 @@ <label for="mask-nsfw"> Mask NSFW attachments </label> </div> <div class="settings-form-field"> - <input id="auto-refresh-notifications" name="auto_refresh_notifications" type="checkbox" value="true" {{if .Settings.AutoRefreshNotifications}}checked{{end}}> - <label for="auto-refresh-notifications"> Auto refresh notifications </label> - </div> - <div class="settings-form-field"> <input id="fluoride-mode" name="fluoride_mode" type="checkbox" value="true" {{if .Settings.FluorideMode}}checked{{end}}> <label for="fluoride-mode"> Enable <abbr title="Enable JavaScript based functionality, e.g., like/retweet without page reload and reply preview on thread page">fluoride mode</abbr> </label> </div> diff --git a/templates/status.tmpl b/templates/status.tmpl index 4cdb459..a1e2d9f 100644 --- a/templates/status.tmpl +++ b/templates/status.tmpl @@ -5,7 +5,7 @@ <a class="img-link" href="/user/{{.Account.ID}}"> <img class="status-profile-img" src="{{.Account.AvatarStatic}}" title="@{{.Account.Acct}}" alt="avatar" height="24" /> </a> - <span class="status-dname"> {{EmojiFilter .Account.DisplayName .Account.Emojis}} </span> + <bdi class="status-dname"> {{EmojiFilter .Account.DisplayName .Account.Emojis}} </bdi> <a href="/user/{{.Account.ID}}"> <span class="status-uname"> @{{.Account.Acct}} </span> </a> @@ -23,7 +23,7 @@ </div> <div class="status"> <div class="status-name"> - <span class="status-dname"> {{EmojiFilter .Account.DisplayName .Account.Emojis}} </span> + <bdi class="status-dname"> {{EmojiFilter .Account.DisplayName .Account.Emojis}} </bdi> <a href="/user/{{.Account.ID}}"> <span class="status-uname"> @{{.Account.Acct}} </span> </a> @@ -38,23 +38,27 @@ {{if .Muted}} <form action="/unmuteconv/{{.ID}}" method="post" target="_self"> <input type="hidden" name="csrf_token" value="{{$.Ctx.CSRFToken}}"> + <input type="hidden" name="referrer" value="{{$.Ctx.Referrer}}"> <input type="submit" value="unmute" class="btn-link more-link"> </form> {{else}} <form action="/muteconv/{{.ID}}" method="post" target="_self"> <input type="hidden" name="csrf_token" value="{{$.Ctx.CSRFToken}}"> + <input type="hidden" name="referrer" value="{{$.Ctx.Referrer}}"> <input type="submit" value="mute" class="btn-link more-link"> </form> {{end}} {{if .Bookmarked}} <form action="/unbookmark/{{.ID}}" method="post" target="_self"> <input type="hidden" name="csrf_token" value="{{$.Ctx.CSRFToken}}"> + <input type="hidden" name="referrer" value="{{$.Ctx.Referrer}}"> <input type="hidden" name="retweeted_by_id" value="{{.RetweetedByID}}"> <input type="submit" value="unbookmark" class="btn-link more-link"> </form> {{else}} <form action="/bookmark/{{.ID}}" method="post" target="_self"> <input type="hidden" name="csrf_token" value="{{$.Ctx.CSRFToken}}"> + <input type="hidden" name="referrer" value="{{$.Ctx.Referrer}}"> <input type="hidden" name="retweeted_by_id" value="{{.RetweetedByID}}"> <input type="submit" value="bookmark" class="btn-link more-link"> </form> @@ -62,6 +66,7 @@ {{if eq $.Ctx.UserID .Account.ID}} <form action="/delete/{{.ID}}" method="post" target="_self"> <input type="hidden" name="csrf_token" value="{{$.Ctx.CSRFToken}}"> + <input type="hidden" name="referrer" value="{{$.Ctx.Referrer}}"> <input type="submit" value="delete" class="btn-link more-link"> </form> {{end}} @@ -91,7 +96,9 @@ {{if eq .Type "image"}} {{if $.Ctx.HideAttachments}} - <a href="{{.URL}}" target="_blank" title="{{.Description}}"> [image] </a> + <a href="{{.URL}}" target="_blank"> + {{if .Description}}[{{.Description}}]{{else}}[image]{{end}} + </a> {{else}} <a class="img-link" href="{{.URL}}" target="_blank" title="{{.Description}}"> <img class="status-image" src="{{.URL}}" alt="status-image" height="240" /> @@ -103,7 +110,9 @@ {{else if eq .Type "audio"}} {{if $.Ctx.HideAttachments}} - <a href="{{.URL}}" target="_blank" title="{{.Description}}"> [audio] </a> + <a href="{{.URL}}" target="_blank"> + {{if .Description}}[{{.Description}}]{{else}}[audio]{{end}} + </a> {{else}} <audio class="status-audio" controls title="{{.Description}}"> <source src="{{.URL}}"> @@ -113,7 +122,9 @@ {{else if eq .Type "video"}} {{if $.Ctx.HideAttachments}} - <a href="{{.URL}}" target="_blank" title="{{.Description}}"> [video] </a> + <a href="{{.URL}}" target="_blank"> + {{if .Description}}[{{.Description}}]{{else}}[video]{{end}} + </a> {{else}} <div class="status-video-container" title="{{.Description}}"> <video class="status-video" controls height="240"> @@ -127,7 +138,9 @@ {{end}} {{else}} - <a href="{{.URL}}" target="_blank" title="{{.Description}}"> [attachment] </a> + <a href="{{.URL}}" target="_blank"> + {{if .Description}}[{{.Description}}]{{else}}[attachment]{{end}} + </a> {{end}} {{end}} </div> @@ -135,16 +148,17 @@ {{if .Poll}} <form class="poll-form" action="/vote/{{.Poll.ID}}" method="POST" target="_self"> <input type="hidden" name="csrf_token" value="{{$.Ctx.CSRFToken}}"> + <input type="hidden" name="referrer" value="{{$.Ctx.Referrer}}"> <input type="hidden" name="status_id" value="{{$s.ID}}"> {{range $i, $o := .Poll.Options}} <div class="poll-option"> {{if (or $s.Poll.Expired $s.Poll.Voted)}} - <div> {{$o.Title}} - {{$o.VotesCount}} votes </div> + <div> {{EmojiFilter $o.Title $s.Emojis}} - {{$o.VotesCount}} votes </div> {{else}} <input type="{{if $s.Poll.Multiple}}checkbox{{else}}radio{{end}}" name="choices" id="poll-{{$s.ID}}-{{$i}}" value="{{$i}}"> <label for="poll-{{$s.ID}}-{{$i}}"> - {{$o.Title}} + {{EmojiFilter $o.Title $s.Emojis}} </label> {{end}} </div> @@ -187,6 +201,7 @@ {{$rt := "retweet"}} {{if .Reblogged}} {{$rt = "unretweet"}} {{end}} <form class="status-retweet" data-action="{{$rt}}" action="/{{$rt}}/{{.ID}}" method="post" target="_self"> <input type="hidden" name="csrf_token" value="{{$.Ctx.CSRFToken}}"> + <input type="hidden" name="referrer" value="{{$.Ctx.Referrer}}"> <input type="hidden" name="retweeted_by_id" value="{{.RetweetedByID}}"> <input type="submit" value="{{$rt}}" class="btn-link"> <a class="status-retweet-count" href="/retweetedby/{{.ID}}" title="click to see the the list"> @@ -201,6 +216,7 @@ {{$like := "like"}} {{if .Favourited}} {{$like = "unlike"}} {{end}} <form class="status-like" data-action="{{$like}}" action="/{{$like}}/{{.ID}}" method="post" target="_self"> <input type="hidden" name="csrf_token" value="{{$.Ctx.CSRFToken}}"> + <input type="hidden" name="referrer" value="{{$.Ctx.Referrer}}"> <input type="hidden" name="retweeted_by_id" value="{{.RetweetedByID}}"> <input type="submit" value="{{$like}}" class="btn-link"> <a class="status-like-count" href="/likedby/{{.ID}}" title="click to see the the list"> 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)}} <div class="page-title"> {{.Title}} </div> +{{if eq .Type "remote"}} +<form class="search-form" action="/timeline/remote" method="GET"> + <span class="post-form-field"> + <label for="instance"> Instance </label> + <input id="instance" name="instance" value="{{.Instance}}"> + </span> + <button type="submit"> Submit </button> +</form> +{{end}} + {{range .Statuses}} {{template "status.tmpl" (WithContext . $.Ctx)}} {{end}} diff --git a/templates/user.tmpl b/templates/user.tmpl index b7a12b9..af6a8d1 100644 --- a/templates/user.tmpl +++ b/templates/user.tmpl @@ -11,7 +11,7 @@ </div> <div class="user-profile-details-container"> <div> - <span class="status-dname"> {{EmojiFilter .User.DisplayName .User.Emojis}} </span> + <bdi class="status-dname"> {{EmojiFilter .User.DisplayName .User.Emojis}} </bdi> <span class="status-uname"> @{{.User.Acct}} </span> <a class="remote-link" href="{{.User.URL}}" target="_blank" title="remote profile"> source @@ -23,11 +23,13 @@ {{if .User.Pleroma.Relationship.Following}} <form class="d-inline" action="/unfollow/{{.User.ID}}" method="post"> <input type="hidden" name="csrf_token" value="{{$.Ctx.CSRFToken}}"> + <input type="hidden" name="referrer" value="{{$.Ctx.Referrer}}"> <input type="submit" value="unfollow" class="btn-link"> </form> {{else}} <form class="d-inline" action="/follow/{{.User.ID}}" method="post"> <input type="hidden" name="csrf_token" value="{{$.Ctx.CSRFToken}}"> + <input type="hidden" name="referrer" value="{{$.Ctx.Referrer}}"> <input type="submit" value="{{if .User.Pleroma.Relationship.Requested}}resend request{{else}}follow{{end}}" class="btn-link"> </form> {{end}} @@ -35,6 +37,7 @@ - <form class="d-inline" action="/unfollow/{{.User.ID}}" method="post"> <input type="hidden" name="csrf_token" value="{{$.Ctx.CSRFToken}}"> + <input type="hidden" name="referrer" value="{{$.Ctx.Referrer}}"> <input type="submit" value="cancel request" class="btn-link"> </form> {{end}} @@ -42,11 +45,13 @@ {{if .User.Pleroma.Relationship.Subscribing}} <form class="d-inline" action="/unsubscribe/{{.User.ID}}" method="post"> <input type="hidden" name="csrf_token" value="{{$.Ctx.CSRFToken}}"> + <input type="hidden" name="referrer" value="{{$.Ctx.Referrer}}"> <input type="submit" value="unsubscribe" class="btn-link"> </form> {{else}} <form class="d-inline" action="/subscribe/{{.User.ID}}" method="post"> <input type="hidden" name="csrf_token" value="{{$.Ctx.CSRFToken}}"> + <input type="hidden" name="referrer" value="{{$.Ctx.Referrer}}"> <input type="submit" value="subscribe" class="btn-link"> </form> {{end}} @@ -55,11 +60,13 @@ {{if .User.Pleroma.Relationship.Blocking}} <form class="d-inline" action="/unblock/{{.User.ID}}" method="post"> <input type="hidden" name="csrf_token" value="{{$.Ctx.CSRFToken}}"> + <input type="hidden" name="referrer" value="{{$.Ctx.Referrer}}"> <input type="submit" value="unblock" class="btn-link"> </form> {{else}} <form class="d-inline" action="/block/{{.User.ID}}" method="post"> <input type="hidden" name="csrf_token" value="{{$.Ctx.CSRFToken}}"> + <input type="hidden" name="referrer" value="{{$.Ctx.Referrer}}"> <input type="submit" value="block" class="btn-link"> </form> {{end}} @@ -67,11 +74,13 @@ {{if .User.Pleroma.Relationship.Muting}} <form class="d-inline" action="/unmute/{{.User.ID}}" method="post"> <input type="hidden" name="csrf_token" value="{{$.Ctx.CSRFToken}}"> + <input type="hidden" name="referrer" value="{{$.Ctx.Referrer}}"> <input type="submit" value="unmute" class="btn-link"> </form> {{else}} <form class="d-inline" action="/mute/{{.User.ID}}" method="post"> <input type="hidden" name="csrf_token" value="{{$.Ctx.CSRFToken}}"> + <input type="hidden" name="referrer" value="{{$.Ctx.Referrer}}"> <input type="submit" value="mute" class="btn-link"> </form> {{end}} @@ -80,11 +89,13 @@ {{if .User.Pleroma.Relationship.ShowingReblogs}} <form class="d-inline" action="/follow/{{.User.ID}}?reblogs=false" method="post"> <input type="hidden" name="csrf_token" value="{{$.Ctx.CSRFToken}}"> + <input type="hidden" name="referrer" value="{{$.Ctx.Referrer}}"> <input type="submit" value="hide retweets" class="btn-link"> </form> {{else}} <form class="d-inline" action="/follow/{{.User.ID}}" method="post"> <input type="hidden" name="csrf_token" value="{{$.Ctx.CSRFToken}}"> + <input type="hidden" name="referrer" value="{{$.Ctx.Referrer}}"> <input type="submit" value="show retweets" class="btn-link"> </form> {{end}} @@ -99,10 +110,11 @@ </div> {{if .IsCurrent}} <div> - <a href="/user/{{.User.ID}}/bookmarks"> bookmarks </a> - - <a href="/user/{{.User.ID}}/likes"> likes </a> - - <a href="/user/{{.User.ID}}/mutes"> mutes </a> - - <a href="/user/{{.User.ID}}/blocks"> blocks </a> + <a href="/user/{{.User.ID}}/bookmarks"> bookmarks </a> + - <a href="/user/{{.User.ID}}/likes"> likes </a> + - <a href="/user/{{.User.ID}}/mutes"> mutes </a> + - <a href="/user/{{.User.ID}}/blocks"> blocks </a> + {{if .User.Locked}}- <a href="/user/{{.User.ID}}/requests"> requests </a>{{end}} </div> {{end}} <div> @@ -162,6 +174,10 @@ {{else if eq .Type "blocks"}} <div class="page-title"> Blocks </div> {{template "userlist.tmpl" (WithContext .Users $.Ctx)}} + +{{else if eq .Type "requests"}} +<div class="page-title"> Follow requests </div> +{{template "requestlist.tmpl" (WithContext .Users $.Ctx)}} {{end}} <div class="pagination"> |