merge from rpsh pull-request, add disqus

Author: Huxpro

README.md

@@ -223,6 +223,13 @@ Furthermore, if you only wanna use comment without sharing, you can set `duoshuo
 Disabling the whole thing is also easy, and just comment out the code.
 
 
+Another type of comment widget: [Disqus](https://disqus.com/)
+
+```
+disqus_username: huxblog		# write down your own
+```
+
+
 #### Analytics
 
 From V1.5, we support Google Analytics and Baidu Tongji officially with a deathly simple config:

_config.yml

@@ -45,6 +45,8 @@ duoshuo_username: huxblog
 duoshuo_share: true                     # set to false if you want to use Comment without Sharing
 
 
+# Disqus settings
+disqus_username: hux
 
 
 # Analytics settings

_layouts/keynote.html

@@ -109,6 +109,17 @@ <h2 class="subheading">{{ page.subtitle }}</h2>
                 </div>
                 <!-- 多说评论框 end -->
                 {% endif %}
+
+                {% if site.disqus_username %}
+                <!-- disqus 评论框 start -->
+                <div class="comment">
+                    <div id="disqus_thread" class="disqus-thread">
+
+                    </div>
+                </div>
+                <!-- disqus 评论框 end -->
+                {% endif %}
+
             </div>
 
             <!-- Sidebar Container -->
@@ -192,6 +203,24 @@ <h5>FRIENDS</h5>
 {% endif %}
 
 
+{% if site.disqus_username %}
+<!-- disqus 公共JS代码 start (一个网页只需插入一次) -->
+<script type="text/javascript">
+    /* * * CONFIGURATION VARIABLES * * */
+    var disqus_shortname = "{{site.disqus_username}}";
+    var disqus_identifier = "{{page.id}}";
+    var disqus_url = "{{site.url}}{{page.url}}";
+
+    (function() {
+        var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
+        dsq.src = '//' + disqus_shortname + '.disqus.com/embed.js';
+        (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
+    })();
+</script>
+<!-- disqus 公共JS代码 end -->
+{% endif %}
+
+
 {% if site.anchorjs %}
 <!-- async load function -->
 <script>

_layouts/post.html

@@ -103,6 +103,14 @@ <h2 class="subheading">{{ page.subtitle }}</h2>
                 <!-- 多说评论框 end -->
                 {% endif %}
 
+                {% if site.disqus_username %}
+                <!-- disqus 评论框 start -->
+                <div class="comment">
+                    <div id="disqus_thread" class="disqus-thread"></div>
+                </div>
+                <!-- disqus 评论框 end -->
+                {% endif %}
+
             </div>
 
     <!-- Sidebar Container -->
@@ -143,7 +151,6 @@ <h5>FRIENDS</h5>
     </div>
 </article>
 
-
 {% if site.duoshuo_username %}
 <!-- 多说公共JS代码 start (一个网页只需插入一次) -->
 <script type="text/javascript">
@@ -165,6 +172,24 @@ <h5>FRIENDS</h5>
 {% endif %}
 
 
+{% if site.disqus_username %}
+<!-- disqus 公共JS代码 start (一个网页只需插入一次) -->
+<script type="text/javascript">
+    /* * * CONFIGURATION VARIABLES * * */
+    var disqus_shortname = "{{site.disqus_username}}";
+    var disqus_identifier = "{{page.id}}";
+    var disqus_url = "{{site.url}}{{page.url}}";
+
+    (function() {
+        var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
+        dsq.src = '//' + disqus_shortname + '.disqus.com/embed.js';
+        (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
+    })();
+</script>
+<!-- disqus 公共JS代码 end -->
+{% endif %}
+
+
 {% if site.anchorjs %}
 <!-- async load function -->
 <script>

about.html

@@ -105,17 +105,17 @@
 
 {% if site.duoshuo_username %}
 <!-- 多说评论框 start -->
-    <div class="comment">
-        <div class="ds-thread"
-        {% if site.duoshuo_username == "huxblog" %}
-            data-thread-id="1187623191091085319"
-        {% else %}
-            data-thread-key="{{site.duoshuo_username}}/about"
-        {% endif %}
-
-        data-title="{{page.title}}"
-        data-url="{{site.url}}/about/"></div>
-    </div>
+<div class="comment">
+    <div class="ds-thread"
+    {% if site.duoshuo_username == "huxblog" %}
+        data-thread-id="1187623191091085319"
+    {% else %}
+        data-thread-key="{{site.duoshuo_username}}/about"
+    {% endif %}
+
+    data-title="{{page.title}}"
+    data-url="{{site.url}}/about/"></div>
+</div>
 <!-- 多说评论框 end -->
 
 <!-- Duoshuo hacking -->
@@ -138,3 +138,29 @@
 </script>
 <!-- 多说公共JS代码 end -->
 {% endif %}
+
+
+{% if site.disqus_username %}
+<!-- disqus 评论框 start -->
+<div class="comment">
+    <div id="disqus_thread" class="disqus-thread">
+
+    </div>
+</div>
+<!-- disqus 评论框 end -->
+
+<!-- disqus 公共JS代码 start (一个网页只需插入一次) -->
+<script type="text/javascript">
+    /* * * CONFIGURATION VARIABLES * * */
+    var disqus_shortname = "{{site.disqus_username}}";
+    var disqus_identifier = "{{site.disqus_username}}/{{page.url}}";
+    var disqus_url = "{{site.url}}{{page.url}}";
+
+    (function() {
+        var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
+        dsq.src = '//' + disqus_shortname + '.disqus.com/embed.js';
+        (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
+    })();
+</script>
+<!-- disqus 公共JS代码 end -->
+{% endif %}

css/hux-blog.css

@@ -879,7 +879,7 @@ body {
   margin-top: 3px;
 }
 /* Hux customize Style for Duoshuo */
-.comment #ds-thread {
+.comment {
   margin-top: 20px;
 }
 .comment #ds-thread #ds-reset a.ds-like-thread-button {

css/hux-blog.min.css

@@ -880,8 +880,8 @@ body {
 
 /* Hux customize Style for Duoshuo */
 .comment{
+	margin-top: 20px;
 	#ds-thread {
-		margin-top: 20px;
 		#ds-reset {
 			a.ds-like-thread-button{
 				border:1px solid #ddd;