X-Git-Url: https://git.pterodactylus.net/?p=Sone.git;a=blobdiff_plain;f=src%2Fmain%2Fresources%2Ftemplates%2Finclude%2FviewPost.html;h=edcabcebb08c32a287a5eb5f7091b624ad2046f3;hp=7120d0693b757f802c9b04999ee694117c3240cd;hb=faf66247a34f64946990a985d2ea3003465969cb;hpb=efb1006429e52a74f41fb6e1d7736736156bb13a

diff --git a/src/main/resources/templates/include/viewPost.html b/src/main/resources/templates/include/viewPost.html
index 7120d06..edcabce 100644
--- a/src/main/resources/templates/include/viewPost.html
+++ b/src/main/resources/templates/include/viewPost.html
@@ -9,7 +9,7 @@
 			<%ifnull !post.sone.profile.avatar>
 				<%post.sone.profile.avatar|image-link max-width==48 max-height==48 mode==enlarge title=="Avatar Image">
 			<%else>
-				<img src="/WebOfTrust/GetIdenticon?identity=<% post.sone.id|html>&amp;width=48&amp;height=48" width="48" height="48" alt="Avatar Image" />
+				<img src="/WebOfTrust/GetIdenticon?identity=<% post.sone.id|html>&amp;width=96&amp;height=96" width="48" height="48" alt="Avatar Image" />
 			<%/if>
 		<%else>
 			<img src="images/sone-avatar.png" width="48" height="48" alt="Avatar Image" />
@@ -18,22 +18,35 @@
 	<div class="inner-part">
 		<div<%if !post.loaded> class="hidden"<%/if>>
 			<div class="author profile-link"><a href="viewSone.html?sone=<% post.sone.id|html>"><% post.sone.niceName|html></a></div>
-			<%ifnull !post.recipient>
+			<%if post.recipientId.present>
 				<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>
+				<%if !post.recipient.present>
+					<div class="recipient profile-link"><a href="viewSone.html?sone=<% post.recipientId.get|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>
+					<div class="recipient profile-link"><a href="viewSone.html?sone=<% post.recipientId.get|html>"><% post.recipient.get.niceName|html></a></div>
 				<%/if>
 			<%/if>
 			<% post.text|html|store key==originalText text==true>
-			<% post.text|parse sone=post.sone|store key==parsedText text==true>
-			<% post.text|parse sone=post.sone length=core.preferences.charactersPerPost cut-off-length=core.preferences.postCutOffLength|store key==shortText text==true>
+			<% post.text|parse sone=post.sone|store key==parsedText>
+			<% parsedText|render|store key==renderedText text==true>
+			<% parsedText|shorten length=preferences.charactersPerPost cut-off-length=preferences.postCutOffLength|render|store key==shortText text==true>
 			<div class="post-text raw-text<%if !raw> hidden<%/if>"><% originalText></div>
-			<div class="post-text text<%if raw> hidden<%/if><%if !shortText|match key=parsedText> hidden<%/if>"><% parsedText></div>
-			<div class="post-text short-text<%if raw> hidden<%/if><%if shortText|match key=parsedText> hidden<%/if>"><% shortText></div>
-			<%if !shortText|match value=parsedText><%if !raw><a class="expand-post-text" href="viewPost.html?post=<% post.id|html>&amp;raw=true"><%= View.Post.ShowMore|l10n|html></a><%/if><%/if>
-			<%if !shortText|match value=parsedText><%if !raw><a class="shrink-post-text hidden"><%= View.Post.ShowLess|l10n|html></a><%/if><%/if>
+			<div class="post-text text<%if raw> hidden<%/if><%if !shortText|match key=renderedText> hidden<%/if>"><% renderedText></div>
+			<div class="post-text short-text<%if raw> hidden<%/if><%if shortText|match key=renderedText> hidden<%/if>"><% shortText></div>
+			<%if !shortText|match value=renderedText><%if !raw><a class="expand-post-text" href="viewPost.html?post=<% post.id|html>&amp;raw=true"><%= View.Post.ShowMore|l10n|html></a><%/if><%/if>
+			<%if !shortText|match value=renderedText><%if !raw><a class="shrink-post-text hidden"><%= View.Post.ShowLess|l10n|html></a><%/if><%/if>
+			<% parsedText|linked-elements sone=post.sone|store key==linkedElements>
+			<% foreach linkedElements linkedElement>
+				<%if !linkedElement.failed>
+					<% first>
+						<div class="linked-elements">
+					<%/first>
+					<% linkedElement|render-linked-element>
+					<% last>
+						</div>
+					<%/last>
+				<%/if>
+			<%/foreach>
 		</div>
 		<div class="post-status-line status-line<%if !post.loaded> hidden<%/if>">
 			<div class="bookmarks">
@@ -56,7 +69,7 @@
 			<div class="permalink permalink-post"><a href="post://<%post.id|html>">[<%= View.Post.Permalink|l10n|html>]</a></div>
 			<span class='separator'>·</span>
 			<div class="permalink permalink-author"><a href="sone://<%post.sone.id|html>">[<%= View.Post.PermalinkAuthor|l10n|html>]</a></div>
-			<%if ! originalText|match value=parsedText>
+			<%if ! originalText|match value=renderedText>
 				<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>
 			<%/if>
@@ -80,30 +93,9 @@
 					<input type="hidden" name="post" value="<% post.id|html>" />
 					<button type="submit" value="1"><%= View.Post.UnlikeLink|l10n|html></button>
 				</form>
-				<%if !post.sone.current>
-					<%ifnull !post.sone.trust>
-						<span class='separator'>·</span>
-						<form class="trust post-trust<%if post.sone.trust.assigned> hidden<%/if>" action="trust.html" method="post">
-							<input type="hidden" name="formPassword" value="<% formPassword|html>" />
-							<input type="hidden" name="returnPage" value="<% request.uri|html>" />
-							<input type="hidden" name="sone" value="<% post.sone.id|html>" />
-							<button type="submit" title="<%= View.Trust.Tooltip.Trust|l10n|html>">✓</button>
-						</form>
-						<form class="distrust post-distrust<%if post.sone.trust.assigned> hidden<%/if>" action="distrust.html" method="post">
-							<input type="hidden" name="formPassword" value="<% formPassword|html>" />
-							<input type="hidden" name="returnPage" value="<% request.uri|html>" />
-							<input type="hidden" name="sone" value="<% post.sone.id|html>" />
-							<button type="submit" title="<%= View.Trust.Tooltip.Distrust|l10n|html>">✗</button>
-						</form>
-						<form class="untrust post-untrust<%if !post.sone.trust.assigned> hidden<%/if>" action="untrust.html" method="post">
-							<input type="hidden" name="formPassword" value="<% formPassword|html>" />
-							<input type="hidden" name="returnPage" value="<% request.uri|html>" />
-							<input type="hidden" name="sone" value="<% post.sone.id|html>" />
-							<button type="submit" title="<%= View.Trust.Tooltip.Untrust|l10n|html>">↶</button>
-						</form>
-					<%/if>
-				<%/if>
 			<%/if>
+			<span class='separator'>·</span>
+			<a class="wot-link" href="/WebOfTrust/ShowIdentity?id=<% post.sone.id|html>"><%= View.Post.WebOfTrustLink|l10n|html></a>
 			<%if post.sone.local>
 				<span class='separator'>·</span>
 				<form class="delete delete-post" action="deletePost.html" method="post">
@@ -130,7 +122,7 @@
 						<div class="sender">
 							<select name="sender" title="<%= View.UpdateStatus.Text.ChooseSenderIdentity|l10n|html>">
 								<%foreach localSones localSone|sort>
-									<option value="<% localSone.id|html>"<%if localSone.current> selected="selected"<%/if>><% localSone.niceName|html></option>
+									<option value="<% localSone.id|html>"<%if localSone|match value=post.replySone> selected="selected"<%/if>><% localSone.niceName|html></option>
 								<%/foreach>
 							</select>
 						</div>