Merge pull request #18 from mattip/comment-mix

tweak formatting when there are no static comments

Author: mattip

themes/pypy/templates/index.tmpl

@@ -50,7 +50,7 @@
             </a>
             </p>
             {# modified for static_comments only #}
-            <p class="commentline">{{ static_comments.add_static_comment_count(post.comments, lang) }}</p>
+            {{ static_comments.add_static_comment_count(post.comments, lang) }}
         </div>
     </header>
     {% if index_teasers %}

themes/pypy/templates/post.tmpl

@@ -41,7 +41,7 @@
       {{ helper.html_pager(post) }}
       </nav>
       </aside>
-      {% if post.comments|count >= 1 %}
+      {% if post.comments|length >= 1 %}
         {# modified for static_comments only #}
         <section class="comments hidden-print">
         <h2>{{ messages("Comments") }}</h2>

themes/pypy/templates/post_header.tmpl

@@ -50,7 +50,7 @@
             </a>
             </p>
             {# modified for static_comments only #}
-            <p class="commentline">{{ static_comments.add_static_comment_count(post.comments, lang) }}</p>
+            {{ static_comments.add_static_comment_count(post.comments, lang) }}
             {% if not post.meta('nocomments') and site_has_comments %}
                 <p class="commentline">{{ comments.comment_link(post.permalink(), post._base_path) }}
             {% endif %}

themes/pypy/templates/static_comments_helper.tmpl

@@ -0,0 +1,34 @@
+{# -*- coding: utf-8 -*- #}
+
+{% macro add_static_comments(static_comment_list, lang) %}
+  {%if static_comment_list|length > 0 %}
+    {%for comment in static_comment_list %}
+      {%for i in range(comment.indent_change_before) %}
+        <div class="comment-level comment-level-{{ comment.indent_levels|length + i }}">
+      {% endfor %}
+      <div class="comment comment-{{ comment.id }}">
+        <div class="comment-header">
+          <a name="comment-{{ comment.id }}"></a>
+          {%if comment.author is not none %}
+            {{ messages("{0} wrote on {1}:", lang).format(
+              '<span class="author">' ~ ('<a href="{0}">{1}</a>'.format(comment.author_url|e, comment.author|e) if comment.author_url is not none else (comment.author|e)) ~ '</span>',
+              '<span class="date">' + comment.formatted_date(date_format) + '</span>'
+            ) }}
+          {% endif %}
+        </div>
+        <div class="comment-content">
+          {{ comment.content }}
+        </div>
+      </div>
+      {%for i in range(-comment.indent_change_after) %}
+         </div>
+      {% endfor %}
+    {% endfor %}
+  {% endif %}
+{% endmacro %}
+
+{% macro add_static_comment_count(static_comment_list, lang) %}
+  {% if static_comment_list|length > 0 %}
+    <p class="commentline">{{ messages("{0} comments" if static_comment_list|length != 1 else "{0} comment", lang).format(static_comment_list|length) }}</p>
+  {% endif %}
+{% endmacro %}