Browse Source

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

unreleased_contents
B Mathis 15 years ago
parent
commit
24c5fedcbc
  1. 12
      README.markdown
  2. 7
      Rakefile
  3. 93
      source/_layouts/default.haml
  4. 9
      source/index.haml
  5. 10
      source/javascripts/twitter.js

12
README.markdown

@ -51,11 +51,12 @@ Kills the local web server process.
## Third Party Integration ## Third Party Integration
### Twitter ### 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 twitter_user: your_twitter_name
- Number of tweets to show show_replies: false
- Show Mentions (true/false) tweet_count: 3
### Disqus Comments ### 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: 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 ### 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/). 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 ## Style Configuration
### What you need to know ### 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. 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.

7
Rakefile

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

93
source/_layouts/default.haml

@ -1,8 +1,15 @@
--- ---
blog_title: My Octopress Blog blog_title: My Octopress Blog
full_url: full_url:
twitter_user: imathis
tweet_count: 4
show_replies: false
disqus_short_name:
google_site_search_id: google_site_search_id:
disqus_short_name: designenthusiast google_analytics: true
--- ---
!!! 1.1 Transitional !!! 1.1 Transitional
@ -15,19 +22,26 @@ disqus_short_name: designenthusiast
%meta(name="keywords" content="#{page.keywords}")/ %meta(name="keywords" content="#{page.keywords}")/
%link(href="/stylesheets/screen.css" rel="stylesheet" media="screen projection" type="text/css") %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") %link(href="/atom.xml" rel="alternate" title="#{page.blog_title}" type="application/atom+xml")
%script(src="/javascripts/mootools-yui-compressed.js" type="text/javascript") - if page.respond_to? :twitter_user
%script(src="/javascripts/mootools-1.2.4.2-more.js" type="text/javascript") :javascript
%script(src="/javascripts/twitter.js" type="text/javascript") var twitter_user = "#{page.twitter_user}"
%script(src="http://www.google-analytics.com/ga.js" type="text/javascript") 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 %body
#header #header
.page_width .page_width
%a.title(href="/")=page.blog_title %a.title(href="/")=page.blog_title
#search - if page.respond_to? :google_site_search_id
%form(action="http://www.google.com/cse" id="cse-search-box") #search
%input(type="hidden" name="cx" value="#{page.google_site_search_id}") %form(action="http://www.google.com/cse" id="cse-search-box")
%input(type="hidden" name="ie" value="UTF-8") %input(type="hidden" name="cx" value="#{page.google_site_search_id}")
%input#q(type="text" name="q") %input(type="hidden" name="ie" value="UTF-8")
%input#q(type="text" name="q")
#nav #nav
.page_width .page_width
%ul %ul
@ -46,38 +60,43 @@ disqus_short_name: designenthusiast
%p.pubdate %p.pubdate
Published: Published:
=page.date.strftime("%d %b, %Y") =page.date.strftime("%d %b, %Y")
#disqus_thread - if page.respond_to? :disqus_short_name
:javascript #disqus_thread
var disqus_developer = true; :javascript
var disqus_url = "#{page.full_url}/#{page.url}"; var disqus_developer = true;
%noscript var disqus_url = "#{page.full_url}/#{page.url}";
%a(href="http://designenthusiast.disqus.com/?url=ref") View the discussion thread %noscript
%script(type="text/javascript" src="http://disqus.com/forums/#{page.disqus_short_name}/embed.js") %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 - else
= content = content
#sidebar #sidebar
#twitter - if page.respond_to? :twitter_user
#twitter_status %h4 @#{page.twitter_user}
Status updating... #twitter
#twitter_status
Status updating...
#footer #footer
.page_width .page_width
= "Copyright &copy; #{Time.now.strftime('%Y')} - #{page.blog_title} | " = "Copyright &copy; #{Time.now.strftime('%Y')} - #{page.blog_title} | "
%span.credit Powered by <a href="http://github.com/imathis/octopress/">Octopress</a> %span.credit Powered by <a href="http://github.com/imathis/octopress/">Octopress</a>
//Disqus Commens code - if page.respond_to? :disqus_short_name
:javascript //Disqus Commens code
/*(function() { :javascript
var links = document.getElementsByTagName('a'); (function() {
var query = '?'; var links = document.getElementsByTagName('a');
for(var i = 0; i < links.length; i++) { var query = '?';
if(links[i].href.indexOf('#disqus_thread') >= 0) { for(var i = 0; i < links.length; i++) {
query += 'url' + i + '=' + encodeURIComponent(links[i].href) + '&'; 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>');
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 //Google Analytics code
:javascript :javascript
try { try {
var pageTracker = _gat._getTracker("UA-10876422-1"); var pageTracker = _gat._getTracker("UA-10876422-1");
pageTracker._trackPageview(); pageTracker._trackPageview();
} catch(err) {} } catch(err) {}

9
source/index.haml

@ -8,9 +8,10 @@ title: Blog
%h2= link_to(post.title, post.url, {:class=>"title"}) %h2= link_to(post.title, post.url, {:class=>"title"})
= post.content = post.content
.footer .footer
- if post.data["comments_off"] - if page.respond_to? :disqus_short_name
%em.comments_off Comments disabled - if post.data["comments_off"]
- else %em.comments_off Comments disabled
%a(href="#{post.url}/#disqus_thread")Comments - else
%a(href="#{post.url}/#disqus_thread")Comments
.footer .footer
%a(href="/archives.html" title="archives") &laquo; Blog Archives %a(href="/archives.html" title="archives") &laquo; Blog Archives

10
source/javascripts/twitter.js

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

Loading…
Cancel
Save