--- a/default/blog/articles.html	Fri Oct 27 18:48:41 2017 +0200
+++ b/default/blog/articles.html	Fri Oct 27 18:50:19 2017 +0200
@@ -1,40 +1,9 @@
 {% if not embedded %}{% extends 'base/base.html' %}{% endif %}
-{% import 'input/comment.html' as comment with context %}
-
-{% macro show_items(items, comments=False) %}
-    {# show items and comments items if present after each item,
-       then post form if allow_commenting is set #}
-    {% for item in items %}
-        {% if not comments %}<div class="main_article">{% endif %}
-            {% include 'blog/item.html' %}
-        {% if not comments %}</div>{% endif %}
-
-        {# we recursively display comments for all comments nodes (usually there's only one) #}
-        {% for comments_items in item.comments_items_list %}
-            <button class="comments_btn" onclick="clicked_mh_fix('{{comments_panel|next_gidx}}');clicked_cls(this)">
-                <span class='show'>{% trans %}show comments{% endtrans %}</span>
-                <span class='hide'>{% trans %}hide comments{% endtrans %}</span>
-                ({{comments_items|count}})
-            </button>
-            <div id="{{comments_panel|cur_gidx}}" class="comments_panel">
-                {% if allow_commenting %}
-                    <div class="comment_post">
-                        {{ comment.comment(service=comments_items.service, node=comments_items.node) }}
-                    </div>
-                {% endif %}
-
-                <div class="comments">
-                    {{show_items(comments_items, comments=True)}}
-                </div>
-            </div>
-
-        {% endfor %}
-
-    {% endfor %}
-{% endmacro %}
+{% set dates_format='relative' %}
+{% import 'blog/macros.html' as blog with context %}
 
 {% block body %}
 <div id="blog_items">
-    {{ show_items(items) }}
+    {{ blog.show_items(items) }}
 </div>
 {% endblock body %}