X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fresources%2Ftemplates%2Finclude%2FviewReply.html;h=f8c74520e703a02512cd1f44aee1c41e94d9eeda;hb=47161094684b506f007ae3a4b1911f1186616c51;hp=398aed5ed028a333d1f765697e62978126cd86dd;hpb=da46b62663d50056ddfc5b39b5e8e62423f6c415;p=Sone.git

diff --git a/src/main/resources/templates/include/viewReply.html b/src/main/resources/templates/include/viewReply.html
index 398aed5..f8c7452 100644
--- a/src/main/resources/templates/include/viewReply.html
+++ b/src/main/resources/templates/include/viewReply.html
@@ -1,19 +1,36 @@
-<a name="reply-<% reply.id|html>"></a>
 <div id="<% reply.id|html>" class="reply<%if reply.new> new<%/if>">
+	<a name="reply-<% reply.id|html>"></a>
 	<div class="reply-time hidden"><% reply.time|html></div>
+	<div class="reply-author hidden"><% reply.sone.id|html></div>
+	<div class="reply-author-local hidden"><% reply.sone.local></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></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=200|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 key=parsedText><%if !raw><a class="expand-reply-text" href="viewPost.html?post=<% reply.post.id|html>&amp;raw=true">…</a><%/if><%/if>
 		</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="likes<%if reply.likes.size|match value=0> hidden<%/if>"><span title="<% reply.likes.soneNames|html>">↑<span class="like-count"><% reply.likes.size></span></span></div>
+			<div class="permalink permalink-author"><a href="sone://<%reply.sone.id|html>">[<%= View.Post.PermalinkAuthor|l10n|html>]</a></div>
+			<%if ! originalText|match key=parsedText>
+				<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>
+			<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>
+			</div>
 			<%ifnull ! currentSone>
+				<span class='separator'>·</span>
 				<form class="like like-reply<%if reply.liked> hidden<%/if>" action="like.html" method="post">
 					<input type="hidden" name="formPassword" value="<% formPassword|html>" />
 					<input type="hidden" name="returnPage" value="<% request.uri|html>" />
@@ -28,29 +45,30 @@
 					<input type="hidden" name="reply" value="<% reply.id|html>" />
 					<button type="submit" value="1"><%= View.Post.UnlikeLink|l10n|html></button>
 				</form>
+				<%if !reply.sone.current>
+					<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 !reply.sone.current>
+			<%if reply.sone.local>
 				<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="identity" value="<% reply.sone.id|html>" />
-					<button type="submit" title="<%= View.Trust.Tooltip.Trust|l10n|html>">✓</button>
-				</form>
-				<form class="distrust reply-distrust" 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="identity" 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="identity" value="<% reply.sone.id|html>" />
-					<button type="submit" title="<%= View.Trust.Tooltip.Untrust|l10n|html>">↶</button>
-				</form>
-			<%/if>
-			<%if reply.sone.current>
 				<form class="delete delete-reply" action="deleteReply.html" method="post">
 					<input type="hidden" name="formPassword" value="<% formPassword|html>" />
 					<input type="hidden" name="returnPage" value="<% request.uri|html>" />