X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fresources%2Ftemplates%2Finclude%2FviewReply.html;h=765b03f0310b8459e7d080675d8c95c84975e27b;hb=9d650c4e96208a94f448a31aa481ec4f0965b4e9;hp=ec628875c3fabc64b261a7c80612ad3c97566b7e;hpb=e699a806f97bd3e8a5e69542306ef30b5cca0ccb;p=Sone.git

diff --git a/src/main/resources/templates/include/viewReply.html b/src/main/resources/templates/include/viewReply.html
index ec62887..765b03f 100644
--- a/src/main/resources/templates/include/viewReply.html
+++ b/src/main/resources/templates/include/viewReply.html
@@ -5,29 +5,42 @@
 	<div class="reply-author-local hidden"><% reply.sone.local></div>
 	<%include include/soneMenu.html class=="sone-reply-menu" sone=reply.sone>
 	<div class="avatar reply-avatar">
-		<img src="/WebOfTrust/GetIdenticon?identity=<% reply.sone.id|html>&amp;width=36&height=36" width="36" height="36" alt="Avatar Image" />
+		<%ifnull !reply.sone.profile.avatar>
+			<% reply.sone.profile.avatar|build-id sone=reply.sone|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=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|store key=shortText text=true>
+			<% reply.text|html|store key==originalText text==true>
+			<% reply.text|parse sone=reply.sone|store key==parts>
+			<% parts|render|store key==parsedText text==true>
+			<% parts|render length=core.preferences.charactersPerPost cut-off-length=core.preferences.postCutOffLength|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"><%= View.Post.ShowMore|l10n|html></a><%/if><%/if>
-			<%if !shortText|match key=parsedText><%if !raw><a class="shrink-reply-text hidden"><%= View.Post.ShowLess|l10n|html></a><%/if><%/if>
+			<%if !shortText|match value=parsedText><%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=parsedText><%if !raw><a class="shrink-reply-text hidden"><%= View.Post.ShowLess|l10n|html></a><%/if><%/if>
 		</div>
+		<%foreach parts part>
+			<%if part.class.simpleName|match value==AlbumPart><!-- ← this is so ugly. -->
+				<% part.album.images.random|store key==image>
+				<div class="album images" style="zoom: 0.80;">
+					<%include include/viewAlbum.html album=part.album hideMoveButtons==true>
+				</div>
+			<%/if>
+		<%/foreach>
 		<div class="reply-status-line status-line">
-			<div class="time"><% reply.time|date format="MMM d, yyyy, HH:mm:ss"></div>
+			<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 key=parsedText>
+			<%if ! originalText|match value=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>">
+			<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>
@@ -48,25 +61,27 @@
 					<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>
+					<%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>
+					<%/if>
 				<%/if>
 			<%/if>
 			<%if reply.sone.local>