X-Git-Url: https://git.pterodactylus.net/?p=Sone.git;a=blobdiff_plain;f=src%2Fmain%2Fresources%2Ftemplates%2Finclude%2FviewReply.html;h=3a5e59aa64af2193296d8360f391e94c540262c4;hp=c3b50a48256a59a0f6b21adffd5a9a7d7c33b863;hb=ffd92ca2374c0b2218e583d02e0bdd24b8c110ae;hpb=430d58fa4dcf684c65408666c8c2c2824eb2c7e2

diff --git a/src/main/resources/templates/include/viewReply.html b/src/main/resources/templates/include/viewReply.html
index c3b50a4..3a5e59a 100644
--- a/src/main/resources/templates/include/viewReply.html
+++ b/src/main/resources/templates/include/viewReply.html
@@ -8,26 +8,39 @@
 		<%ifnull !reply.sone.profile.avatar>
 			<% reply.sone.profile.avatar|image-link max-width==36 max-height==36 mode==enlarge title=="Avatar Image">
 		<%else>
-			<img src="/WebOfTrust/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=72&height=72" width="36" height="36" alt="Avatar Image" />
 		<%/if>
 	</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>
 			<% reply.text|html|store key==originalText text==true>
-			<% reply.text|parse sone=reply.sone|store key==parsedText text==true>
-			<% reply.text|parse sone=reply.sone length=core.preferences.charactersPerPost cut-off-length=core.preferences.postCutOffLength|store key==shortText text==true>
+			<% reply.text|parse sone=reply.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="reply-text raw-text<%if !raw> hidden<%/if>"><% originalText></div>
-			<div class="reply-text text<%if raw> hidden<%/if><%if !shortText|match key=parsedText> hidden<%/if>"><% parsedText></div>
-			<div class="reply-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-reply-text" href="viewPost.html?post=<% reply.post.id|html>&amp;raw=true"><%= View.Post.ShowMore|l10n|html></a><%/if><%/if>
-			<%if !shortText|match value=parsedText><%if !raw><a class="shrink-reply-text hidden"><%= View.Post.ShowLess|l10n|html></a><%/if><%/if>
+			<div class="reply-text text<%if raw> hidden<%/if><%if !shortText|match key=renderedText> hidden<%/if>"><% renderedText></div>
+			<div class="reply-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-reply-text" href="viewPost.html?post=<% reply.postId|html>&amp;raw=true"><%= View.Post.ShowMore|l10n|html></a><%/if><%/if>
+			<%if !shortText|match value=renderedText><%if !raw><a class="shrink-reply-text hidden"><%= View.Post.ShowLess|l10n|html></a><%/if><%/if>
+			<% parsedText|linked-elements sone=reply.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="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="permalink permalink-author"><a href="sone://<%reply.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-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>
 			<%/if>
@@ -53,25 +66,25 @@
 				</form>
 				<%if !reply.sone.current>
 					<%ifnull !reply.sone.trust>
-					<span class='separator'>·</span>
-					<form class="trust reply-trust<%if reply.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="<% reply.sone.id|html>" />
-						<button type="submit" title="<%= View.Trust.Tooltip.Trust|l10n|html>">✓</button>
-					</form>
-					<form class="distrust reply-distrust<%if reply.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="<% reply.sone.id|html>" />
-						<button type="submit" title="<%= View.Trust.Tooltip.Distrust|l10n|html>">✗</button>
-					</form>
-					<form class="untrust reply-untrust<%if !reply.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="<% reply.sone.id|html>" />
-						<button type="submit" title="<%= View.Trust.Tooltip.Untrust|l10n|html>">↶</button>
-					</form>
+						<span class='separator'>·</span>
+						<form class="trust reply-trust<%if reply.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="<% reply.sone.id|html>" />
+							<button type="submit" title="<%= View.Trust.Tooltip.Trust|l10n|html>">✓</button>
+						</form>
+						<form class="distrust reply-distrust<%if reply.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="<% reply.sone.id|html>" />
+							<button type="submit" title="<%= View.Trust.Tooltip.Distrust|l10n|html>">✗</button>
+						</form>
+						<form class="untrust reply-untrust<%if !reply.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="<% reply.sone.id|html>" />
+							<button type="submit" title="<%= View.Trust.Tooltip.Untrust|l10n|html>">↶</button>
+						</form>
 					<%/if>
 				<%/if>
 			<%/if>