Lots of style updates

2 files changed, 10 insertions, 12 deletions

diff --git a/_includes/analytics.html b/_includes/analytics.html
index 6707963..ccd51fd 100644
--- a/_includes/analytics.html
+++ b/_includes/analytics.html
@@ -2,7 +2,7 @@
 <script type="text/javascript">
 
   var _gaq = _gaq || [];
-  _gaq.push(['_setAccount', '{{ site.googleanalytics.id }}']);
+  _gaq.push(['_setAccount', '{{ site.google_analytics }}']);
   _gaq.push(['_trackPageview']);
 
   (function() {
diff --git a/_includes/disqus.html b/_includes/disqus.html
index 82f4fe5..ad38601 100644
--- a/_includes/disqus.html
+++ b/_includes/disqus.html
@@ -1,16 +1,14 @@
 <div id="disqus_thread"></div>
 <script type="text/javascript">
-      /* * * CONFIGURATION VARIABLES: EDIT BEFORE PASTING INTO YOUR WEBPAGE * * */
-      var disqus_shortname = '{{ site.disqus.shortname }}'; // required: replace example with your forum shortname
+  {% if include.disqus %}
 
-      {% if include.disqus_identifier %}
-      var disqus_identifier = "{{ include.disqus_identifier }}";
-      {% endif %}
+    var disqus_shortname = '{{ site.disqus }}'; 
 
-      (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>
+    (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);
+    })();
+  {% endif %}
+</script>
 <noscript>Please enable JavaScript to view the <a href="http://disqus.com/?ref_noscript">comments powered by Disqus.</a></noscript>
\ No newline at end of file