Change comments script code to use polymorphism

Update #63
Pelican-Elegant · Nov 28, 2013 · 5c1ecc9 · 5c1ecc9
1 parent 7083eea
commit 5c1ecc9
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 6 deletions.
diff --git a/templates/article.html b/templates/article.html
@@ -110,6 +110,6 @@ <h4>Tags</h4>
 
 {% block script %}
     {{ super() }}
-    {% include 'disqus_script_count.html' %}
-    {% include 'disqus_comments_uncollapse.html' %}
+    {% from 'comments.html' import comments_script with context %}
+    {{ comments_script(article) }}
 {% endblock script %}
diff --git a/templates/comments.html b/templates/comments.html
@@ -29,3 +29,10 @@
 </section>
     {% endif %}
 {% endmacro %}
+
+{% macro comments_script(article) %}
+    {% if DISQUS_SITENAME and SITEURL and article.status != 'draft' %}
+        {% include 'disqus_script_count.html' %}
+        {% include 'disqus_comments_uncollapse.html' %}
+    {% endif %}
+{% endmacro %}
diff --git a/templates/disqus_comments_uncollapse.html b/templates/disqus_comments_uncollapse.html
@@ -1,4 +1,3 @@
-{% if DISQUS_SITENAME and SITEURL and article.status != 'draft' %}
 <script  language="javascript" type="text/javascript">
 function uncollapse() {
     if (window.location.hash.match(/^#comment-\d+$/)) {
@@ -13,4 +12,3 @@
             window.location.reload(true);
     }
 </script>
-{% endif %}
diff --git a/templates/disqus_script_count.html b/templates/disqus_script_count.html
@@ -1,4 +1,3 @@
-{% if DISQUS_SITENAME and SITEURL and article.status != 'draft' %}
 <script type="text/javascript">
     var disqus_shortname = '{{ DISQUS_SITENAME }}';
 
@@ -9,4 +8,3 @@
         (document.getElementsByTagName('HEAD')[0] || document.getElementsByTagName('BODY')[0]).appendChild(s);
     }());
     </script>
-{% endif %}