diff options
Diffstat (limited to 'templates')
| -rw-r--r-- | templates/nav.tmpl | 2 | ||||
| -rw-r--r-- | templates/notification.tmpl | 18 | ||||
| -rw-r--r-- | templates/status.tmpl | 11 | ||||
| -rw-r--r-- | templates/user.tmpl | 2 | ||||
| -rw-r--r-- | templates/userlist.tmpl | 4 |
5 files changed, 22 insertions, 15 deletions
diff --git a/templates/nav.tmpl b/templates/nav.tmpl index cfac439..d98410f 100644 --- a/templates/nav.tmpl +++ b/templates/nav.tmpl @@ -10,7 +10,7 @@ <div> <span class="status-dname"> {{EmojiFilter .User.DisplayName .User.Emojis}} </span> <a class="nav-link" href="/user/{{.User.ID}}"> - <span class="status-uname"> {{.User.Acct}} </span> + <span class="status-uname"> @{{.User.Acct}} </span> </a> </div> <div> diff --git a/templates/notification.tmpl b/templates/notification.tmpl index 2943847..55424da 100644 --- a/templates/notification.tmpl +++ b/templates/notification.tmpl @@ -22,7 +22,7 @@ <div> <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" /> + <img class="status-profile-img" src="{{.Account.AvatarStatic}}" title="@{{.Account.Acct}}" alt="profile-avatar" height="48" /> </a> </div> <div class="notification-follow"> @@ -33,8 +33,8 @@ - <time datetime="{{FormatTimeRFC3339 .CreatedAt}}" title="{{FormatTimeRFC822 .CreatedAt}}">{{TimeSince .CreatedAt}}</time> </span> </div> - <div class="notification-follow-uname"> - @{{.Account.Acct}} + <div> + <a href="/user/{{.Account.ID}}"> <span class="status-uname"> @{{.Account.Acct}} </span> </a> </div> </div> </div> @@ -45,9 +45,11 @@ {{else if eq .Type "reblog"}} <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" /> + <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="status-dname"> {{EmojiFilter .Account.DisplayName .Account.Emojis}} </span> <span> retweeted your post </span> <span> - <time datetime="{{FormatTimeRFC3339 .CreatedAt}}" title="{{FormatTimeRFC822 .CreatedAt}}">{{TimeSince .CreatedAt}}</time> @@ -58,9 +60,11 @@ {{else if eq .Type "favourite"}} <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" /> + <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="status-dname"> {{EmojiFilter .Account.DisplayName .Account.Emojis}} </span> <span> liked your post </span> <span> - <time datetime="{{FormatTimeRFC3339 .CreatedAt}}" title="{{FormatTimeRFC822 .CreatedAt}}">{{TimeSince .CreatedAt}}</time> diff --git a/templates/status.tmpl b/templates/status.tmpl index 7d510e2..1e3d514 100644 --- a/templates/status.tmpl +++ b/templates/status.tmpl @@ -3,9 +3,12 @@ {{if .Reblog}} <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="24" /> + <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> + <a href="/user/{{.Account.ID}}"> + <span class="status-uname"> @{{.Account.Acct}} </span> + </a> retweeted </div> {{template "status" (WithContext .Reblog $.Ctx)}} @@ -15,14 +18,14 @@ <div class="status-container status-{{.ID}}" data-id="{{.ID}}"> <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="avatar" height="48" /> + <img class="status-profile-img" src="{{.Account.AvatarStatic}}" title="@{{.Account.Acct}}" alt="avatar" height="48" /> </a> </div> <div class="status"> <div class="status-name"> <span class="status-dname"> {{EmojiFilter .Account.DisplayName .Account.Emojis}} </span> <a href="/user/{{.Account.ID}}"> - <span class="status-uname"> {{.Account.Acct}} </span> + <span class="status-uname"> @{{.Account.Acct}} </span> </a> <div class="more-container"> <div class="remote-link"> @@ -56,7 +59,7 @@ {{if .InReplyToID}} <div class="status-reply-to"> <a class="status-reply-to-link" href="{{if not .ShowReplies}}/thread/{{.InReplyToID}}{{end}}#status-{{.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}} </a> </div> {{if index .IDReplies .ID}} <span class="status-reply-info-divider"> - </span> {{end}} diff --git a/templates/user.tmpl b/templates/user.tmpl index 4fe7fd1..4801021 100644 --- a/templates/user.tmpl +++ b/templates/user.tmpl @@ -12,7 +12,7 @@ <div class="user-profile-details-container"> <div> <span class="status-dname"> {{EmojiFilter .User.DisplayName .User.Emojis}} </span> - <span class="status-uname"> {{.User.Acct}} </span> + <span class="status-uname"> @{{.User.Acct}} </span> <a class="remote-link" href="{{.User.URL}}" target="_blank" title="remote profile"> source </a> diff --git a/templates/userlist.tmpl b/templates/userlist.tmpl index 0a44202..52ef83e 100644 --- a/templates/userlist.tmpl +++ b/templates/userlist.tmpl @@ -4,13 +4,13 @@ <div class="user-list-item"> <div> <a class="img-link" href="/user/{{.ID}}"> - <img class="status-profile-img" src="{{.AvatarStatic}}" title="{{.Acct}}" alt="avatar" height="48" /> + <img class="status-profile-img" src="{{.AvatarStatic}}" title="@{{.Acct}}" alt="avatar" height="48" /> </a> </div> <div> <div class="status-dname"> {{EmojiFilter .DisplayName .Emojis}} </div> <a class="img-link" href="/user/{{.ID}}"> - <div class="status-uname"> {{.Acct}} </div> + <div class="status-uname"> @{{.Acct}} </div> </a> </div> </div> |