From: David ‘Bombe’ Roden <bombe@pterodactylus.net>
Date: Sat, 27 Nov 2010 15:22:51 +0000 (+0100)
Subject: Merge branch 'message-recipient'
X-Git-Tag: 0.3.2-RC1~15
X-Git-Url: https://git.pterodactylus.net/?p=Sone.git;a=commitdiff_plain;h=6db033602e7c17efc40a4a19efe705d67832fc1a

Merge branch 'message-recipient'

Conflicts:
	src/main/resources/templates/include/viewPost.html
---

6db033602e7c17efc40a4a19efe705d67832fc1a
diff --cc src/main/resources/templates/include/viewPost.html
index 5335227,ffc7608..3d593bc
--- a/src/main/resources/templates/include/viewPost.html
+++ b/src/main/resources/templates/include/viewPost.html
@@@ -7,7 -7,15 +7,15 @@@
  	<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>
+ 			<%ifnull !post.recipient>
+ 				<span class="recipient-to">→</span>
+ 				<%ifnull post.recipient.identity>
+ 					<div class="recipient profile-link"><a href="viewSone.html?sone=<% post.recipient.id|html>"><% View.Post.UnknownAuthor|l10n|html></a></div>
+ 				<%else>
+ 					<div class="recipient profile-link"><a href="viewSone.html?sone=<% post.recipient.id|html>"><% post.recipient.niceName|html></a></div>
+ 				<%/if>
+ 			<%/if>
 -			<div class="text"><% post.text|html></div>
 +			<div class="text"><% post.text></div>
  		</div>
  		<div class="post-status-line 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>