udpated thirdparty integration, it is now conditionally added, updated readme

README.markdown

@@ -51,11 +51,12 @@ Kills the local web server process.
 
 ## Third Party Integration
 ### Twitter
-To configure your twitter feed, edit twitter.js where you can set:
+Twitter settings are at the top of _layouts/default.haml
+You can also change:
 
-- Account for the feed
-- Number of tweets to show
-- Show Mentions (true/false)
+    twitter_user: your_twitter_name
+    show_replies: false
+    tweet_count: 3
 
 ### Disqus Comments
 Octopress has built in support for the Disqus commenting system, using the "universal code" installation method. First register your site at [http://disqus.com/comments/register/](http://disqus.com/comments/register/) Then, to enable Disqus comments on your blog, edit the YAML block at the top of the default layout:
@@ -69,6 +70,9 @@ First setup sitesearch for your site at [http://google.com/sitesearch/](http://g
 ### Google Analytics
 The analytics tracking scripts are already integrated into Octopress, all you have to do is register your site at [http://google.com/analytics/](http://google.com/analytics/).
 
+### Removing Third party integrations
+All third party integration is conditionally included. All you have to do is remove the variable from the layout and you're done. If you like, you can also remove the include blocks from the default layout.
+
 ## Style Configuration
 ### What you need to know
 Octopress's stylesheets are written in [SASS](http://sass-lang.com). If you haven't learned SASS, you should. It's the future. Octopress also uses [Compass](http://compass-style.org) which is a framework for SASS and contains a great library of SASS mixins which make it trivial to write complicated CSS. This is also the future.

Rakefile

@@ -20,7 +20,7 @@ end
 
 desc "generate website in output directory"
 task :default => [:generate_site, :generate_style] do
-  puts ">>> Site Generating Complete! <<<"
+  puts ">>> Site Generating Complete! <<<\n\n"
 end
 
 desc "list tasks"
@@ -48,19 +48,20 @@ end
 
 desc "Generate site files only"
 task :generate_site => [:clean, :generate_style] do
-  puts ">>> Generating site files <<<"
+  puts "\n\n>>> Generating site files <<<"
   system "jekyll"
   system "mv #{site}/atom.html #{site}/atom.xml"
 end
 
 def rebuild_site(relative)
+  puts "\n"
   puts ">>> Change Detected to: #{relative} <<<"
   IO.popen('rake generate_site'){|io| print(io.readpartial(512)) until io.eof?}
   puts '>>> Update Complete <<<'
 end
 
 def rebuild_style(relative)
-  puts ">>> Change Detected to: #{relative} <<<"
+  puts "\n\n>>> Change Detected to: #{relative} <<<"
   IO.popen('rake generate_style'){|io| print(io.readpartial(512)) until io.eof?}
   puts '>>> Update Complete <<<'
 end

source/_layouts/default.haml

@@ -1,8 +1,15 @@
 ---
 blog_title: My Octopress Blog
 full_url:
+twitter_user: imathis
+tweet_count: 4
+show_replies: false
+
+disqus_short_name: 
+
 google_site_search_id: 
-disqus_short_name: designenthusiast
+google_analytics: true
+
 ---
 
 !!! 1.1 Transitional
@@ -15,14 +22,21 @@ disqus_short_name: designenthusiast
       %meta(name="keywords" content="#{page.keywords}")/
     %link(href="/stylesheets/screen.css" rel="stylesheet" media="screen projection" type="text/css")
     %link(href="/atom.xml" rel="alternate" title="#{page.blog_title}" type="application/atom+xml")
+    - if page.respond_to? :twitter_user
+      :javascript
+        var twitter_user = "#{page.twitter_user}"
+        var show_replies = #{page.show_replies};
+        var tweet_count = #{page.tweet_count};
       %script(src="/javascripts/mootools-yui-compressed.js" type="text/javascript")
       %script(src="/javascripts/mootools-1.2.4.2-more.js" type="text/javascript")
       %script(src="/javascripts/twitter.js" type="text/javascript")
+    - if page.respond_to? :google_analytics
       %script(src="http://www.google-analytics.com/ga.js" type="text/javascript")
   %body
     #header
       .page_width
         %a.title(href="/")=page.blog_title
+        - if page.respond_to? :google_site_search_id
           #search
             %form(action="http://www.google.com/cse" id="cse-search-box")
               %input(type="hidden" name="cx" value="#{page.google_site_search_id}")
@@ -46,6 +60,7 @@ disqus_short_name: designenthusiast
             %p.pubdate
               Published:
               =page.date.strftime("%d %b, %Y")
+              - if page.respond_to? :disqus_short_name
                 #disqus_thread
                 :javascript
                   var disqus_developer = true;
@@ -56,6 +71,8 @@ disqus_short_name: designenthusiast
           - else
             = content
         #sidebar
+          - if page.respond_to? :twitter_user
+            %h4 @#{page.twitter_user}
             #twitter
               #twitter_status
                 Status updating...
@@ -63,9 +80,10 @@ disqus_short_name: designenthusiast
       .page_width
         = "Copyright © #{Time.now.strftime('%Y')} - #{page.blog_title} | "
         %span.credit Powered by <a href="http://github.com/imathis/octopress/">Octopress</a>
+    - if page.respond_to? :disqus_short_name
       //Disqus Commens code
       :javascript
-      /*(function() {
+        (function() {
             var links = document.getElementsByTagName('a');
             var query = '?';
             for(var i = 0; i < links.length; i++) {
@@ -74,7 +92,8 @@ disqus_short_name: designenthusiast
               }
             }
             document.write('<script charset="utf-8" type="text/javascript" src="http://disqus.com/forums/#{page.disqus_short_name}/get_num_replies.js' + query + '"></' + 'script>');
-        })();*/
+          })();
+    - if page.respond_to? :google_analytics
       //Google Analytics code
       :javascript
         try {

source/index.haml

@@ -8,6 +8,7 @@ title: Blog
       %h2= link_to(post.title, post.url, {:class=>"title"})
       = post.content
       .footer
+        - if page.respond_to? :disqus_short_name
           - if post.data["comments_off"]
             %em.comments_off Comments disabled
           - else

source/javascripts/twitter.js

@@ -6,13 +6,11 @@
 // PrettyDate by John Resig at http://ejohn.org/files/pretty.js
 //
 
-var filter_mentions = true;
-var tweet_count = 5;
 var tweet_tag = 'p';
 var twitter_div = 'twitter_status';
 
 window.addEvent('domready',function() {
-	getTwitterStatus('imathis');
+	getTwitterStatus(twitter_user);
 });
 
 function showTweets(the_tweets, from_cookie){
@@ -53,15 +51,15 @@ function prettyDate(time){
 }
 
 function getTwitterStatus(twitter_name){
-  var tweet_cookie = 'tweets_by_' + twitter_name;
+  var tweet_cookie = 'tweets_by_' + twitter_name + tweet_count;
   $(twitter_div).set('html', 'Fetching tweets...');
   if(!Cookie.read(tweet_cookie)) {
   	var myTwitterGitter = new TwitterGitter(twitter_name,{
-  	  count: ((!filter_mentions) ? tweet_count : 15 + tweet_count),
+  	  count: ((show_replies) ? tweet_count : 15 + tweet_count),
   		onComplete: function(tweets,user) {
         the_tweets = Array();
   			tweets.each(function(tweet,i) {
-  			  if((tweet.in_reply_to_status_id && !filter_mentions) || !tweet.in_reply_to_status_id){
+  			  if((tweet.in_reply_to_status_id && show_replies) || !tweet.in_reply_to_status_id){
   			    if(the_tweets.length == tweet_count) return;
   			    tweet.text = tweet.text.replace(/\n/gi, '<br/>');
   			    console.log(tweet);