From 09b9d94dea6b6750a00475ab4e75d378bd76cc8f Mon Sep 17 00:00:00 2001
From: =?utf8?q?David=20=E2=80=98Bombe=E2=80=99=20Roden?=
 <bombe@pterodactylus.net>
Date: Sat, 16 Oct 2010 12:27:32 +0200
Subject: [PATCH] Create inclusion template for viewing a post.

---
 src/main/resources/i18n/sone.en.properties         |  3 +++
 src/main/resources/templates/include/viewPost.html | 21 +++++++++++++++++++++
 src/main/resources/templates/index.html            | 21 +--------------------
 src/main/resources/templates/viewPost.html         | 21 +--------------------
 4 files changed, 26 insertions(+), 40 deletions(-)
 create mode 100644 src/main/resources/templates/include/viewPost.html

diff --git a/src/main/resources/i18n/sone.en.properties b/src/main/resources/i18n/sone.en.properties
index 2d3c1d3..179ab52 100644
--- a/src/main/resources/i18n/sone.en.properties
+++ b/src/main/resources/i18n/sone.en.properties
@@ -107,3 +107,6 @@ Page.ViewPost.Button.PostReply=Post Reply!
 Page.FollowSone.Title=Follow Sone - Sone
 
 Page.Logout.Title=Logout - Sone
+
+View.Post.DeleteLink=Delete Post
+View.Post.SendReply=Post Reply!
diff --git a/src/main/resources/templates/include/viewPost.html b/src/main/resources/templates/include/viewPost.html
new file mode 100644
index 0000000..c6ea6a2
--- /dev/null
+++ b/src/main/resources/templates/include/viewPost.html
@@ -0,0 +1,21 @@
+<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"><a href="viewPost.html?post=<% post.id>"><% post.time|date format="MMM d, yyyy, HH:mm:ss"></a></div>
+	<%if post.sone.isCurrent><div class="delete"><a href="deletePost.html?post="><%= View.Post.DeleteLink|l10n|html></a></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"><%= View.Post.SendReply|l10n|html></button>
+	</form>
+</div>
diff --git a/src/main/resources/templates/index.html b/src/main/resources/templates/index.html
index d148926..3db413d 100644
--- a/src/main/resources/templates/index.html
+++ b/src/main/resources/templates/index.html
@@ -28,26 +28,7 @@
 
 	<div id="posts">
 		<%foreach 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"><a href="viewPost.html?post=<% post.id>"><% post.time|date format="MMM d, yyyy, HH:mm:ss"></a></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.Index.PostList.Text.NoPostYet|l10n|html></div>
 		<%/foreach>
diff --git a/src/main/resources/templates/viewPost.html b/src/main/resources/templates/viewPost.html
index 237bfce..0209b20 100644
--- a/src/main/resources/templates/viewPost.html
+++ b/src/main/resources/templates/viewPost.html
@@ -2,25 +2,6 @@
 
 	<h1><%= Page.ViewPost.Page.Title|l10n|insert needle="{sone}" key=post.sone.niceName|html></h1>
 
-	<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"><%= Page.ViewPost.Button.PostReply|l10n|html></button>
-		</form>
-	</div>
+	<%include include/viewPost.html>
 
 </div>
-- 
2.7.4