X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fresources%2Ftemplates%2Finclude%2FviewSone.html;h=39d42dabe42182f9154245bc0a5fefbb2e42f094;hb=c319c653b790dea126c66130d0a25fd4f1d0ec46;hp=5f001ba7d148fdba847a2f961ee1dda03fe49b0f;hpb=9fdc55aac4b0a848d224867aaf61479d771525e8;p=Sone.git

diff --git a/src/main/resources/templates/include/viewSone.html b/src/main/resources/templates/include/viewSone.html
index 5f001ba..39d42da 100644
--- a/src/main/resources/templates/include/viewSone.html
+++ b/src/main/resources/templates/include/viewSone.html
@@ -1,39 +1,56 @@
-<div class="sone <% sone.status><%if sone.modified> modified<%/if>">
-	<div class="profile-link"><a href="viewSone.html?sone=<% sone.id>" title="<% sone.requestUri|html>"><% sone.niceName|html></a></div>
-	<div class="last-update">(<%= View.Sone.Label.LastUpdate|l10n|html> <% sone.time|date format="MMM d, yyyy, HH:mm:ss">)</div>
+<div class="sone <% sone.status|html><%if sone.modified> modified<%/if> <% sone.id|html><%if sone.local> local<%/if>">
+	<div class="id"><% sone.id|html></div>
 	<div class="unknown-marker" title="<%= View.Sone.Status.Unknown|l10n|html>">?</div>
 	<div class="modified-marker" title="<%= View.Sone.Status.Modified|l10n|html>">!</div>
 	<div class="download-marker" title="<%= View.Sone.Status.Downloading|l10n|html>">⬊</div>
 	<div class="insert-marker" title="<%= View.Sone.Status.Inserting|l10n|html>">⬈</div>
-	<div class="idle-marker" title="<%= View.Sone.Status.Idle|l10n|html>"></div>
-	<%ifnull ! currentSone>
-		<%if ! sone.current>
-			<%if sone.friend>
-				<form class="unfollow" action="unfollowSone.html" method="post">
+	<div class="idle-marker" title="<%= View.Sone.Status.Idle|l10n|html>">✔</div>
+	<div class="last-update"><%= View.Sone.Label.LastUpdate|l10n|html> <span class="time"><% sone.time|date format="MMM d, yyyy, HH:mm:ss"></span></div>
+	<div class="profile-link"><a href="viewSone.html?sone=<% sone.id|html>" title="<% sone.requestUri|html>"><% sone.niceName|html></a></div>
+	<div class="short-request-uri"><% sone.requestUri|substring start=4 length=43|html></div>
+	<div class="hidden"><% sone.blacklisted></div>
+	<%if ! sone.current>
+		<%if ! sone.blacklisted>
+			<form class="blacklist" action="blacklistSone.html" method="post">
+				<input type="hidden" name="formPassword" value="<% formPassword|html>" />
+				<input type="hidden" name="sone" value="<% sone.id|html>" />
+				<input type="hidden" name="returnPage" value="<% request.uri|html>" />
+				<button type="submit"><%= View.Sone.Button.BlacklistSone|l10n|html></button>
+			</form>
+			<%ifnull ! currentSone>
+				<form class="unfollow<%if ! sone.friend> hidden<%/if>" action="unfollowSone.html" method="post">
 					<input type="hidden" name="formPassword" value="<% formPassword|html>" />
-					<input type="hidden" name="sone" value="<% sone.id>" />
+					<input type="hidden" name="sone" value="<% sone.id|html>" />
+					<input type="hidden" name="returnPage" value="<% request.uri|html>" />
 					<button type="submit"><%= View.Sone.Button.UnfollowSone|l10n|html></button>
 				</form>
-			<%else>
-				<form class="follow" action="followSone.html" method="post">
+				<form class="follow<%if sone.friend> hidden<%/if>" action="followSone.html" method="post">
 					<input type="hidden" name="formPassword" value="<% formPassword|html>" />
-					<input type="hidden" name="sone" value="<% sone.id>" />
+					<input type="hidden" name="sone" value="<% sone.id|html>" />
+					<input type="hidden" name="returnPage" value="<% request.uri|html>" />
 					<button type="submit"><%= View.Sone.Button.FollowSone|l10n|html></button>
 				</form>
-			<%/if>
-			<%if sone.blocked>
-				<form class="unblock" action="unblockSone.html" method="post">
+				<form class="unblock<%if ! sone.blocked> hidden<%/if>" action="unblockSone.html" method="post">
 					<input type="hidden" name="formPassword" value="<% formPassword|html>" />
-					<input type="hidden" name="sone" value="<% sone.id>" />
+					<input type="hidden" name="sone" value="<% sone.id|html>" />
+					<input type="hidden" name="returnPage" value="<% request.uri|html>" />
 					<button type="submit"><%= View.Sone.Button.UnblockSone|l10n|html></button>
 				</form>
-			<%else>
-				<form class="block" action="blockSone.html" method="post">
+				<form class="block<%if sone.blocked> hidden<%/if>" action="blockSone.html" method="post">
 					<input type="hidden" name="formPassword" value="<% formPassword|html>" />
-					<input type="hidden" name="sone" value="<% sone.id>" />
+					<input type="hidden" name="sone" value="<% sone.id|html>" />
+					<input type="hidden" name="returnPage" value="<% request.uri|html>" />
 					<button type="submit"><%= View.Sone.Button.BlockSone|l10n|html></button>
 				</form>
 			<%/if>
+		<%else>
+			<form class="unblacklist" action="unblacklistSone.html" method="post">
+				<input type="hidden" name="formPassword" value="<% formPassword|html>" />
+				<input type="hidden" name="sone" value="<% sone.id|html>" />
+				<input type="hidden" name="returnPage" value="<% request.uri|html>" />
+				<button type="submit"><%= View.Sone.Button.UnblacklistSone|l10n|html></button>
+			</form>
 		<%/if>
 	<%/if>
+	<div class="spacer">&nbsp;</div>
 </div>