From 2a30d9a1eb5219e5335d1afdd214204d61ea6367 Mon Sep 17 00:00:00 2001
From: Frederic Hemberger <mail@frederic-hemberger.de>
Date: Wed, 21 Sep 2011 13:37:59 +0200
Subject: Refactored inclusion of disqus script

- Added ARIA setting `aria-live="polite"` to comment output
- Removed duplicate <div id="disqus_thread"> from page/post templates
- Moved blocking JavaScript loading to the end of the document body.
- Merged JavaScript code for index and pages/posts using conditionals
- Moved global JavaScript disqus variables into the anonymous function to stop pollution of global namespace
---
 .themes/classic/source/_layouts/default.html | 1 +
 .themes/classic/source/_layouts/page.html    | 2 +-
 .themes/classic/source/_layouts/post.html    | 4 ++--
 3 files changed, 4 insertions(+), 3 deletions(-)

(limited to '.themes/classic/source/_layouts')

diff --git a/.themes/classic/source/_layouts/default.html b/.themes/classic/source/_layouts/default.html
index 629468d3..d84da44c 100644
--- a/.themes/classic/source/_layouts/default.html
+++ b/.themes/classic/source/_layouts/default.html
@@ -9,6 +9,7 @@
     </div>
   </div>
   <footer>{% include footer.html %}</footer>
+  {% include disqus.html %}
   {% include google_analytics.html %}
   {% include google_plus_one.html %}
   {% include twitter_sharing.html %}
diff --git a/.themes/classic/source/_layouts/page.html b/.themes/classic/source/_layouts/page.html
index dbf209c4..20c17452 100644
--- a/.themes/classic/source/_layouts/page.html
+++ b/.themes/classic/source/_layouts/page.html
@@ -27,7 +27,7 @@ layout: default
 {% if site.disqus_short_name and page.comments == true %}
   <section>
     <h1>Comments</h1>
-    <div id="disqus_thread">{% include post/disqus_thread.html %}</div>
+    <div id="disqus_thread" aria-live="polite">{% include post/disqus_thread.html %}</div>
   </section>
 {% endif %}
 </div>
diff --git a/.themes/classic/source/_layouts/post.html b/.themes/classic/source/_layouts/post.html
index ce8a5dea..e81cc787 100644
--- a/.themes/classic/source/_layouts/post.html
+++ b/.themes/classic/source/_layouts/post.html
@@ -17,10 +17,10 @@ single: true
     {% endunless %}
   </footer>
 </article>
-{% if site.disqus_short_name and page.comments != false %}
+{% if site.disqus_short_name and page.comments == true %}
   <section>
     <h1>Comments</h1>
-    <div id="disqus_thread">{% include post/disqus_thread.html %}</div>
+    <div id="disqus_thread" aria-live="polite">{% include post/disqus_thread.html %}</div>
   </section>
 {% endif %}
 </div>
-- 
cgit v1.2.1