diff options
Diffstat (limited to '')
| -rw-r--r-- | source/_layouts/default.haml | 93 | ||||
| -rw-r--r-- | source/index.haml | 9 | ||||
| -rw-r--r-- | source/javascripts/twitter.js | 10 |
3 files changed, 65 insertions, 47 deletions
diff --git a/source/_layouts/default.haml b/source/_layouts/default.haml index 01d63f20..2c32bc4a 100644 --- a/source/_layouts/default.haml +++ b/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,19 +22,26 @@ 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") - %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") - %script(src="http://www.google-analytics.com/ga.js" type="text/javascript") + - 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 - #search - %form(action="http://www.google.com/cse" id="cse-search-box") - %input(type="hidden" name="cx" value="#{page.google_site_search_id}") - %input(type="hidden" name="ie" value="UTF-8") - %input#q(type="text" name="q") + - 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}") + %input(type="hidden" name="ie" value="UTF-8") + %input#q(type="text" name="q") #nav .page_width %ul @@ -46,38 +60,43 @@ disqus_short_name: designenthusiast %p.pubdate Published: =page.date.strftime("%d %b, %Y") - #disqus_thread - :javascript - var disqus_developer = true; - var disqus_url = "#{page.full_url}/#{page.url}"; - %noscript - %a(href="http://designenthusiast.disqus.com/?url=ref") View the discussion thread - %script(type="text/javascript" src="http://disqus.com/forums/#{page.disqus_short_name}/embed.js") + - if page.respond_to? :disqus_short_name + #disqus_thread + :javascript + var disqus_developer = true; + var disqus_url = "#{page.full_url}/#{page.url}"; + %noscript + %a(href="http://designenthusiast.disqus.com/?url=ref") View the discussion thread + %script(type="text/javascript" src="http://disqus.com/forums/#{page.disqus_short_name}/embed.js") - else = content #sidebar - #twitter - #twitter_status - Status updating... + - if page.respond_to? :twitter_user + %h4 @#{page.twitter_user} + #twitter + #twitter_status + Status updating... #footer .page_width = "Copyright © #{Time.now.strftime('%Y')} - #{page.blog_title} | " %span.credit Powered by <a href="http://github.com/imathis/octopress/">Octopress</a> - //Disqus Commens code - :javascript - /*(function() { - var links = document.getElementsByTagName('a'); - var query = '?'; - for(var i = 0; i < links.length; i++) { - if(links[i].href.indexOf('#disqus_thread') >= 0) { - query += 'url' + i + '=' + encodeURIComponent(links[i].href) + '&'; + - if page.respond_to? :disqus_short_name + //Disqus Commens code + :javascript + (function() { + var links = document.getElementsByTagName('a'); + var query = '?'; + for(var i = 0; i < links.length; i++) { + if(links[i].href.indexOf('#disqus_thread') >= 0) { + query += 'url' + i + '=' + encodeURIComponent(links[i].href) + '&'; + } } - } - document.write('<script charset="utf-8" type="text/javascript" src="http://disqus.com/forums/#{page.disqus_short_name}/get_num_replies.js' + query + '"></' + 'script>'); - })();*/ - //Google Analytics code - :javascript - try { - var pageTracker = _gat._getTracker("UA-10876422-1"); - pageTracker._trackPageview(); - } catch(err) {}
\ No newline at end of file + 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 { + var pageTracker = _gat._getTracker("UA-10876422-1"); + pageTracker._trackPageview(); + } catch(err) {}
\ No newline at end of file diff --git a/source/index.haml b/source/index.haml index 78662684..ad7cc11a 100644 --- a/source/index.haml +++ b/source/index.haml @@ -8,9 +8,10 @@ title: Blog %h2= link_to(post.title, post.url, {:class=>"title"}) = post.content .footer - - if post.data["comments_off"] - %em.comments_off Comments disabled - - else - %a(href="#{post.url}/#disqus_thread")Comments + - if page.respond_to? :disqus_short_name + - if post.data["comments_off"] + %em.comments_off Comments disabled + - else + %a(href="#{post.url}/#disqus_thread")Comments .footer %a(href="/archives.html" title="archives") « Blog Archives
\ No newline at end of file diff --git a/source/javascripts/twitter.js b/source/javascripts/twitter.js index 7ba2fc23..ffda0734 100644 --- a/source/javascripts/twitter.js +++ b/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); |