Merge pull request #401 from Pelican-Elegant/add-feature

Add feature
Pelican-Elegant · Jun 30, 2019 · cd5862a · cd5862a
2 parents 0f146cd + edf83fe
commit cd5862a
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 6 deletions.
diff --git a/documentation/content/Development/travis-ci-and-doc-website.md b/documentation/content/Development/travis-ci-and-doc-website.md
@@ -8,7 +8,7 @@ comments: true
 category: Development
 description:
 slug: travis-ci-and-doc-website
-disqus_identifier: travis-ci-and-doc-website
+comment_id: travis-ci-and-doc-website
 ---
 
 [TOC]

diff --git a/documentation/content/Development/travis-to-trigger-build-in-another-repo.md b/documentation/content/Development/travis-to-trigger-build-in-another-repo.md
@@ -8,7 +8,7 @@ comments: true
 category: Development
 description:
 slug: travis-to-trigger-build-in-another-repository
-disqus_identifier: travis-to-trigger-build-in-another-repository
+comment_id: travis-to-trigger-build-in-another-repository
 ---
 
 [TOC]

diff --git a/documentation/content/Elegant - Pelican Theme/elegant-theme.md b/documentation/content/Elegant - Pelican Theme/elegant-theme.md
@@ -5,7 +5,7 @@ Category: Elegant - Pelican Theme
 Tags: jinja2, bootstrap, pelican-theme, font-awesome
 Summary: Elegant is a minimal, stylish and responsive Pelican theme. Its unique features are search, Mailchimp, twitter card, and custom 404 page.
 Slug: elegant-best-pelican-theme-features
-disqus_identifier: 2189d14-elegant-a-theme-for-pelican
+comment_id: 2189d14-elegant-a-theme-for-pelican
 modified: 2013-10-11 23:00
 keywords: pelican theme, responsive theme, tipue search
 

diff --git a/documentation/content/Monetization/amazon-one-link.md b/documentation/content/Monetization/amazon-one-link.md
@@ -8,7 +8,7 @@ comments: true
 category: Monetization
 description:
 slug: amazon-onelink
-disqus_identifier: amazon-onelink
+comment_id: amazon-onelink
 ---
 
 Elegant supports [Amazon OneLink](https://affiliate-program.amazon.com/onelink/), so that you may monetize your traffic using affiliate links.

diff --git a/templates/_includes/comments.html b/templates/_includes/comments.html
@@ -13,7 +13,9 @@
     <div class="accordion-group">
         <div class="accordion-heading">
             <a class="accordion-toggle disqus-comment-count" data-toggle="collapse" data-parent="#accordion2"
-                {% if article.disqus_identifier %}
+                {% if article.comment_id %}
+                    data-disqus-identifier="{{ article.comment_id }}"
+                {% elif article.disqus_identifier %}
                     data-disqus-identifier="{{ article.disqus_identifier }}"
                 {% endif %}
                 href="{{ SITEURL }}/{{ article.url }}#disqus_thread",

diff --git a/templates/_includes/disqus_scripts.html b/templates/_includes/disqus_scripts.html
@@ -42,7 +42,9 @@
 <div id="disqus_thread"></div>
 <script type="text/javascript">
     var disqus_shortname = '{{ DISQUS_SITENAME }}';
-    {% if article.disqus_identifier %}
+    {% if article.comment_id %}
+        var disqus_identifier = '{{ article.comment_id }}';
+    {% elif article.disqus_identifier %}
         var disqus_identifier = '{{ article.disqus_identifier }}';
     {% else %}
         var disqus_identifier = '{{ SITEURL }}/{{ article.url }}';