X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fresources%2Ftemplates%2Finclude%2FviewPost.html;h=6e79c7a899c1f1cea628d492081a8ec9ae82b844;hb=7594db8e46e8e2efeb0f0228d7267efc54eb2e78;hp=c5df1f0b83131f59ba2d488882f8cff41e5557c9;hpb=f75d7f9540350fcc16098770739c429a3f755bde;p=Sone.git

diff --git a/src/main/resources/templates/include/viewPost.html b/src/main/resources/templates/include/viewPost.html
index c5df1f0..6e79c7a 100644
--- a/src/main/resources/templates/include/viewPost.html
+++ b/src/main/resources/templates/include/viewPost.html
@@ -1,93 +1,56 @@
-<div id="<% post.id|html>" class="post<%if loop.last> last<%/if>">
+<a name="post-<% post.id|html>"></a>
+<div id="<% post.id|html>" class="post<%if loop.last> last<%/if><%if post.new> new<%/if>">
 	<div class="avatar">
 		<img src="/WoT/GetIdenticon?identity=<% post.sone.id|html>&amp;width=48&height=48" width="48" height="48" alt="Avatar Image" />
 	</div>
 	<div class="inner-part">
-	<div>
-		<div class="author profile-link"><a href="viewSone.html?sone=<% post.sone.id|html>"><% post.sone.niceName|html></a></div>
-		<div class="text"><% post.text|html></div>
-	</div>
-	<div class="status-line">
-		<div class="time"><a href="viewPost.html?post=<% post.id|html>"><% post.time|date format="MMM d, yyyy, HH:mm:ss"></a></div>
-		<div class="likes<%if post.likes.size|match value=0> hidden<%/if>"><span title="<% post.likes.soneNames|html>">⬆<span class="like-count"><% post.likes.size></span></span></div>
-		<%ifnull ! currentSone>
-			<form class="like<%if post.liked> hidden<%/if>" action="like.html" method="post">
-				<input type="hidden" name="formPassword" value="<% formPassword|html>" />
-				<input type="hidden" name="returnPage" value="<% request.uri|html>" />
-				<input type="hidden" name="type" value="post" />
-				<input type="hidden" name="post" value="<% post.id|html>" />
-				<button type="submit" value="1"><%= View.Post.LikeLink|l10n|html></button>
-			</form>
-			<form class="unlike<%if ! post.liked> hidden<%/if>" action="unlike.html" method="post">
-				<input type="hidden" name="formPassword" value="<% formPassword|html>" />
-				<input type="hidden" name="returnPage" value="<% request.uri|html>" />
-				<input type="hidden" name="type" value="post" />
-				<input type="hidden" name="post" value="<% post.id|html>" />
-				<button type="submit" value="1"><%= View.Post.UnlikeLink|l10n|html></button>
-			</form>
-		<%/if>
-		<%if post.sone.current>
-			<form class="delete" action="deletePost.html" method="post">
-				<input type="hidden" name="formPassword" value="<% formPassword|html>" />
-				<input type="hidden" name="returnPage" value="<% request.uri|html>" />
-				<input type="hidden" name="post" value="<% post.id|html>" />
-				<button type="submit"><%= View.Post.DeleteLink|l10n|html></button>
-			</form>
-		<%/if>
-	</div>
-	<div class="replies">
-		<%foreach post.replies reply>
-			<div id="<% reply.id|html>" class="reply">
-				<div class="avatar">
-					<img src="/WoT/GetIdenticon?identity=<% reply.sone.id|html>&amp;width=36&height=36" width="36" height="36" alt="Avatar Image" />
-				</div>
-				<div class="inner-part">
-				<div>
-					<div class="author profile-link"><a href="viewSone.html?sone=<% reply.sone.id|html>"><% reply.sone.niceName|html></a></div>
-					<div class="text"><% reply.text|html></div>
-				</div>
-				<div class="status-line">
-					<div class="time"><% reply.time|date format="MMM d, yyyy, HH:mm:ss"></div>
-					<div class="likes<%if reply.likes.size|match value=0> hidden<%/if>"><span title="<% reply.likes.soneNames|html>">⬆<span class="like-count"><% reply.likes.size></span></span></div>
-					<%ifnull ! currentSone>
-						<form class="like<%if reply.liked> hidden<%/if>" action="like.html" method="post">
-							<input type="hidden" name="formPassword" value="<% formPassword|html>" />
-							<input type="hidden" name="returnPage" value="<% request.uri|html>" />
-							<input type="hidden" name="type" value="reply" />
-							<input type="hidden" name="reply" value="<% reply.id|html>" />
-							<button type="submit" value="1"><%= View.Post.LikeLink|l10n|html></button>
-						</form>
-						<form class="unlike<%if ! reply.liked> hidden<%/if>" action="unlike.html" method="post">
-							<input type="hidden" name="formPassword" value="<% formPassword|html>" />
-							<input type="hidden" name="returnPage" value="<% request.uri|html>" />
-							<input type="hidden" name="type" value="reply" />
-							<input type="hidden" name="reply" value="<% reply.id|html>" />
-							<button type="submit" value="1"><%= View.Post.UnlikeLink|l10n|html></button>
-						</form>
-					<%/if>
-					<%if reply.sone.current>
-						<form class="delete" action="deleteReply.html" method="post">
-							<input type="hidden" name="formPassword" value="<% formPassword|html>" />
-							<input type="hidden" name="returnPage" value="<% request.uri|html>" />
-							<input type="hidden" name="reply" value="<% reply.id|html>" />
-							<button type="submit"><%= View.Post.Reply.DeleteLink|l10n|html></button>
-						</form>
-					<%/if>
-				</div>
-				</div>
-			</div>
-		<%/foreach>
-		<%ifnull ! currentSone>
-			<div class="create-reply">
-				<form method="post" action="createReply.html">
+		<div>
+			<div class="author profile-link"><a href="viewSone.html?sone=<% post.sone.id|html>"><% post.sone.niceName|html></a></div>
+			<div class="text"><% post.text|html></div>
+		</div>
+		<div class="status-line">
+			<div class="time"><a href="viewPost.html?post=<% post.id|html>"><% post.time|date format="MMM d, yyyy, HH:mm:ss"></a></div>
+			<div class="likes<%if post.likes.size|match value=0> hidden<%/if>"><span title="<% post.likes.soneNames|html>">⬆<span class="like-count"><% post.likes.size></span></span></div>
+			<%ifnull ! currentSone>
+				<form class="like<%if post.liked> hidden<%/if>" action="like.html" method="post">
 					<input type="hidden" name="formPassword" value="<% formPassword|html>" />
 					<input type="hidden" name="returnPage" value="<% request.uri|html>" />
+					<input type="hidden" name="type" value="post" />
 					<input type="hidden" name="post" value="<% post.id|html>" />
-					<input type="text" class="reply-input" name="text" value="" />
-					<button type="submit"><%= View.Post.SendReply|l10n|html></button>
+					<button type="submit" value="1"><%= View.Post.LikeLink|l10n|html></button>
 				</form>
-			</div>
-		<%/if>
-	</div>
+				<form class="unlike<%if ! post.liked> hidden<%/if>" action="unlike.html" method="post">
+					<input type="hidden" name="formPassword" value="<% formPassword|html>" />
+					<input type="hidden" name="returnPage" value="<% request.uri|html>" />
+					<input type="hidden" name="type" value="post" />
+					<input type="hidden" name="post" value="<% post.id|html>" />
+					<button type="submit" value="1"><%= View.Post.UnlikeLink|l10n|html></button>
+				</form>
+			<%/if>
+			<%if post.sone.current>
+				<form class="delete" action="deletePost.html" method="post">
+					<input type="hidden" name="formPassword" value="<% formPassword|html>" />
+					<input type="hidden" name="returnPage" value="<% request.uri|html>" />
+					<input type="hidden" name="post" value="<% post.id|html>" />
+					<button type="submit"><%= View.Post.DeleteLink|l10n|html></button>
+				</form>
+			<%/if>
+		</div>
+		<div class="replies">
+			<%foreach post.replies reply>
+				<%include include/viewReply.html>
+			<%/foreach>
+			<%ifnull ! currentSone>
+				<div class="create-reply">
+					<form method="post" action="createReply.html">
+						<input type="hidden" name="formPassword" value="<% formPassword|html>" />
+						<input type="hidden" name="returnPage" value="<% request.uri|html>" />
+						<input type="hidden" name="post" value="<% post.id|html>" />
+						<input type="text" class="reply-input" name="text" value="" />
+						<button type="submit"><%= View.Post.SendReply|l10n|html></button>
+					</form>
+				</div>
+			<%/if>
+		</div>
 	</div>
 </div>