X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fresources%2Ftemplates%2Finclude%2FviewPost.html;h=1b8d1ad2871e153265473ae570b0c3459c33e629;hb=53b2adecec6cd19deff36735031eefdecac75701;hp=396fa6e2c48bb9ac9b8453a867c3810701038dbf;hpb=0206f400c986a38cd91978059e98838c02af0b99;p=Sone.git

diff --git a/src/main/resources/templates/include/viewPost.html b/src/main/resources/templates/include/viewPost.html
index 396fa6e..1b8d1ad 100644
--- a/src/main/resources/templates/include/viewPost.html
+++ b/src/main/resources/templates/include/viewPost.html
@@ -7,9 +7,9 @@
 	<div class="avatar post-avatar" >
 		<%if post.loaded>
 			<%ifnull !post.sone.profile.avatar>
-				<%post.sone.profile.avatar|image-link max-width=48 max-height=48 mode=enlarge title="Avatar Image">
+				<%post.sone.profile.avatar|build-id sone=post.sone|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&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,23 +18,47 @@
 	<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|html|store key==originalText text==true>
+			<% post.text|parse sone=post.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="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 key=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 key=parsedText><%if !raw><a class="shrink-post-text hidden"><%= View.Post.ShowLess|l10n|html></a><%/if><%/if>
+			<%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>
+		<%foreach parts part>
+			<%if part.class.simpleName|match value==AlbumPart>
+				<div class="linked-album">
+					<div class="album-header">
+						<div class="album-title"><% part.album.title|html></div>
+						<div class="album-author"><%= View.Post.LinkedAlbum.SizeAndAuthor|l10n 0=part.album.sone.niceName 1=part.album.images.size|html></div>
+					</div>
+					<%foreach part.album.images image>
+						<div class="linked-image">
+							<div class="image-left">
+								<div class="image">
+									<a href="imageBrowser.html?image=<%image.id|html>"><% image|image-link max-width==160 max-height==90 mode==enlarge title=image.title></a>
+								</div>
+							</div>
+							<div class="about-image">
+								<div class="title"><% image.title|html></div>
+								<div class="description"><% image.description|parse sone=post.sone|render></div>
+							</div>
+						</div>
+					<%/foreach>
+				</div>
+			<%/if>
+		<%/foreach>
 		<div class="post-status-line status-line<%if !post.loaded> hidden<%/if>">
 			<div class="bookmarks">
 				<form class="unbookmark<%if !post.bookmarked> hidden<%/if>" action="unbookmark.html" method="post">
@@ -51,16 +75,16 @@
 				</form>
 			</div>
 			<span class='separator'>·</span>
-			<div class="time"><a href="viewPost.html?post=<% post.id|html>"><% post.time|date format="MMM d, yyyy, HH:mm:ss"></a></div>
+			<div class="time"><a href="viewPost.html?post=<% post.id|html>"><% post.time|date format=="MMM d, yyyy, HH:mm:ss"></a></div>
 			<span class='separator'>·</span>
 			<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 key=parsedText>
+			<%if ! originalText|match value=parsedText>
 				<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>
-			<div class="likes<%if post.likes.size|match value=0> hidden<%/if>">
+			<div class="likes<%if post.likes.size|match value==0> hidden<%/if>">
 				<span class='separator'>·</span>
 				<span title="<% post.likes.soneNames|html>">↑<span class="like-count"><% post.likes.size></span></span>
 			</div>
@@ -81,25 +105,27 @@
 					<button type="submit" value="1"><%= View.Post.UnlikeLink|l10n|html></button>
 				</form>
 				<%if !post.sone.current>
-					<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>
+					<%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>
 			<%if post.sone.local>
@@ -133,7 +159,7 @@
 							</select>
 						</div>
 						<div class="select-sender"><button type="button" title="<%= View.UpdateStatus.Text.ChooseSenderIdentity|l10n|html>">+</button></div>
-						<input type="text" class="reply-input" name="text" value="" />
+						<textarea class="rip-out reply-input" name="text"></textarea>
 						<button type="submit"><%= View.Post.SendReply|l10n|html></button>
 					</form>
 				</div>