diff options
| author | r <r@freesoftwareextremist.com> | 2020-01-29 18:14:27 +0000 |
|---|---|---|
| committer | r <r@freesoftwareextremist.com> | 2020-01-29 18:14:27 +0000 |
| commit | f93fe3276607039a5d09fa83b17c8f353b19ce86 (patch) | |
| tree | df7daa8355087b68aad53516e51472b924a737bb /templates | |
| parent | 2c084dfd097da448a830a8e017af0175209259ab (diff) | |
| download | bloat-f93fe3276607039a5d09fa83b17c8f353b19ce86.tar.gz bloat-f93fe3276607039a5d09fa83b17c8f353b19ce86.zip | |
Update notification layout
Diffstat (limited to 'templates')
| -rw-r--r-- | templates/notification.tmpl | 53 | ||||
| -rw-r--r-- | templates/status.tmpl | 4 |
2 files changed, 25 insertions, 32 deletions
diff --git a/templates/notification.tmpl b/templates/notification.tmpl index 7d0e67c..cc7a4a1 100644 --- a/templates/notification.tmpl +++ b/templates/notification.tmpl @@ -17,6 +17,9 @@ <span class="status-dname"> {{EmojiFilter .Account.DisplayName .Account.Emojis}} </span> <img class="icon" src="{{GetIcon "user-plus" $.Ctx.DarkMode}}" alt="followed" /> <span> followed you </span> + <span> + - <time datetime="{{FormatTimeRFC3339 .CreatedAt}}" title="{{FormatTimeRFC822 .CreatedAt}}">{{TimeSince .CreatedAt}}</time> + </span> </div> <div class="notification-follow-uname"> @{{.Account.Acct}} @@ -28,38 +31,32 @@ {{template "status" (WithContext .Status $.Ctx)}} {{else if eq .Type "reblog"}} - <div class="notification-retweet-container"> - <div class="status-profile-img-container"> - <a class="img-link" href="/user/{{.Account.ID}}" > - <img class="status-profile-img" src="{{.Account.AvatarStatic}}" alt="profile-avatar" /> - </a> - </div> - <div> - <div class="notification-info-text"> - <span class="status-dname"> {{EmojiFilter .Account.DisplayName .Account.Emojis}} </span> - <img class="icon" src="{{GetIcon "retweeted" $.Ctx.DarkMode}}" alt="retweeted" /> - <span> retweeted your post </span> - </div> - {{template "status" (WithContext .Status $.Ctx)}} - </div> + <div class="retweet-info"> + <a class="img-link" href="/user/{{.Account.ID}}"> + <img class="status-profile-img" src="{{.Account.AvatarStatic}}" alt="avatar" /> + </a> + <span class="status-dname"> {{EmojiFilter .Account.DisplayName .Account.Emojis}} </span> + <img class="icon" src="{{GetIcon "retweeted" $.Ctx.DarkMode}}" alt="retweeted" /> + <span> retweeted your post </span> + <span> + - <time datetime="{{FormatTimeRFC3339 .CreatedAt}}" title="{{FormatTimeRFC822 .CreatedAt}}">{{TimeSince .CreatedAt}}</time> + </span> </div> + {{template "status" (WithContext .Status $.Ctx)}} {{else if eq .Type "favourite"}} - <div class="notification-like-container"> - <div class="status-profile-img-container"> - <a class="img-link" href="/user/{{.Account.ID}}" > - <img class="status-profile-img" src="{{.Account.AvatarStatic}}" alt="profile-avatar" /> - </a> - </div> - <div> - <div class="notification-info-text"> - <span class="status-dname"> {{EmojiFilter .Account.DisplayName .Account.Emojis}} </span> - <img class="icon" src="{{GetIcon "liked" $.Ctx.DarkMode}}" alt="liked" /> - <span> liked your post </span> - </div> - {{template "status" (WithContext .Status $.Ctx)}} - </div> + <div class="retweet-info"> + <a class="img-link" href="/user/{{.Account.ID}}"> + <img class="status-profile-img" src="{{.Account.AvatarStatic}}" alt="avatar" /> + </a> + <span class="status-dname"> {{EmojiFilter .Account.DisplayName .Account.Emojis}} </span> + <img class="icon" src="{{GetIcon "liked" $.Ctx.DarkMode}}" alt="liked" /> + <span> liked your post </span> + <span> + - <time datetime="{{FormatTimeRFC3339 .CreatedAt}}" title="{{FormatTimeRFC822 .CreatedAt}}">{{TimeSince .CreatedAt}}</time> + </span> </div> + {{template "status" (WithContext .Status $.Ctx)}} {{end}} </div> {{end}} diff --git a/templates/status.tmpl b/templates/status.tmpl index fd5339a..a6b28fa 100644 --- a/templates/status.tmpl +++ b/templates/status.tmpl @@ -14,15 +14,12 @@ {{block "status" (WithContext . $.Ctx)}} {{with $s := .Data}} <div class="status-container status-{{.ID}}" data-id="{{.ID}}"> - {{if not .HideAccountInfo}} <div class="status-profile-img-container"> <a class="img-link" href="/user/{{.Account.ID}}"> <img class="status-profile-img" src="{{.Account.AvatarStatic}}" alt="avatar" /> </a> </div> - {{end}} <div class="status"> - {{if not .HideAccountInfo}} <div class="status-name"> <span class="status-dname"> {{EmojiFilter .Account.DisplayName .Account.Emojis}} </span> <a href="/user/{{.Account.ID}}" > @@ -43,7 +40,6 @@ <img class="icon" src="{{GetIcon "link" $.Ctx.DarkMode}}" alt="source" /> </a> </div> - {{end}} <div class="status-reply-container"> {{if .InReplyToID}} <div class="status-reply-to"> |