X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fresources%2Ftemplates%2Finclude%2FviewPost.html;h=40fa89117f80937d73582142682cdf126137dab7;hb=e7670e864e9e687f9e536f367b8c7da781f0c754;hp=84c59d34785ca5028c19bd7e0fe495a5886bff1f;hpb=ee8888053a6990fd02ee12a582c616f302dc4084;p=Sone.git

diff --git a/src/main/resources/templates/include/viewPost.html b/src/main/resources/templates/include/viewPost.html
index 84c59d3..40fa891 100644
--- a/src/main/resources/templates/include/viewPost.html
+++ b/src/main/resources/templates/include/viewPost.html
@@ -1,21 +1,16 @@
-<a name="post-<% post.id|html>"></a>
 <div id="<% post.id|html>" class="post<%if loop.last> last<%/if><%if post.new> new<%/if>">
+	<a name="post-<% post.id|html>"></a>
 	<div class="post-time hidden"><% post.time|html></div>
+	<div class="post-author hidden"><% post.sone.id|html></div>
 	<div class="avatar">
-		<img src="/WoT/GetIdenticon?identity=<% post.sone.id|html>&amp;width=48&height=48" width="48" height="48" alt="Avatar Image" />
-		<%if !post.sone.current>
-			<br />
-			<div class="trust">
-				<%if post.sone.trust.assigned>
-					<span class="explicit"><% post.sone.trust.explicit></span>
-				<%else>
-					<span class="implicit"><% post.sone.trust.implicit></span>
-				<%/if>
-			</div>
+		<%if post.loaded>
+			<img src="/WebOfTrust/GetIdenticon?identity=<% post.sone.id|html>&amp;width=48&height=48" width="48" height="48" alt="Avatar Image" />
+		<%else>
+			<img src="images/sone-avatar.png" width="48" height="48" alt="Avatar Image" />
 		<%/if>
 	</div>
 	<div class="inner-part">
-		<div>
+		<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>
 				<span class="recipient-to">→</span>
@@ -25,12 +20,42 @@
 					<div class="recipient profile-link"><a href="viewSone.html?sone=<% post.recipient.id|html>"><% post.recipient.niceName|html></a></div>
 				<%/if>
 			<%/if>
-			<div class="text"><% post.text></div>
+			<% post.text|html|store key=originalText text=true>
+			<% post.text|parse sone=post.sone|store key=parsedText text=true>
+			<div class="post-text raw-text<%if !raw> hidden<%/if>"><% originalText></div>
+			<div class="post-text text<%if raw> hidden<%/if>"><% parsedText></div>
 		</div>
-		<div class="post-status-line status-line">
+		<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">
+					<input type="hidden" name="formPassword" value="<% formPassword|html>" />
+					<input type="hidden" name="returnPage" value="<% request.uri|html>" />
+					<input type="hidden" name="post" value="<% post.id|html>" />
+					<button type="submit" title="<%= View.Post.Bookmarks.PostIsBookmarked|l10n|html>">★</button>
+				</form>
+				<form class="bookmark<%if post.bookmarked> hidden<%/if>" action="bookmark.html" method="post">
+					<input type="hidden" name="formPassword" value="<% formPassword|html>" />
+					<input type="hidden" name="returnPage" value="<% request.uri|html>" />
+					<input type="hidden" name="post" value="<% post.id|html>" />
+					<button type="submit" title="<%= View.Post.Bookmarks.PostIsNotBookmarked|l10n|html>">☆</button>
+				</form>
+			</div>
+			<span class='separator'>·</span>
+			<div class="permalink"><a href="post://<%post.id|html>">[<%= View.Post.Permalink|l10n|html>]</a></div>
+			<span class='separator'>·</span>
+			<div class="permalink"><a href="sone://<%post.sone.id|html>">[<%= View.Post.PermalinkAuthor|l10n|html>]</a></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="likes<%if post.likes.size|match value=0> hidden<%/if>"><span title="<% post.likes.soneNames|html>">↑<span class="like-count"><% post.likes.size></span></span></div>
+			<%if ! originalText|match key=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>">
+				<span class='separator'>·</span>
+				<span title="<% post.likes.soneNames|html>">↑<span class="like-count"><% post.likes.size></span></span>
+			</div>
 			<%ifnull ! currentSone>
+				<span class='separator'>·</span>
 				<form class="like like-post<%if post.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>" />
@@ -45,8 +70,30 @@
 					<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>
+					<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 post.sone.current>
+			<%if post.sone.local>
+				<span class='separator'>·</span>
 				<form class="delete delete-post" action="deletePost.html" method="post">
 					<input type="hidden" name="formPassword" value="<% formPassword|html>" />
 					<input type="hidden" name="returnPage" value="<% request.uri|html>" />
@@ -55,6 +102,9 @@
 				</form>
 			<%/if>
 		</div>
+		<div<%if post.loaded> class="hidden"<%/if>>
+			<%= View.Post.NotDownloaded|l10n|html>
+		</div>
 		<div class="replies">
 			<%foreach post.replies reply>
 				<%include include/viewReply.html>
@@ -65,6 +115,14 @@
 						<input type="hidden" name="formPassword" value="<% formPassword|html>" />
 						<input type="hidden" name="returnPage" value="<% request.uri|html>" />
 						<input type="hidden" name="post" value="<% post.id|html>" />
+						<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>
+								<%/foreach>
+							</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="" />
 						<button type="submit"><%= View.Post.SendReply|l10n|html></button>
 					</form>