Merge pull request #47 from sennav/master

Fix disqus comments counter.

static/css/clean-blog.css

@@ -404,3 +404,7 @@ img::-moz-selection {
 body {
   webkit-tap-highlight-color: #0085a1;
 }
+.article-summary {
+  padding-top:10px;
+  padding-bottom: 10px;
+}

templates/comments.html

@@ -1 +1 @@
-{% if DISQUS_SITENAME %}<p>There are <a href="{{ SITEURL }}/{{ article.url }}#disqus_thread">comments</a>.</p>{% endif %}
+{% if DISQUS_SITENAME %}<p>There are <a data-disqus-identifier="{{ article.url }}" href="{{ SITEURL }}/{{ article.url }}#disqus_thread">comments</a>.</p>{% endif %}

templates/index.html

@@ -49,10 +49,14 @@
             </a>
             {% if SHOW_FULL_ARTICLE %}
                 {{ article.content }}
-            {% elif article.has_summary %}
+            {% else %}
-                {{ article.summary }}
+                <p class="article-summary">
-            {% elif article.summary %}
+                {% if article.has_summary %}
-                {{ article.summary|striptags|truncate(140) }}
+                    {{ article.summary }}
+                {% elif article.summary %}
+                    {{ article.summary|striptags|truncate(140) }}
+                {% endif %}
+                </p>
             {% endif %}
             <p class="post-meta">Posted by
                 {% for author in article.authors %}

templates/sharing.html

@@ -1,7 +1,7 @@
 {% if article.status != "draft" %}
-<hr>
+{% if ADDTHIS_PUBID %}
-<div class="sharing">
+    <hr>
-    {% if ADDTHIS_PUBID %}
+    <div class="sharing">
         <!-- AddThis Button BEGIN -->
         <div class="addthis_toolbox addthis_default_style addthis_32x32_style">
             <a class="addthis_button_preferred_1"></a>
@@ -18,6 +18,6 @@
         </div>
         <script type="text/javascript" src="http://s7.addthis.com/js/300/addthis_widget.js#pubid={{ ADDTHIS_PUBID }}"></script>
         <!-- AddThis Button END -->
-    {% endif %}
+    </div>
-</div>
+{% endif %}
 {% endif %}