Only show trust controls if the trust updater has received trust values.

[Sone.git] / src / main / resources / templates / include / viewPost.html

diff --git a/src/main/resources/templates/include/viewPost.html b/src/main/resources/templates/include/viewPost.html
index 04e467c..706ef32 100644 (file)
--- a/src/main/resources/templates/include/viewPost.html
+++ b/src/main/resources/templates/include/viewPost.html
@@ -1,11 +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="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.profile.avatar>
+                               <%post.sone.profile.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&amp;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>
@@ -21,13 +26,14 @@
                                        <div class="recipient profile-link"><a href="viewSone.html?sone=<% post.recipient.id|html>"><% post.recipient.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=200|store key=shortText text=true>
+                       <% 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><%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">…</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>
                <div class="post-status-line status-line<%if !post.loaded> hidden<%/if>">
                        <div class="bookmarks">
@@ -45,16 +51,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>
@@ -75,6 +81,7 @@
                                        <button type="submit" value="1"><%= View.Post.UnlikeLink|l10n|html></button>
                                </form>
                                <%if !post.sone.current>
+                                       <%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>" />
@@ -94,6 +101,7 @@
                                                <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>
@@ -127,7 +135,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>