From e9f5e0cab55a8a92575139788ffb003ed5d4f576 Mon Sep 17 00:00:00 2001
From: r <r@freesoftwareextremist.com>
Date: Sun, 23 Feb 2020 13:26:39 +0000
Subject: Use <base> element to set target

---
 templates/status.tmpl | 38 +++++++++++++++++++-------------------
 1 file changed, 19 insertions(+), 19 deletions(-)

(limited to 'templates/status.tmpl')

diff --git a/templates/status.tmpl b/templates/status.tmpl
index 536f515..0371a4e 100644
--- a/templates/status.tmpl
+++ b/templates/status.tmpl
@@ -2,7 +2,7 @@
 <div id="status-{{.ID}}" class="status-container-container">
 	{{if .Reblog}}
 	<div class="retweet-info">
-		<a class="img-link" href="/user/{{.Account.ID}}" target="main">
+		<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>  
@@ -14,14 +14,14 @@
 	{{with $s := .Data}}
 	<div class="status-container status-{{.ID}}" data-id="{{.ID}}">
 		<div class="status-profile-img-container">
-			<a class="img-link" href="/user/{{.Account.ID}}" target="main">
+			<a class="img-link" href="/user/{{.Account.ID}}">
 				<img class="status-profile-img" src="{{.Account.AvatarStatic}}" alt="avatar" />
 			</a>
 		</div>
 		<div class="status"> 
 			<div class="status-name">
 				<span class="status-dname"> {{EmojiFilter .Account.DisplayName .Account.Emojis}} </span> 
-				<a href="/user/{{.Account.ID}}"  target="main">
+				<a href="/user/{{.Account.ID}}">
 					<span class="status-uname"> {{.Account.Acct}} </span>
 				</a>
 				<div class="more-container">
@@ -33,18 +33,18 @@
 							source
 						</a>
 						{{if .Muted}}
-						<form action="/unmuteconv/{{.ID}}" method="post">
+						<form action="/unmuteconv/{{.ID}}" method="post" target="_self">
 							<input type="hidden" name="csrf_token" value="{{$.Ctx.CSRFToken}}">
 							<input type="submit" value="unmute" class="btn-link more-link">
 						</form>
 						{{else}}
-						<form action="/muteconv/{{.ID}}" method="post">
+						<form action="/muteconv/{{.ID}}" method="post" target="_self">
 							<input type="hidden" name="csrf_token" value="{{$.Ctx.CSRFToken}}">
 							<input type="submit" value="mute" class="btn-link more-link">
 						</form>
 						{{end}}
 						{{if eq $.Ctx.UserID .Account.ID}}
-						<form action="/delete/{{.ID}}" method="post">
+						<form action="/delete/{{.ID}}" method="post" target="_self">
 							<input type="hidden" name="csrf_token" value="{{$.Ctx.CSRFToken}}">
 							<input type="submit" value="delete" class="btn-link more-link">
 						</form>
@@ -55,7 +55,7 @@
 			<div class="status-reply-container">
 				{{if .InReplyToID}}
 				<div class="status-reply-to">
-					<a class="status-reply-to-link" href="{{if not .ShowReplies}}/thread/{{.InReplyToID}}{{end}}#status-{{.InReplyToID}}" target="main"> 
+					<a class="status-reply-to-link" href="{{if not .ShowReplies}}/thread/{{.InReplyToID}}{{end}}#status-{{.InReplyToID}}"> 
 						 reply to {{.Pleroma.InReplyToAccountAcct}} 
 					</a>
 				</div>
@@ -103,7 +103,7 @@
 				{{end}}
 			</div>
 			{{if .Poll}}
-			<form class="poll-form" action="/vote/{{.Poll.ID}}" method="POST">
+			<form class="poll-form" action="/vote/{{.Poll.ID}}" method="POST" target="_self">
 				<input type="hidden" name="csrf_token" value="{{$.Ctx.CSRFToken}}">
 				<input type="hidden" name="status_id" value="{{$s.ID}}">
 				{{range $i, $o := .Poll.Options}}
@@ -139,58 +139,58 @@
 			{{end}}
 			<div class="status-action-container"> 
 				<div class="status-action">
-					<a href="/thread/{{.ID}}?reply=true#status-{{.ID}}" target="main"> 
+					<a href="/thread/{{.ID}}?reply=true#status-{{.ID}}"> 
 						reply
 					</a>
-					<a class="status-reply-count" href="/thread/{{.ID}}#status-{{.ID}}" target="{{if $.Ctx.ThreadInNewTab}}_blank{{else}}main{{end}}">
+					<a class="status-reply-count" href="/thread/{{.ID}}#status-{{.ID}}" {{if $.Ctx.ThreadInNewTab}}target="_blank"{{end}}>
 						{{if .RepliesCount}} ({{DisplayInteractionCount .RepliesCount}}) {{end}}
 					</a>
 				</div>
 				<div class="status-action">
 					{{if or (eq .Visibility "private") (eq .Visibility "direct")}}
-					<a class="status-retweet" href="" title="this status cannot be retweeted" target="main"> 
+					<a class="status-retweet" href="" title="this status cannot be retweeted"> 
 						retweet
 					</a>
 					{{else}}
 					{{if .Reblogged}}
-					<form class="status-retweet" data-action="unretweet" action="/unretweet/{{.ID}}" method="post">
+					<form class="status-retweet" data-action="unretweet" action="/unretweet/{{.ID}}" method="post" target="_self">
 						<input type="hidden" name="csrf_token" value="{{$.Ctx.CSRFToken}}">
 						<input type="hidden" name="retweeted_by_id" value="{{.RetweetedByID}}">
 						<input type="submit" value="unretweet" class="btn-link">
 					</form>
 					{{else}}
-					<form class="status-retweet" data-action="retweet" action="/retweet/{{.ID}}" method="post">
+					<form class="status-retweet" data-action="retweet" action="/retweet/{{.ID}}" method="post" target="_self">
 						<input type="hidden" name="csrf_token" value="{{$.Ctx.CSRFToken}}">
 						<input type="hidden" name="retweeted_by_id" value="{{.RetweetedByID}}">
 						<input type="submit" value="retweet" class="btn-link">
 					</form>
 					{{end}}
 					{{end}}
-					<a class="status-retweet-count" href="/retweetedby/{{.ID}}" title="click to see the the list" target="main"> 
+					<a class="status-retweet-count" href="/retweetedby/{{.ID}}" title="click to see the the list"> 
 						{{if .ReblogsCount}} ({{DisplayInteractionCount .ReblogsCount}}) {{end}}
 					</a>
 				</div>
 				<div class="status-action">
 					{{if .Favourited}}
-					<form class="status-like" data-action="unlike" action="/unlike/{{.ID}}" method="post">
+					<form class="status-like" data-action="unlike" action="/unlike/{{.ID}}" method="post" target="_self">
 						<input type="hidden" name="csrf_token" value="{{$.Ctx.CSRFToken}}">
 						<input type="hidden" name="retweeted_by_id" value="{{.RetweetedByID}}">
 						<input type="submit" value="unlike" class="btn-link">
 					</form>
 					{{else}}
-					<form class="status-like" data-action="like" action="/like/{{.ID}}" method="post">
+					<form class="status-like" data-action="like" action="/like/{{.ID}}" method="post" target="_self">
 						<input type="hidden" name="csrf_token" value="{{$.Ctx.CSRFToken}}">
 						<input type="hidden" name="retweeted_by_id" value="{{.RetweetedByID}}">
 						<input type="submit" value="like" class="btn-link">
 					</form>
 					{{end}}
-					<a class="status-like-count" href="/likedby/{{.ID}}" title="click to see the the list" target="main"> 
+					<a class="status-like-count" href="/likedby/{{.ID}}" title="click to see the the list"> 
 						{{if .FavouritesCount}} ({{DisplayInteractionCount .FavouritesCount}}) {{end}}
 					</a>
 				</div>
 				<div class="status-action">
-					<a class="status-time" href="{{if not .ShowReplies}}/thread/{{.ID}}{{end}}#status-{{.ID}}" 
-						target="{{if $.Ctx.ThreadInNewTab}}_blank{{else}}main{{end}}"> 
+					<a class="status-time" href="{{if not .ShowReplies}}/thread/{{.ID}}{{end}}#status-{{.ID}}"
+						{{if $.Ctx.ThreadInNewTab}}target="_blank"{{end}}> 
 						<time datetime="{{FormatTimeRFC3339 .CreatedAt}}" title="{{FormatTimeRFC822 .CreatedAt}}"> 
 							{{TimeSince .CreatedAt}}
 						</time> 
-- 
cgit v1.2.3