From ac4ff88adb9a2526555757f8d4e65c69cafb3788 Mon Sep 17 00:00:00 2001
From: r <r@freesoftwareextremist.com>
Date: Thu, 26 Dec 2019 09:11:24 +0000
Subject: Add liked by and retweeted by page

---
 templates/error.tmpl       |  2 +-
 templates/likedby.tmpl     |  7 +++++
 templates/retweetedby.tmpl |  7 +++++
 templates/status.tmpl      | 65 +++++++++++++++++++++++++++-------------------
 templates/userlist.tmpl    | 17 ++++++++++++
 5 files changed, 70 insertions(+), 28 deletions(-)
 create mode 100644 templates/likedby.tmpl
 create mode 100644 templates/retweetedby.tmpl
 create mode 100644 templates/userlist.tmpl

(limited to 'templates')

diff --git a/templates/error.tmpl b/templates/error.tmpl
index 0389cdd..2049665 100644
--- a/templates/error.tmpl
+++ b/templates/error.tmpl
@@ -1,6 +1,6 @@
 {{template "header.tmpl" .HeaderData}}
 <div class="page-title"> Error </div>
-<div class="error-text"> {{.}} </div>
+<div class="error-text"> {{.Error}} </div>
 <div>
 <a href="/timeline/home">Home</a>
 <a href="/signin">Sign In</a>
diff --git a/templates/likedby.tmpl b/templates/likedby.tmpl
new file mode 100644
index 0000000..72855e0
--- /dev/null
+++ b/templates/likedby.tmpl
@@ -0,0 +1,7 @@
+{{template "header.tmpl" .HeaderData}}
+{{template "navigation.tmpl" .NavbarData}}
+<div class="page-title"> Liked By </div>
+
+{{template "userlist.tmpl" .Users}}
+
+{{template "footer.tmpl"}}
diff --git a/templates/retweetedby.tmpl b/templates/retweetedby.tmpl
new file mode 100644
index 0000000..2d9c539
--- /dev/null
+++ b/templates/retweetedby.tmpl
@@ -0,0 +1,7 @@
+{{template "header.tmpl" .HeaderData}}
+{{template "navigation.tmpl" .NavbarData}}
+<div class="page-title"> Retweeted By </div>
+
+{{template "userlist.tmpl" .Users}}
+
+{{template "footer.tmpl"}}
diff --git a/templates/status.tmpl b/templates/status.tmpl
index 6534249..4e975ad 100644
--- a/templates/status.tmpl
+++ b/templates/status.tmpl
@@ -85,43 +85,54 @@
 			{{end}}
 			{{end}}
 			</div>
-			<div class="status-action"> 
-				<a class="status-you" href="/thread/{{.ID}}?reply=true#status-{{.ID}}" title="reply"> 
-					<i class="fa fa-reply"></i>
-					<span> {{DisplayInteractionCount .RepliesCount}} </span>
-				</a>
-				{{if or (eq .Visibility "private") (eq .Visibility "direct")}}
-				<a class="status-retweet" title="this status cannot be retweeted"> 
-					<i class="fa fa-retweet"></i>
-					<span> {{DisplayInteractionCount .ReblogsCount}} </span>
-				</a>
-				{{else}}
+			<div class="status-action-container"> 
+				<div class="status-action">
+					<a class="status-you" href="/thread/{{.ID}}?reply=true#status-{{.ID}}" title="reply"> 
+						<i class="fa fa-reply"></i>
+					</a>
+					<a class="status-action-count" href="/thread/{{.ID}}#status-{{.ID}}">
+						<span> {{DisplayInteractionCount .RepliesCount}} </span>
+					</a>
+				</div>
+				<div class="status-action">
+					{{if or (eq .Visibility "private") (eq .Visibility "direct")}}
+					<a class="status-retweet" title="this status cannot be retweeted"> 
+						<i class="fa fa-retweet"></i>
+					</a>
+					{{else}}
 					{{if .Reblogged}}
 					<a class="status-retweet" href="/unretweet/{{.ID}}" title="undo retweet"> 
 						<i class="fa fa-retweet retweeted"></i>
-						<span> {{DisplayInteractionCount .ReblogsCount}} </span>
 					</a>
 					{{else}}
 					<a class="status-retweet" href="/retweet/{{.ID}}" title="retweet"> 
 						<i class="fa fa-retweet"></i>
+					</a>
+					{{end}}
+					{{end}}
+					<a class="status-action-count" href="/retweetedby/{{.ID}}" title="click to see the the list"> 
 						<span> {{DisplayInteractionCount .ReblogsCount}} </span>
 					</a>
+				</div>
+				<div class="status-action">
+					{{if .Favourited}}
+					<a class="status-like" href="/unlike/{{.ID}}" title="unlike"> 
+						<i class="fa fa-star liked"></i>
+					</a>
+					{{else}}
+					<a class="status-like" href="/like/{{.ID}}" title="like"> 
+						<i class="fa fa-star-o"></i>
+					</a>
 					{{end}}
-				{{end}}
-				{{if .Favourited}}
-				<a class="status-like" href="/unlike/{{.ID}}" title="unlike"> 
-					<i class="fa fa-star liked"></i>
-					<span> {{DisplayInteractionCount .FavouritesCount}} </span>
-				</a>
-				{{else}}
-				<a class="status-like" href="/like/{{.ID}}" title="like"> 
-					<i class="fa fa-star-o"></i>
-					<span> {{DisplayInteractionCount .FavouritesCount}} </span>
-				</a>
-				{{end}}
-				<a class="status-time" href="/thread/{{.ID}}#status-{{.ID}}"> 
-					<time datetime="{{FormatTimeRFC3339 .CreatedAt}}" title="{{.CreatedAt}}"> {{TimeSince .CreatedAt}} </time> 
-				</a>
+					<a class="status-action-count" href="/likedby/{{.ID}}" title="click to see the the list"> 
+						<span> {{DisplayInteractionCount .FavouritesCount}} </span>
+					</a>
+				</div>
+				<div class="status-action">
+					<a class="status-time" href="/thread/{{.ID}}#status-{{.ID}}"> 
+						<time datetime="{{FormatTimeRFC3339 .CreatedAt}}" title="{{.CreatedAt}}"> {{TimeSince .CreatedAt}} </time> 
+					</a>
+				</div>
 			</div>
 		</div>
 	</div>
diff --git a/templates/userlist.tmpl b/templates/userlist.tmpl
new file mode 100644
index 0000000..d52e67d
--- /dev/null
+++ b/templates/userlist.tmpl
@@ -0,0 +1,17 @@
+<div class="user-list-container">
+	{{range .}}
+	<div class="user-list-item">
+		<div>
+			<a class="img-link" href="/user/{{.ID}}">
+				<img class="status-profile-img" src="{{.AvatarStatic}}" alt="avatar" />
+			</a>
+		</div>
+		<div>
+			<div class="status-dname"> {{EmojiFilter .DisplayName .Emojis}} </div>  
+			<a class="img-link" href="/user/{{.ID}}">
+				<div class="status-uname"> {{.Acct}} </div>
+			</a>
+		</div>
+	</div>
+	{{end}}
+</div>
-- 
cgit v1.2.3