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

diff --git a/src/main/resources/templates/include/viewSone.html b/src/main/resources/templates/include/viewSone.html
index 39d42da..455d81e 100644
--- a/src/main/resources/templates/include/viewSone.html
+++ b/src/main/resources/templates/include/viewSone.html
@@ -1,54 +1,44 @@
-<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="sone <% sone.status|html><%if sone.modified> modified<%/if> <% sone.id|css|html><%if sone.local> local<%/if><%if sone.new> new<%/if>">
+	<div class="id hidden"><% 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>
-	<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="last-update"><%= View.Sone.Label.LastUpdate|l10n|html> <span class="time" title="<% sone.time|unknown|date format=="MMM d, yyyy, HH:mm:ss">"><%sone.lastUpdatedText|l10n|html></span></div>
+	<div>
+		<div class="profile-link"><a href="viewSone.html?sone=<% sone.id|html>" title="<% sone.requestUri|html>"><% sone.niceName|html></a></div>
+		<div class="sone-stats">(<%= View.Sone.Stats.Posts|l10n 0=sone.posts.size>, <%= View.Sone.Stats.Replies|l10n 0=sone.replies.size><%if ! sone.allImages.size|match value==0>, <%= View.Sone.Stats.Images|l10n 0=sone.allImages.size><%/if>)</div>
+	</div>
+	<div class="short-request-uri"><% sone.id|html></div>
 	<div class="hidden"><% sone.blacklisted></div>
+	<%if sone.local>
+		<form class="lock<%if sone.locked> hidden<%/if>" action="lockSone.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" title="<%= View.Sone.Button.LockSone.Tooltip|l10n|html>"><%= View.Sone.Button.LockSone|l10n|html></button>
+		</form>
+		<form class="unlock<%if !sone.locked> hidden<%/if>" action="unlockSone.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" title="<%= View.Sone.Button.UnlockSone.Tooltip|l10n|html>"><%= View.Sone.Button.UnlockSone|l10n|html></button>
+		</form>
+	<%/if>
 	<%if ! sone.current>
-		<%if ! sone.blacklisted>
-			<form class="blacklist" action="blacklistSone.html" method="post">
+		<%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|html>" />
 				<input type="hidden" name="returnPage" value="<% request.uri|html>" />
-				<button type="submit"><%= View.Sone.Button.BlacklistSone|l10n|html></button>
+				<button type="submit"><%= View.Sone.Button.UnfollowSone|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|html>" />
-					<input type="hidden" name="returnPage" value="<% request.uri|html>" />
-					<button type="submit"><%= View.Sone.Button.UnfollowSone|l10n|html></button>
-				</form>
-				<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|html>" />
-					<input type="hidden" name="returnPage" value="<% request.uri|html>" />
-					<button type="submit"><%= View.Sone.Button.FollowSone|l10n|html></button>
-				</form>
-				<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|html>" />
-					<input type="hidden" name="returnPage" value="<% request.uri|html>" />
-					<button type="submit"><%= View.Sone.Button.UnblockSone|l10n|html></button>
-				</form>
-				<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|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">
+			<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|html>" />
 				<input type="hidden" name="returnPage" value="<% request.uri|html>" />
-				<button type="submit"><%= View.Sone.Button.UnblacklistSone|l10n|html></button>
+				<button type="submit"><%= View.Sone.Button.FollowSone|l10n|html></button>
 			</form>
 		<%/if>
 	<%/if>