diff options
| author | B Mathis <brandon@imathis.com> | 2009-11-07 19:24:09 -0600 |
|---|---|---|
| committer | B Mathis <brandon@imathis.com> | 2009-11-07 19:24:09 -0600 |
| commit | f702f2fc2f99c62016a692514a01290d3f3d898b (patch) | |
| tree | f2a79c978f9d3f07c8004aecf902b63e8a41da77 | |
| parent | fcc761c7bf1de6d18b353a4895750a8e423e0d3f (diff) | |
| download | my_new_personal_website-f702f2fc2f99c62016a692514a01290d3f3d898b.tar.xz my_new_personal_website-f702f2fc2f99c62016a692514a01290d3f3d898b.zip | |
added sidebar partial, updated twitter style, handling linebreaks with paragraphs
| -rw-r--r-- | source/_layouts/default.haml | 4 | ||||
| -rw-r--r-- | source/javascripts/twitter.js | 25 | ||||
| -rw-r--r-- | stylesheets/_partials.sass | 3 | ||||
| -rw-r--r-- | stylesheets/partials/_twitter.sass | 9 |
4 files changed, 27 insertions, 14 deletions
diff --git a/source/_layouts/default.haml b/source/_layouts/default.haml index 458279d0..2ad53318 100644 --- a/source/_layouts/default.haml +++ b/source/_layouts/default.haml @@ -73,9 +73,9 @@ google_analytics: true = content #sidebar - if page.respond_to? :twitter_user - %h4 @#{page.twitter_user} + %h4 Twitter <a class="small" href="http://twitter.com/#{page.twitter_user}">@#{page.twitter_user}</a> #twitter - #twitter_status + %ul#twitter_status Status updating... #footer .page_width diff --git a/source/javascripts/twitter.js b/source/javascripts/twitter.js index ffda0734..b6f60de2 100644 --- a/source/javascripts/twitter.js +++ b/source/javascripts/twitter.js @@ -6,8 +6,15 @@ // PrettyDate by John Resig at http://ejohn.org/files/pretty.js // -var tweet_tag = 'p'; -var twitter_div = 'twitter_status'; +/* + Plugin: Octopress Twitter Feed + Author: Brandon Mathis + Website: http://brandonmathis.com + Date: 11/07/2009 +*/ + +var tweet_container = 'li'; +var twitter_container = 'twitter_status'; window.addEvent('domready',function() { getTwitterStatus(twitter_user); @@ -17,11 +24,13 @@ function showTweets(the_tweets, from_cookie){ if(from_cookie){ the_tweets = the_tweets.split('^!^!^!^!^'); } - $(twitter_div).set('html', ''); + $(twitter_container).set('html', ''); the_tweets.each(function(tweet){ - new Element(tweet_tag,{ - html: parseTweetDate(tweet) - }).inject(twitter_div); + tweet = parseTweetDate(tweet) + tweet = '<p>' + tweet.replace(/\n\n/gi,'</p><p>') + '</p>'; + new Element(tweet_container,{ + html: tweet + }).inject(twitter_container); }); } @@ -52,7 +61,7 @@ function prettyDate(time){ function getTwitterStatus(twitter_name){ var tweet_cookie = 'tweets_by_' + twitter_name + tweet_count; - $(twitter_div).set('html', 'Fetching tweets...'); + $(twitter_container).set('html', 'Fetching tweets...'); if(!Cookie.read(tweet_cookie)) { var myTwitterGitter = new TwitterGitter(twitter_name,{ count: ((show_replies) ? tweet_count : 15 + tweet_count), @@ -61,8 +70,6 @@ function getTwitterStatus(twitter_name){ tweets.each(function(tweet,i) { 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); the_tweets.push(tweet.text + '-!-!-!-' + tweet.created_at); } }); diff --git a/stylesheets/_partials.sass b/stylesheets/_partials.sass index 326df48d..cb523693 100644 --- a/stylesheets/_partials.sass +++ b/stylesheets/_partials.sass @@ -1,2 +1,3 @@ @import partials/twitter.sass -@import partials/search.sass
\ No newline at end of file +@import partials/search.sass +@import partials/sidebar.sass
\ No newline at end of file diff --git a/stylesheets/partials/_twitter.sass b/stylesheets/partials/_twitter.sass index 85a56aed..8752656c 100644 --- a/stylesheets/partials/_twitter.sass +++ b/stylesheets/partials/_twitter.sass @@ -4,13 +4,18 @@ background: #f8f8f8 border: 1px solid #eee padding: 5px 0 - p + ul + list-style-type: none + margin: 0 + li margin: 0 15px - padding: 12px 0 + padding: 10px 0 0 border-bottom: #ddd 1px dashed line-height: 1.625em &:last-child border-bottom: 0 + p + padding-bottom: 10px .pubdate color= !light_text font-size: 80% |