X-Git-Url: https://git.pterodactylus.net/?p=Sone.git;a=blobdiff_plain;f=src%2Fmain%2Fresources%2Ftemplates%2Finclude%2FviewPost.html;h=fd54e5d56c94859dbc50e98a0338506bcfa3b70f;hp=d0005c9b5733aac095e53830dbf6496a29d5650c;hb=1b25052b79d18b8b7af4eae95358ae0635da46a1;hpb=61ee54ddb663a3faf4a9c125a07d89dc3940e1f5

diff --git a/src/main/resources/templates/include/viewPost.html b/src/main/resources/templates/include/viewPost.html
index d0005c9..fd54e5d 100644
--- a/src/main/resources/templates/include/viewPost.html
+++ b/src/main/resources/templates/include/viewPost.html
@@ -1,21 +1,16 @@
-<div id="<% post.id|html>" class="post<%if loop.last> last<%/if><%if post.new> new<%/if>">
+<div id="post-<% post.id|html>" class="post<%if loop.last> last<%/if><%if !post.sone.local><%if post.new> new<%/if><%/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="post-author-local hidden"><% post.sone.local></div>
-	<div class="sone-post-menu">
-		<div class="sone-id hidden"><%post.sone.id|html></div>
-		<img class="avatar" src="/WebOfTrust/GetIdenticon?identity=<% post.sone.id|html>&amp;width=64&height=64" width="64" height="64" alt="Avatar Image" />
-		<div class="inner-menu">
-			<div>
-				<a class="author" href="viewSone.html?sone=<% post.sone.id|html>"><% post.sone.niceName|html></a>
-				<span class="author-wot-link">(<a href="/WebOfTrust/ShowIdentity?id=<% post.sone.id|html>"><% =View.Post.WebOfTrustLink|l10n|html></a>)</span>
-			</div>
-		</div>
-	</div>
-	<div class="avatar">
+	<%include include/soneMenu.html class=="sone-post-menu" sone=post.sone>
+	<div class="avatar post-avatar" >
 		<%if post.loaded>
-			<img src="/WebOfTrust/GetIdenticon?identity=<% post.sone.id|html>&amp;width=48&height=48" width="48" height="48" alt="Avatar Image" />
+			<%ifnull !post.sone.avatar>
+				<%post.sone.avatar|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" />
+			<%/if>
 		<%else>
 			<img src="images/sone-avatar.png" width="48" height="48" alt="Avatar Image" />
 		<%/if>
@@ -33,8 +28,12 @@
 			<%/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>
 			<div class="post-text raw-text<%if !raw> hidden<%/if>"><% originalText></div>
-			<div class="post-text text<%if raw> hidden<%/if>"><% parsedText></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>
 		</div>
 		<div class="post-status-line status-line<%if !post.loaded> hidden<%/if>">
 			<div class="bookmarks">