Update themes to use new integration methods

9 files changed, 15 insertions, 19 deletions

diff --git a/_includes/production/analytics.html b/_includes/production/analytics.html
deleted file mode 100644
index 3f12c6a..0000000
--- a/_includes/production/analytics.html
+++ /dev/null
@@ -1,5 +0,0 @@
-<!-- 
- Drop your analytics in here.
- This will only be included when published to GitHub.
- We use "site.safe" variable which is true on GitHub.
--->
\ No newline at end of file
diff --git a/_includes/themes/mark-reid/default.html b/_includes/themes/mark-reid/default.html
index 835a4bc..b8a0482 100644
--- a/_includes/themes/mark-reid/default.html
+++ b/_includes/themes/mark-reid/default.html
@@ -68,8 +68,7 @@
 </script>
 <script type="text/javascript" src="http://static.ie6update.com/hosted/ie6update/ie6update.js"></script>
 <![endif]-->
-{% if site.safe %}
-  {% include production/analytics.html %}
-{% endif %}
+
+  {% include JB/analytics %}
 </body>
 </html>
diff --git a/_includes/themes/mark-reid/post.html b/_includes/themes/mark-reid/post.html
index 76dd994..af7ffd3 100644
--- a/_includes/themes/mark-reid/post.html
+++ b/_includes/themes/mark-reid/post.html
@@ -25,7 +25,4 @@
   
 </div><!-- End Page -->
 
-<!-- Discus Comments -->
-<div id="disqus_thread">
-  <h2>Comment Section</h2>
-</div>
+{% include JB/comments %}
diff --git a/_includes/themes/the-minimum/default.html b/_includes/themes/the-minimum/default.html
index 140d21e..95b0404 100644
--- a/_includes/themes/the-minimum/default.html
+++ b/_includes/themes/the-minimum/default.html
@@ -77,8 +77,7 @@
 /*! A fix for the iOS orientationchange zoom bug.Script by @scottjehl, rebound by @wilto. MIT License.*/
 (function(j){var i=j.document;if(!i.querySelectorAll){return}var l=i.querySelectorAll("meta[name=viewport]")[0],a=l&&l.getAttribute("content"),h=a+", maximum-scale=1.0",d=a+", maximum-scale=10.0",g=true,c=j.orientation,k=0;if(!l){return}function f(){l.setAttribute("content",d);g=true}function b(){l.setAttribute("content",h);g=false}function e(m){c=Math.abs(j.orientation);k=Math.abs(m.gamma);if(k>8&&c===0){if(g){b()}}else{if(!g){f()}}}j.addEventListener("orientationchange",f,false);j.addEventListener("deviceorientation",e,false)})(this);
 </script>
-{% if site.safe %}
-  {% include production/analytics.html %}
-{% endif %}
+
+  {% include JB/analytics %}
 </body>
 </html>
diff --git a/_includes/themes/the-minimum/post.html b/_includes/themes/the-minimum/post.html
index cf5712e..9b5316b 100644
--- a/_includes/themes/the-minimum/post.html
+++ b/_includes/themes/the-minimum/post.html
@@ -40,7 +40,10 @@
 							<li><div class="twitter-follow"><a href="https://twitter.com/{{ site.author.twitter }}" class="twitter-follow-button" data-show-count="false" data-lang="en"></a></div></li>
 						</ul>
 					</div>
+					
+					{% include JB/comments %}
 				</div><!-- misc-content -->
+				
 			</div><!-- bd -->
 			<footer class="unit-foot">
 				<div class="unit-inner unit-foot-inner">
diff --git a/_includes/themes/tom/default.html b/_includes/themes/tom/default.html
index 2c43e6b..bbd019f 100644
--- a/_includes/themes/tom/default.html
+++ b/_includes/themes/tom/default.html
@@ -53,8 +53,6 @@
   </div>
   <a href="http://github.com/{{ site.author.github }}"><img style="position: absolute; top: 0; right: 0; border: 0;" src="http://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" /></a>
 
-{% if site.safe %}
-  {% include production/analytics.html %}
-{% endif %}
+  {% include JB/analytics %}
 </body>
 </html>
diff --git a/_includes/themes/tom/post.html b/_includes/themes/tom/post.html
index fc94e5e..088407a 100644
--- a/_includes/themes/tom/post.html
+++ b/_includes/themes/tom/post.html
@@ -14,4 +14,6 @@
       <li><span>{{ post.date | date_to_string }}</span> &raquo; <a href="{{ post.url }}">{{ post.title }}</a></li>
     {% endfor %}
   </ul>
-</div>
\ No newline at end of file
+</div>
+
+{% include JB/comments %}
\ No newline at end of file
diff --git a/_includes/themes/twitter/default.html b/_includes/themes/twitter/default.html
index d149bd5..df70385 100644
--- a/_includes/themes/twitter/default.html
+++ b/_includes/themes/twitter/default.html
@@ -54,5 +54,6 @@
 
     </div> <!-- /container -->
 
+    {% include JB/analytics %}
   </body>
 </html>
diff --git a/_includes/themes/twitter/post.html b/_includes/themes/twitter/post.html
index 81b0931..591cbca 100644
--- a/_includes/themes/twitter/post.html
+++ b/_includes/themes/twitter/post.html
@@ -21,6 +21,8 @@
       {% endif %}
       </ul>
     </div>
+    <hr>
+    {% include JB/comments %}
   </div>
   
   <div class="span4">