X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fresources%2Ftemplates%2FviewSone.html;h=aad70eeacfa0ee3d79e9f823b583ee8b597b8e7c;hb=dd3edaf932d073e2eacb14069a9f6136d516303d;hp=46c98da65f8090e05c11bddf2c142f9b3813f65a;hpb=db1981cee6635b3d9e56cb37d795bbe931046330;p=Sone.git

diff --git a/src/main/resources/templates/viewSone.html b/src/main/resources/templates/viewSone.html
index 46c98da..aad70ee 100644
--- a/src/main/resources/templates/viewSone.html
+++ b/src/main/resources/templates/viewSone.html
@@ -12,8 +12,8 @@
 
 		<h1><%= Page.ViewSone.PostList.Title|l10n|insert needle="{sone}" key=sone.niceName|html></h1>
 
-		<%if ! sone.isCurrent>
-			<%if sone.isFriend>
+		<%if ! sone.current>
+			<%if sone.friend>
 				<div><a href="unfollowSone.html?sone=<% sone.id>"><%= Page.ViewSone.UnfollowSone.Text|l10n|html></a></div>
 			<%else>
 				<div><a href="followSone.html?sone=<% sone.id>"><%= Page.ViewSone.FollowSone.Text|l10n|html></a></div>
@@ -22,26 +22,7 @@
 
 		<div id="posts">
 			<%foreach sone.posts post>
-				<div class="post">
-					<div class="author"><a href="viewSone.html?sone=<% post.sone.id>"><% post.sone.niceName|html></a></div>
-					<div class="text"><% post.text|html></div>
-					<div class="time"><% post.time|date format="MMM d, yyyy, HH:mm:ss"></div>
-				</div>
-				<%foreach post.replies reply>
-					<div class="reply">
-						<div class="author"><a href="viewSone.html?sone=<% reply.sone.id>"><% reply.sone.niceName|html></a></div>
-						<div class="text"><% reply.text|html></div>
-						<div class="time"><% reply.time|date format="MMM d, yyyy, HH:mm:ss"></div>
-					</div>
-				<%/foreach>
-				<div class="create-reply">
-					<form method="post" action="createReply.html">
-						<input type="hidden" name="formPassword" value="<% formPassword|html>" />
-						<input type="hidden" name="post" value="<% post.id>" />
-						<input type="text" name="text" value="" />
-						<button type="submit">Post Reply</button>
-					</form>
-				</div>
+				<%include include/viewPost.html>
 			<%foreachelse>
 				<div><%= Page.ViewSone.PostList.Text.NoPostYet|l10n|html></div>
 			<%/foreach>
@@ -50,16 +31,8 @@
 		<h1><%= Page.ViewSone.Following.Title|l10n|html></h1>
 
 		<div id="following">
-			<%foreach sone.friends friend>
-				<%first>
-					<ul>
-				<%/first>
-					<li><a href="viewSone.html?sone=<% friend.id>"><% friend.niceName|html></a> (<% friend.requestUri|html>)</li>
-				<%last>
-					</ul>
-				<%/last>
-			<%foreachelse>
-				<div><%= Page.ViewSone.Following.FollowingNone.Text|l10n|html></div>
+			<%foreach sone.friends sone>
+				<%include include/viewSone.html>
 			<%/foreach>
 		</div>