From 24c5fedcbca655b0d2c32ccba7a63357daab7d05 Mon Sep 17 00:00:00 2001 From: B Mathis Date: Sat, 7 Nov 2009 12:05:10 -0600 Subject: udpated thirdparty integration, it is now conditionally added, updated readme --- source/_layouts/default.haml | 93 ++++++++++++++++++++++++++------------------ 1 file changed, 56 insertions(+), 37 deletions(-) (limited to 'source/_layouts/default.haml') 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 Octopress - //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('