2 files changed, 62 insertions, 0 deletions
diff --git a/juick-www/src/main/resources/templates/views/macros/tags.html b/juick-www/src/main/resources/templates/views/macros/tags.html
new file mode 100644
index 00000000..09278ffe
--- /dev/null
+++ b/juick-www/src/main/resources/templates/views/macros/tags.html
@@ -0,0 +1,5 @@
+{% macro tags(uname="", tagsList) %}
+{% for tag in tagsList %}
+<a href="/{{ uname }}/?tag={{ tag | urlencode }}">{{ tag | raw }}</a>
+{% endfor %}
+{% endmacro %}
+\ No newline at end of file
diff --git a/juick-www/src/main/resources/templates/views/macros/tree.html b/juick-www/src/main/resources/templates/views/macros/tree.html
new file mode 100644
index 00000000..71ffd74b
--- /dev/null
+++ b/juick-www/src/main/resources/templates/views/macros/tree.html
@@ -0,0 +1,57 @@
+{% macro tree(replies, visitor, level, margin, hidden) %}
+{% for msg in replies %}
+    {% if msg.replyto == level %}
+    <li id="{{ msg.rid }}" style="margin-left: {{ margin }}px;{% if hidden %}display: none;{% endif %}" class="msg">
+        <div class="msg-cont">
+            <div class="msg-header">
+{% if not msg.user.banned %}
+                <a href="/{{ msg.user.name }}/">{{ msg.user.name }}</a>
+                <div class="msg-avatar"><a href="/{{ msg.user.name }}/">
+                    <img src="//i.juick.com/a/{{ msg.user.uid }}.png" alt="{{ msg.user.name }}"/></a>
+                </div>
+{% else %}
+                [удалено]:
+                <div class="msg-avatar">
+                    <img src="//i.juick.com/av-96.png"/>
+                </div>
+{% endif %}
+                <div class="msg-ts">
+                    <a href="/{{ msg.mid }}#{{ msg.rid }}">
+                        <time datetime="{{ msg.timestamp | timestamp | date('yyyy-MM-dd HH:mm:ss') }}Z"
+                              title="{{ msg.timestamp | timestamp | date('yyyy-MM-dd HH:mm:ss') }} GMT">
+                            {{ msg.timestamp | prettyTime }}
+                        </time>
+                    </a>
+                </div>
+            </div>
+            <div class="msg-txt">{{ msg | formatMessage }}</div>
+            {% if msg.AttachmentType is not empty %}
+            <div class="msg-media">
+                <a href="//i.juick.com/p/{{ msg.mid }}-{{ msg.rid }}.{{ msg.AttachmentType }}" data-fname="{{ msg.mid }}-{{ msg.rid }}.{{ msg.AttachmentType }}">
+                    <img src="//i.juick.com/photos-512/{{ msg.mid }}-{{ msg.rid }}.{{ msg.AttachmentType }}" alt=""/>
+                </a>
+            </div>
+            {% endif %}
+            <div class="msg-links">/{{ msg.rid }}
+{% if msg.replyto > 0 %}
+                 {{ i18n("messages","reply.inReplyTo") }} <a href="#{{ msg.replyto }}">/{{ msg.replyto }}</a>
+{% endif %}
+{% if msg.VisitorCanComment %}
+            &middot; <a href="/post?body=%23{{ msg.mid }}/{{ msg.rid }}%20" class="a-thread-comment">{{ i18n("messages","reply.reply") }}</a></div>
+            <div class="msg-comment-target msg-comment-hidden"></div>
+{% elseif visitor.uid == 0 %}
+            &middot; <a href="#" class="a-login">{{ i18n("messages","reply.reply") }}</a></div>
+{% endif %}
+
+{% if level == 0 and msg.childsCount > 1 and replies.size() > 10 %}
+            <div class="msg-comments"><a href="#">{{ msg | formatReplies }}</a></div>
+{% endif %}
+    </li>
+    {% if (level == 0 and msg.childsCount > 1 and replies.size() > 10) %}
+      {{ tree(msg.childs, visitor, msg.rid, margin + 20, true) }}
+    {% elseif (msg.childsCount > 0) %}
+      {{ tree(msg.childs, visitor, msg.rid, margin + 20, hidden) }}
+    {% endif %}
+    {% endif %}
+{% endfor %}
+{% endmacro %}
+\ No newline at end of file