diff options
author | r <r@freesoftwareextremist.com> | 2022-09-23 17:22:54 +0000 |
---|---|---|
committer | r <r@freesoftwareextremist.com> | 2022-09-23 17:22:54 +0000 |
commit | f55595ddb63bd8afb4c85945b82aa1f174050e6b (patch) | |
tree | 3e9f909097c026b065365846ca8143295097a09f /templates/user.tmpl | |
parent | b8c0133bcd5e7f1d4063ad992949cc19d18e7aad (diff) | |
parent | 68698a9e1afce43ef807d6b5f892ca1c0f905b8a (diff) | |
download | bloat-f55595ddb63bd8afb4c85945b82aa1f174050e6b.tar.gz bloat-f55595ddb63bd8afb4c85945b82aa1f174050e6b.zip |
Merge branch 'master' into absolute_fluorideabsolute_fluoride
Diffstat (limited to 'templates/user.tmpl')
-rw-r--r-- | templates/user.tmpl | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/templates/user.tmpl b/templates/user.tmpl index 2532a91..5342efe 100644 --- a/templates/user.tmpl +++ b/templates/user.tmpl @@ -11,7 +11,7 @@ </div> <div class="user-profile-details-container"> <div> - <bdi class="status-dname"> {{EmojiFilter (html .User.DisplayName) .User.Emojis}} </bdi> + <bdi class="status-dname"> {{EmojiFilter (HTML .User.DisplayName) .User.Emojis | Raw}} </bdi> <span class="status-uname"> @{{.User.Acct}} </span> <a class="remote-link" href="{{.User.URL}}" target="_blank" title="remote profile"> source @@ -20,6 +20,7 @@ {{if not .IsCurrent}} <div> <span> {{if .User.Pleroma.Relationship.FollowedBy}} follows you - {{end}} </span> + {{if .User.Pleroma.Relationship.BlockedBy}} blocks you - {{end}} {{if .User.Pleroma.Relationship.Following}} <form class="d-inline" action="/unfollow/{{.User.ID}}" method="post"> <input type="hidden" name="csrf_token" value="{{$.Ctx.CSRFToken}}"> @@ -129,11 +130,15 @@ </div> </div> <div class="user-profile-decription"> - {{EmojiFilter .User.Note .User.Emojis}} + {{EmojiFilter .User.Note .User.Emojis | Raw}} </div> - {{if .User.Fields}}{{range .User.Fields}} - <div>{{.Name}} - {{.Value}}</div> - {{end}}{{end}} + {{if .User.Fields}} + <div class="user-fields"> + {{range .User.Fields}} + <div>{{.Name}} - {{.Value | Raw}}</div> + {{end}} + </div> + {{end}} </div> </div> |