aboutsummaryrefslogtreecommitdiff
path: root/.themes
diff options
context:
space:
mode:
authorAlexandre Perrin <alexandre.perrin@netoxygen.ch>2013-10-07 09:39:05 +0200
committerAlexandre Perrin <alexandre.perrin@netoxygen.ch>2013-10-07 09:39:05 +0200
commit9225798c0bab1a645df8a9ecdabd0442d772937a (patch)
treeffac2e3648e4c26fe716516209f5fdf5ae0cb87d /.themes
parent8bfd5ef3237f07125adde7043c19a3159879044a (diff)
parentff71657c432e2beb2f540617e4cc264c42e22cee (diff)
downloadmy_new_personal_website-9225798c0bab1a645df8a9ecdabd0442d772937a.tar.xz
my_new_personal_website-9225798c0bab1a645df8a9ecdabd0442d772937a.zip
Merge branch 'master' of https://github.com/imathis/octopress
Diffstat (limited to '.themes')
-rw-r--r--.themes/classic/source/_includes/article.html3
-rw-r--r--.themes/classic/source/_includes/disqus.html2
2 files changed, 3 insertions, 2 deletions
diff --git a/.themes/classic/source/_includes/article.html b/.themes/classic/source/_includes/article.html
index 23f48844..84279977 100644
--- a/.themes/classic/source/_includes/article.html
+++ b/.themes/classic/source/_includes/article.html
@@ -9,7 +9,8 @@
<p class="meta">
{% include post/date.html %}{{ time }}
{% if site.disqus_short_name and page.comments != false and post.comments != false and site.disqus_show_comment_count == true %}
- | <a href="{% if index %}{{ root_url }}{{ post.url }}{% endif %}#disqus_thread">Comments</a>
+ | <a href="{% if index %}{{ root_url }}{{ post.url }}{% endif %}#disqus_thread"
+ data-disqus-identifier="{% if post.meta.disqus_id %}{{ post.meta.disqus_id }}{% else %}{{ site.url }}{{ post.url }}{% endif %}">Comments</a>
{% endif %}
</p>
{% endunless %}
diff --git a/.themes/classic/source/_includes/disqus.html b/.themes/classic/source/_includes/disqus.html
index eb308779..549ba3d7 100644
--- a/.themes/classic/source/_includes/disqus.html
+++ b/.themes/classic/source/_includes/disqus.html
@@ -14,7 +14,7 @@
{% endif %}
(function () {
var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
- dsq.src = 'http://' + disqus_shortname + '.disqus.com/' + disqus_script;
+ dsq.src = ('https:' == document.location.protocol ? 'https://' : 'http://') + disqus_shortname + '.disqus.com/' + disqus_script;
(document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
}());
</script>