aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorr <r@freesoftwareextremist.com>2019-12-14 10:57:14 +0000
committerr <r@freesoftwareextremist.com>2019-12-14 10:57:14 +0000
commit59eaff95120bc1278f37f95fc74bc2e2518b9ef1 (patch)
tree0fc673dc5c797daa83f7924b4f818e125fefe44d
parent3847954687ee6aa9b89096da11d3919dfe70049e (diff)
downloadbloat-59eaff95120bc1278f37f95fc74bc2e2518b9ef1.tar.gz
bloat-59eaff95120bc1278f37f95fc74bc2e2518b9ef1.zip
Show retweet info in status
-rw-r--r--static/main.css24
-rw-r--r--templates/status.tmpl122
2 files changed, 91 insertions, 55 deletions
diff --git a/static/main.css b/static/main.css
index e81de2a..5420e40 100644
--- a/static/main.css
+++ b/static/main.css
@@ -1,6 +1,9 @@
+.status-container-container {
+ margin: 16px 0;
+}
+
.status-container {
display: flex;
- margin: 16px 0;
}
.status-content {
@@ -107,3 +110,22 @@
.signin-form input {
margin: 4px 0;
}
+
+.retweet-info {
+ margin: 8px 0 4px 24px;
+}
+
+.retweet-info .status-profile-img {
+ height: 24px;
+ width: 24px;
+ margin-bottom: -8px;
+ object-fit: contain;
+}
+
+.retweet-info .status-dname{
+ margin-left: 4px
+}
+
+.retweet-info .icon.dripicons-retweet.retweeted {
+ vertical-align: sub;
+}
diff --git a/templates/status.tmpl b/templates/status.tmpl
index fde2309..baccabb 100644
--- a/templates/status.tmpl
+++ b/templates/status.tmpl
@@ -1,64 +1,78 @@
-<div class="status-container">
- <div>
+<div class="status-container-container">
+ {{if .Reblog}}
+ <div class="retweet-info">
<img class="status-profile-img" src="{{.Account.AvatarStatic}}" alt="profile-avatar" />
+ <span class="status-dname"> {{WithEmojis .Account.DisplayName .Account.Emojis}} </span>
+ <span class="icon dripicons-retweet retweeted"></span>
+ repeated
</div>
- <div class="status">
- <div class="status-name">
- <span class="status-dname"> {{WithEmojis .Account.DisplayName .Account.Emojis}} </span>
- <span class="status-uname"> {{.Account.Acct}} </span>
+ {{template "status" .Reblog}}
+ {{else}}
+ {{block "status" .}}
+ <div class="status-container">
+ <div>
+ <img class="status-profile-img" src="{{.Account.AvatarStatic}}" alt="profile-avatar" />
</div>
- <div class="status-content"> {{WithEmojis .Content .Emojis}} </div>
- <div class="status-media-container">
- {{range .MediaAttachments}}
- {{if eq .Type "image"}}
- <a href="{{.URL}}" target="_blank">
- <img class="status-image" src="{{.URL}}" alt="status-image" />
- </a>
- {{else if eq .Type "audio"}}
- <audio class="status-audio" controls preload="none">
- <source src="{{.URL}}">
- <p> Your browser doesn't support HTML5 audio </p>
- </audio>
- {{else if eq .Type "video"}}
- <video class="status-video" controls preload="none">
- <source src="{{.URL}}">
- <p> Your browser doesn't support HTML5 video </p>
- </video>
- {{else}}
- <a href="{{.URL}}" target="_blank"> attachment </a>
- {{end}}
- {{end}}
- </div>
- <div class="status-action">
- <a class="status-you" href="/thread/{{.ID}}?reply=true" title="reply">
- <span class="icon dripicons-reply"></span>
- <span> {{DisplayInteractionCount .RepliesCount}} </span>
- </a>
- {{if .Reblogged}}
- <a class="status-retweet" href="/unretweet/{{.ID}}" title="undo repost">
- <span class="icon dripicons-retweet retweeted"></span>
- <span> {{DisplayInteractionCount .ReblogsCount}} </span>
+ <div class="status">
+ <div class="status-name">
+ <span class="status-dname"> {{WithEmojis .Account.DisplayName .Account.Emojis}} </span>
+ <span class="status-uname"> {{.Account.Acct}} </span>
+ </div>
+ <div class="status-content"> {{WithEmojis .Content .Emojis}} </div>
+ <div class="status-media-container">
+ {{range .MediaAttachments}}
+ {{if eq .Type "image"}}
+ <a href="{{.URL}}" target="_blank">
+ <img class="status-image" src="{{.URL}}" alt="status-image" />
</a>
+ {{else if eq .Type "audio"}}
+ <audio class="status-audio" controls preload="none">
+ <source src="{{.URL}}">
+ <p> Your browser doesn't support HTML5 audio </p>
+ </audio>
+ {{else if eq .Type "video"}}
+ <video class="status-video" controls preload="none">
+ <source src="{{.URL}}">
+ <p> Your browser doesn't support HTML5 video </p>
+ </video>
{{else}}
- <a class="status-retweet" href="/retweet/{{.ID}}" title="repost">
- <span class="icon dripicons-retweet"></span>
- <span> {{DisplayInteractionCount .ReblogsCount}} </span>
- </a>
+ <a href="{{.URL}}" target="_blank"> attachment </a>
{{end}}
- {{if .Favourited}}
- <a class="status-like" href="/unlike/{{.ID}}" title="unlike">
- <span class="icon dripicons-star liked"></span>
- <span> {{DisplayInteractionCount .FavouritesCount}} </span>
- </a>
- {{else}}
- <a class="status-like" href="/like/{{.ID}}" title="like">
- <span class="icon dripicons-star"></span>
- <span> {{DisplayInteractionCount .FavouritesCount}} </span>
- </a>
{{end}}
- <a class="status-time" href="/thread/{{.ID}}">
- <time datetime="{{FormatTimeRFC3339 .CreatedAt}}" title="{{.CreatedAt}}"> {{TimeSince .CreatedAt}} </time>
- </a>
+ </div>
+ <div class="status-action">
+ <a class="status-you" href="/thread/{{.ID}}?reply=true" title="reply">
+ <span class="icon dripicons-reply"></span>
+ <span> {{DisplayInteractionCount .RepliesCount}} </span>
+ </a>
+ {{if .Reblogged}}
+ <a class="status-retweet" href="/unretweet/{{.ID}}" title="undo repost">
+ <span class="icon dripicons-retweet retweeted"></span>
+ <span> {{DisplayInteractionCount .ReblogsCount}} </span>
+ </a>
+ {{else}}
+ <a class="status-retweet" href="/retweet/{{.ID}}" title="repost">
+ <span class="icon dripicons-retweet"></span>
+ <span> {{DisplayInteractionCount .ReblogsCount}} </span>
+ </a>
+ {{end}}
+ {{if .Favourited}}
+ <a class="status-like" href="/unlike/{{.ID}}" title="unlike">
+ <span class="icon dripicons-star liked"></span>
+ <span> {{DisplayInteractionCount .FavouritesCount}} </span>
+ </a>
+ {{else}}
+ <a class="status-like" href="/like/{{.ID}}" title="like">
+ <span class="icon dripicons-star"></span>
+ <span> {{DisplayInteractionCount .FavouritesCount}} </span>
+ </a>
+ {{end}}
+ <a class="status-time" href="/thread/{{.ID}}">
+ <time datetime="{{FormatTimeRFC3339 .CreatedAt}}" title="{{.CreatedAt}}"> {{TimeSince .CreatedAt}} </time>
+ </a>
+ </div>
</div>
</div>
+ {{end}}
+ {{end}}
</div>