From: David ‘Bombe’ Roden <bombe@pterodactylus.net>
Date: Tue, 29 Mar 2011 17:37:27 +0000 (+0200)
Subject: Merge branch 'new-web-of-trust' into next
X-Git-Tag: 0.5.2^2~1
X-Git-Url: https://git.pterodactylus.net/?p=Sone.git;a=commitdiff_plain;h=c3745c94d79e6fba53c95003287f539b79b2e749;hp=-c

Merge branch 'new-web-of-trust' into next
---

c3745c94d79e6fba53c95003287f539b79b2e749
diff --combined src/main/resources/templates/include/viewPost.html
index 3023566,30ffe25..676fa6a
--- a/src/main/resources/templates/include/viewPost.html
+++ b/src/main/resources/templates/include/viewPost.html
@@@ -3,7 -3,7 +3,7 @@@
  	<div class="post-time hidden"><% post.time|html></div>
  	<div class="post-author hidden"><% post.sone.id|html></div>
  	<div class="avatar">
- 		<img src="/WoT/GetIdenticon?identity=<% post.sone.id|html>&amp;width=48&height=48" width="48" height="48" alt="Avatar Image" />
+ 		<img src="/WebOfTrust/GetIdenticon?identity=<% post.sone.id|html>&amp;width=48&height=48" width="48" height="48" alt="Avatar Image" />
  	</div>
  	<div class="inner-part">
  		<div>
@@@ -16,8 -16,7 +16,8 @@@
  					<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|parse sone=post.sone></div>
 +			<div class="post-text raw-text<%if !raw> hidden<%/if>"><% post.text|html></div>
 +			<div class="post-text text<%if raw> hidden<%/if>"><% post.text|parse sone=post.sone></div>
  		</div>
  		<div class="post-status-line status-line">
  			<div class="bookmarks">
@@@ -36,8 -35,6 +36,8 @@@
  			</div>
  			<span class='separator'>·</span>
  			<div class="time"><a href="viewPost.html?post=<% post.id|html>"><% post.time|date format="MMM d, yyyy, HH:mm:ss"></a></div>
 +			<span class='separator'>·</span>
 +			<div class="show-source"><a href="viewPost.html?post=<% post.id|html>&amp;raw=<%if raw>false<%else>true<%/if>"><%= View.Post.ShowSource|l10n|html></a></div>
  			<div class="likes<%if post.likes.size|match value=0> hidden<%/if>">
  				<span class='separator'>·</span>
  				<span title="<% post.likes.soneNames|html>">↑<span class="like-count"><% post.likes.size></span></span>
diff --combined src/main/resources/templates/include/viewReply.html
index cdb837c,2b507ff..e179e01
--- a/src/main/resources/templates/include/viewReply.html
+++ b/src/main/resources/templates/include/viewReply.html
@@@ -3,18 -3,15 +3,18 @@@
  	<div class="reply-time hidden"><% reply.time|html></div>
  	<div class="reply-author hidden"><% reply.sone.id|html></div>
  	<div class="avatar">
- 		<img src="/WoT/GetIdenticon?identity=<% reply.sone.id|html>&amp;width=36&height=36" width="36" height="36" alt="Avatar Image" />
+ 		<img src="/WebOfTrust/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|parse sone=reply.sone></div>
 +			<div class="reply-text raw-text<%if !raw> hidden<%/if>"><% reply.text|html></div>
 +			<div class="reply-text text<%if raw> hidden<%/if>"><% reply.text|parse sone=reply.sone></div>
  		</div>
  		<div class="reply-status-line status-line">
  			<div class="time"><% reply.time|date format="MMM d, yyyy, HH:mm:ss"></div>
 +			<span class='separator'>·</span>
 +			<div class="show-reply-source"><a href="viewPost.html?post=<% post.id|html>&amp;raw=<%if raw>false<%else>true<%/if>"><%= View.Post.ShowSource|l10n|html></a></div>
  			<div class="likes<%if reply.likes.size|match value=0> hidden<%/if>">
  				<span class='separator'>·</span>
  				<span title="<% reply.likes.soneNames|html>">↑<span class="like-count"><% reply.likes.size></span></span>