From: David ‘Bombe’ Roden <bombe@pterodactylus.net>
Date: Fri, 26 Nov 2010 22:02:14 +0000 (+0100)
Subject: Merge commit '0.3.1-RC3' into message-recipient
X-Git-Tag: 0.3.2-RC1~15^2~2
X-Git-Url: https://git.pterodactylus.net/?a=commitdiff_plain;h=a57e3b33c5837a40aa08c11fb92f600d928be1ab;p=Sone.git

Merge commit '0.3.1-RC3' into message-recipient
---

a57e3b33c5837a40aa08c11fb92f600d928be1ab
diff --cc src/main/resources/templates/include/viewPost.html
index 4b23b1f,e351fd0..ffc7608
--- a/src/main/resources/templates/include/viewPost.html
+++ b/src/main/resources/templates/include/viewPost.html
@@@ -7,17 -7,9 +7,17 @@@
  	<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>
- 		<div class="status-line">
+ 		<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>
  			<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>