From 7956577cf424525a64aa6ee669fafdf0594b96b7 Mon Sep 17 00:00:00 2001
From: Michael Rose <est.michael@gmail.com>
Date: Thu, 22 Jan 2015 11:23:54 -0500
Subject: [PATCH] Move Disqus script inside conditional to avoid <noscript>
 text from appearing on pages that have comments disabled

---
 _config.yml            | 3 +--
 _includes/scripts.html | 4 ----
 _layouts/post.html     | 5 ++++-
 3 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/_config.yml b/_config.yml
index 23a46ac..3e2315c 100644
--- a/_config.yml
+++ b/_config.yml
@@ -7,7 +7,6 @@ logo: site-logo.png
 search: true
 url: http://localhost:4000
 
-
 # Jekyll configuration
 
 permalink:   /:categories/:title/
@@ -50,4 +49,4 @@ owner:
     verify:
     ad-client:
     ad-slot: 
-  bing-verify:
\ No newline at end of file
+  bing-verify:
diff --git a/_includes/scripts.html b/_includes/scripts.html
index bed3b4d..0793834 100644
--- a/_includes/scripts.html
+++ b/_includes/scripts.html
@@ -23,7 +23,3 @@
   })();
 </script>
 {% endif %}
-
-{% if page.comments or site.comments %}
-  {% include disqus_comments.html %}
-{% endif %}
diff --git a/_layouts/post.html b/_layouts/post.html
index f5cd081..4b6536c 100644
--- a/_layouts/post.html
+++ b/_layouts/post.html
@@ -41,7 +41,10 @@
       </footer>
       <div class="entry-content">
         {{ content }}
-        {% if (site.owner.disqus-shortname and page.comments) or site.comments %}<div id="disqus_thread"></div><!-- /#disqus_thread -->{% endif %}
+        {% if (site.owner.disqus-shortname and page.comments) or site.comments %}
+          <div id="disqus_thread"></div><!-- /#disqus_thread -->
+          {% include disqus_comments.html %}
+        {% endif %}
       </div><!-- /.entry-content -->
     </div><!-- /.entry-wrapper -->
     <nav class="pagination" role="navigation">