Merge branch 'release-0.9.7'

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

diff --git a/src/main/resources/templates/include/viewReply.html b/src/main/resources/templates/include/viewReply.html
index 1ef8f13..3a5e59a 100644 (file)
--- a/src/main/resources/templates/include/viewReply.html
+++ b/src/main/resources/templates/include/viewReply.html
@@ -17,12 +17,24 @@
                        <% reply.text|html|store key==originalText text==true>
                        <% reply.text|parse sone=reply.sone|store key==parsedText>
                        <% parsedText|render|store key==renderedText text==true>
-                       <% parsedText|shorten length=core.preferences.charactersPerPost cut-off-length=core.preferences.postCutOffLength|render|store key==shortText text==true>
+                       <% parsedText|shorten length=preferences.charactersPerPost cut-off-length=preferences.postCutOffLength|render|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=renderedText> hidden<%/if>"><% renderedText></div>
                        <div class="reply-text short-text<%if raw> hidden<%/if><%if shortText|match key=renderedText> hidden<%/if>"><% shortText></div>
                        <%if !shortText|match value=renderedText><%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=renderedText><%if !raw><a class="shrink-reply-text hidden"><%= View.Post.ShowLess|l10n|html></a><%/if><%/if>
+                       <% parsedText|linked-elements sone=reply.sone|store key==linkedElements>
+                       <% foreach linkedElements linkedElement>
+                               <%if !linkedElement.failed>
+                                       <% first>
+                                               <div class="linked-elements">
+                                       <%/first>
+                                       <% linkedElement|render-linked-element>
+                                       <% last>
+                                               </div>
+                                       <%/last>
+                               <%/if>
+                       <%/foreach>
                </div>
                <div class="reply-status-line status-line">
                        <div class="time"><% reply.time|date format=="MMM d, yyyy, HH:mm:ss"></div>