From e4c2d5790bac6a74037638fde049c374fc44cc7b Mon Sep 17 00:00:00 2001 From: Brandon Mathis Date: Sun, 17 Apr 2011 22:49:30 -0500 Subject: irrisponsibly massive commit --- source/_includes/article.html | 18 ++++++++++++++++++ source/_includes/delicious.haml | 3 --- source/_includes/delicious.html | 3 +++ source/_includes/disqus_hook.haml | 11 ----------- source/_includes/disqus_thread.haml | 5 ----- source/_includes/disqus_thread.html | 7 +++++++ source/_includes/footer.haml | 7 ------- source/_includes/footer.html | 11 +++++++++++ source/_includes/google_analytics.haml | 10 ---------- source/_includes/google_analytics.html | 12 ++++++++++++ source/_includes/head.haml | 22 ---------------------- source/_includes/head.html | 28 ++++++++++++++++++++++++++++ source/_includes/header.haml | 9 --------- source/_includes/header.html | 10 ++++++++++ source/_includes/navigation.haml | 8 -------- source/_includes/navigation.html | 5 +++++ source/_includes/pinboard.html | 3 +++ source/_includes/post.haml | 8 -------- source/_includes/sidebar.haml | 2 -- source/_includes/sidebar.html | 24 ++++++++++++++++++++++++ source/_includes/twitter.haml | 4 ---- source/_includes/twitter.html | 5 +++++ 22 files changed, 126 insertions(+), 89 deletions(-) create mode 100644 source/_includes/article.html delete mode 100644 source/_includes/delicious.haml create mode 100644 source/_includes/delicious.html delete mode 100644 source/_includes/disqus_hook.haml delete mode 100644 source/_includes/disqus_thread.haml create mode 100644 source/_includes/disqus_thread.html delete mode 100644 source/_includes/footer.haml create mode 100644 source/_includes/footer.html delete mode 100644 source/_includes/google_analytics.haml create mode 100644 source/_includes/google_analytics.html delete mode 100644 source/_includes/head.haml create mode 100644 source/_includes/head.html delete mode 100644 source/_includes/header.haml create mode 100644 source/_includes/header.html delete mode 100644 source/_includes/navigation.haml create mode 100644 source/_includes/navigation.html create mode 100644 source/_includes/pinboard.html delete mode 100644 source/_includes/post.haml delete mode 100644 source/_includes/sidebar.haml create mode 100644 source/_includes/sidebar.html delete mode 100644 source/_includes/twitter.haml create mode 100644 source/_includes/twitter.html (limited to 'source/_includes') diff --git a/source/_includes/article.html b/source/_includes/article.html new file mode 100644 index 00000000..aa7f8194 --- /dev/null +++ b/source/_includes/article.html @@ -0,0 +1,18 @@ +
+

+ + {% if site.author or site.author == page.author %} + by {{ site.author }} + {% elsif page.author %} + by {{ page.author }} + {% endif %} +

+

{{ page.title }}

+
+{% if index %} +
{{ content | exerpt(content, page.url, 'Continue reading »') | smart_quotes }}
+{% else %} +
{{ content | smart_quotes }}
+{% endif %} + +{% if page.updated %}

updated

{% endif %} diff --git a/source/_includes/delicious.haml b/source/_includes/delicious.haml deleted file mode 100644 index 6f1d63d0..00000000 --- a/source/_includes/delicious.haml +++ /dev/null @@ -1,3 +0,0 @@ -%h4 My Delicious more → -#delicious - %script(type="text/javascript" src="http://feeds.delicious.com/v2/js/#{page.delicious_user}?title=&count=#{page.delicious_count}&sort=date&extended") \ No newline at end of file diff --git a/source/_includes/delicious.html b/source/_includes/delicious.html new file mode 100644 index 00000000..8e97b0fd --- /dev/null +++ b/source/_includes/delicious.html @@ -0,0 +1,3 @@ +

On Delicious

+ +

My Delicious Bookmarks »

diff --git a/source/_includes/disqus_hook.haml b/source/_includes/disqus_hook.haml deleted file mode 100644 index 60e2d3d9..00000000 --- a/source/_includes/disqus_hook.haml +++ /dev/null @@ -1,11 +0,0 @@ -: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(' + + diff --git a/source/_includes/footer.haml b/source/_includes/footer.haml deleted file mode 100644 index 99870db8..00000000 --- a/source/_includes/footer.haml +++ /dev/null @@ -1,7 +0,0 @@ -#footer - .content - Copyright © #{Time.now.strftime('%Y')} - #{page.blog_title} - - %span.credit Powered by Octopress - -= include "disqus_hook.haml" if page.respond_to?(:disqus_short_name) && page.disqus_short_name -= include "google_analytics.haml" if page.respond_to?(:google_analytics_tracking_id) && page.google_analytics_tracking_id \ No newline at end of file diff --git a/source/_includes/footer.html b/source/_includes/footer.html new file mode 100644 index 00000000..de560edc --- /dev/null +++ b/source/_includes/footer.html @@ -0,0 +1,11 @@ +

+ Copyright © {{ site.time | date: "%Y" }} - {{ site.author }} - + Powered by Octopress +

+{% if site.pinboard_user %} + + +{% endif %} diff --git a/source/_includes/google_analytics.haml b/source/_includes/google_analytics.haml deleted file mode 100644 index a61ec89b..00000000 --- a/source/_includes/google_analytics.haml +++ /dev/null @@ -1,10 +0,0 @@ -:javascript - var _gaq = _gaq || []; - _gaq.push(['_setAccount', '#{page.google_analytics_tracking_id}']); - _gaq.push(['_trackPageview']); - - (function() { - var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true; - ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js'; - (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(ga); - })(); \ No newline at end of file diff --git a/source/_includes/google_analytics.html b/source/_includes/google_analytics.html new file mode 100644 index 00000000..b659a634 --- /dev/null +++ b/source/_includes/google_analytics.html @@ -0,0 +1,12 @@ + + diff --git a/source/_includes/head.haml b/source/_includes/head.haml deleted file mode 100644 index 75b652c8..00000000 --- a/source/_includes/head.haml +++ /dev/null @@ -1,22 +0,0 @@ -%head - %title #{page.blog_title} :: #{page.title} - %meta(http-equiv="Content-Type" content="text/html; charset=utf-8") - - if page.respond_to? :description - %meta(name="description" content="#{page.description}")/ - - if page.respond_to? :keywords - %meta(name="keywords" content="#{page.keywords}")/ - %link(href="/stylesheets/screen.css" media="screen, projection" rel="stylesheet" type="text/css") - %script(src="http://ajax.googleapis.com/ajax/libs/mootools/1.2.4/mootools-yui-compressed.js" type="text/javascript") - %script(src="/javascripts/mootools-1.2.4.2-more.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/octopress.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") - - - # RSS Feed - %link(href="/atom.xml" rel="alternate" title="#{page.blog_title}" type="application/atom+xml") \ No newline at end of file diff --git a/source/_includes/head.html b/source/_includes/head.html new file mode 100644 index 00000000..4a3fb31c --- /dev/null +++ b/source/_includes/head.html @@ -0,0 +1,28 @@ + + {{page.title}} - {{site.title}} + + {% if page.description %} + + {% endif %} + {% if page.keywords %} + + {% endif %} + + + + + + + {% if site.twitter_user %} + + + {% endif %} + {% if site.google_analytics_tracking_id %} + {% include google_analytics.html %} + {% endif %} + + diff --git a/source/_includes/header.haml b/source/_includes/header.haml deleted file mode 100644 index f4b821f9..00000000 --- a/source/_includes/header.haml +++ /dev/null @@ -1,9 +0,0 @@ -.content - %h1 - %a.title(href="/")=page.blog_title - - if page.respond_to?(:google_custom_search_id) && page.google_custom_search_id - #search - %form(action="http://www.google.com/cse" id="cse-search-box") - %input(type="hidden" name="cx" value="#{page.google_custom_search_id}") - %input(type="hidden" name="ie" value="UTF-8") - %input#q(type="text" name="q") \ No newline at end of file diff --git a/source/_includes/header.html b/source/_includes/header.html new file mode 100644 index 00000000..4c35d0b8 --- /dev/null +++ b/source/_includes/header.html @@ -0,0 +1,10 @@ +

{{ site.title }}

+{% if site.google_custom_search_id && site.google_custom_search_id %} + +{% endif %} diff --git a/source/_includes/navigation.haml b/source/_includes/navigation.haml deleted file mode 100644 index 8ee0bfe9..00000000 --- a/source/_includes/navigation.haml +++ /dev/null @@ -1,8 +0,0 @@ -.content - %ul - %li.alpha - %a(href="/") Blog - %li.omega - %a(href="/about.html") About - %li.subscribe - %a(href="/atom.xml") Subscribe \ No newline at end of file diff --git a/source/_includes/navigation.html b/source/_includes/navigation.html new file mode 100644 index 00000000..97d95938 --- /dev/null +++ b/source/_includes/navigation.html @@ -0,0 +1,5 @@ + diff --git a/source/_includes/pinboard.html b/source/_includes/pinboard.html new file mode 100644 index 00000000..602645c5 --- /dev/null +++ b/source/_includes/pinboard.html @@ -0,0 +1,3 @@ +

My Pinboard

+ +

My Pinboard Bookmarks »

diff --git a/source/_includes/post.haml b/source/_includes/post.haml deleted file mode 100644 index b51b99f5..00000000 --- a/source/_includes/post.haml +++ /dev/null @@ -1,8 +0,0 @@ -.article - %h2= page.title - .meta - - author = (page.respond_to?(:author) && page.author) ? 'by: ' + page.author + ' |' : '' - #{author} posted: #{page.date.strftime("%B #{page.date.day.ordinalize}, %Y")} - = (page.respond_to?(:updated) && page.updated) ? " | updated: #{page.updated}" : '' - = preserve rp(content) - #disqus_thread= include "disqus_thread.haml" if page.respond_to?(:disqus_short_name) && page.disqus_short_name diff --git a/source/_includes/sidebar.haml b/source/_includes/sidebar.haml deleted file mode 100644 index 463e353f..00000000 --- a/source/_includes/sidebar.haml +++ /dev/null @@ -1,2 +0,0 @@ -= include "twitter.haml" if page.respond_to?(:twitter_user) && page.twitter_user -= include "delicious.haml" if page.respond_to?(:delicious_user) && page.delicious_user \ No newline at end of file diff --git a/source/_includes/sidebar.html b/source/_includes/sidebar.html new file mode 100644 index 00000000..86f659b5 --- /dev/null +++ b/source/_includes/sidebar.html @@ -0,0 +1,24 @@ +

About Me

+

Yo everybody!

+{% if site.recent_posts %} +
+

Recent Posts

+ +
+{% endif %} +{% if site.twitter_user %} +
{% include twitter.html %}
+{% endif %} +{% if site.delicious_user %} +
{% include delicious.html %}
+{% endif %} +{% if site.pinboard_user %} +
{% include pinboard.html %}
+{% endif %} diff --git a/source/_includes/twitter.haml b/source/_includes/twitter.haml deleted file mode 100644 index 852bb068..00000000 --- a/source/_includes/twitter.haml +++ /dev/null @@ -1,4 +0,0 @@ -%h4 Twitter @#{page.twitter_user} -#twitter - %ul#twitter_status - Status updating... \ No newline at end of file diff --git a/source/_includes/twitter.html b/source/_includes/twitter.html new file mode 100644 index 00000000..4d688480 --- /dev/null +++ b/source/_includes/twitter.html @@ -0,0 +1,5 @@ +

On Twitter

+ +

Follow @{{ site.twitter_user }}

-- cgit v1.2.1