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

diff --git a/src/main/resources/templates/include/viewPost.html b/src/main/resources/templates/include/viewPost.html
index ac149f8..edcabce 100644
--- a/src/main/resources/templates/include/viewPost.html
+++ b/src/main/resources/templates/include/viewPost.html
@@ -29,23 +29,23 @@
 			<% post.text|html|store key==originalText text==true>
 			<% post.text|parse sone=post.sone|store key==parsedText>
 			<% parsedText|render|store key==renderedText text==true>
-			<% parsedText|shorten length=core.preferences.charactersPerPost cut-off-length=core.preferences.postCutOffLength|render|store key==shortText 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=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-images|store key==linkedImages>
-			<% foreach linkedImages linkedImage>
-				<% first>
-					<div class="linked-images">
-				<%/first>
-				<a href="/<% linkedImage.link|html>">
-					<span class="linked-image" title="<% linkedImage.link|html>" style="background-image: url('/<% linkedImage.link|html>')"/>
-				</a>
-				<% last>
-					</div>
-				<%/last>
+			<% 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>">
@@ -93,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">
@@ -143,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>