Moved themes to .themes to get it out of the way. Updated Rakefile to support .themes dir and remove duplication. Improved deploy task. Renamed init_deploy to cofig_deploy and rewrote it to update configurations in the Rakefile for easier deploy use

17 files changed, 212 insertions, 0 deletions

diff --git a/.themes/classic/source/_includes/archive_post.html b/.themes/classic/source/_includes/archive_post.html
new file mode 100644
index 00000000..cd55c212
--- /dev/null
+++ b/.themes/classic/source/_includes/archive_post.html
@@ -0,0 +1,8 @@
+{% capture category %}{{ post.categories | size }}{% endcapture %}
+<h1><a href="{{ post.url }}">{{post.title}}</a></h1>
+<time datetime="{{ post.date | datetime }}" pubdate>{{ post.date | date: "<span class='month'>%b</span> <span class='day'>%d</span> <span class='year'>%Y</span>"}}</time>
+{% if category != '0' %}
+<footer>
+  <span class="categories">posted in {{ post.categories | category_links }}</span>
+</footer>
+{% endif %}
diff --git a/.themes/classic/source/_includes/article.html b/.themes/classic/source/_includes/article.html
new file mode 100644
index 00000000..b458d732
--- /dev/null
+++ b/.themes/classic/source/_includes/article.html
@@ -0,0 +1,25 @@
+{% unless page.no_header %}
+  <header>
+    {% if index %}
+      <h1 class="entry-title"><a href="{{ post.url }}">{{ post.title | titlecase }}</a></h1>
+    {% else %}
+      <h1 class="entry-title">{{ page.title | titlecase }}</h1>
+    {% endif %}
+    {% unless page.no_meta or !index %}<p class="meta">{% include post_date.html %}</p>{% endunless %}
+  </header>
+{% endunless %}
+{% if index %}
+  <div class="entry-content">{{ content | exerpt | smart_quotes }}</div>
+  <p><a rel="full-article" href="{{ post.url }}">Read on &rarr;</a></p>
+  <footer>
+    <p class="meta">
+      {% include post_author.html %}
+      {% include post_date.html %}
+      {% include post_categories.html %}
+      <span class="comments"><a rel="comments" href="{{ post.url }}#disqus_thread">Comments</a></span>
+      {% include sharing.html %}
+    </p>
+  </footer>
+{% else %}
+<div class="entry-content">{{ content | smart_quotes }}</div>
+{% endif %}
diff --git a/.themes/classic/source/_includes/asides/delicious.html b/.themes/classic/source/_includes/asides/delicious.html
new file mode 100644
index 00000000..307a2e94
--- /dev/null
+++ b/.themes/classic/source/_includes/asides/delicious.html
@@ -0,0 +1,7 @@
+{% if site.delicious_user %}
+<section>
+  <h1>On Delicious</h1>
+  <script type="text/javascript" src="http://feeds.delicious.com/v2/js/{{ site.delicious_user }}?title=&count={{ site.delicious_count }}&sort=date&extended"></script>
+  <p><a href="http://delicious.com/{{ site.delicious_user }}">My Delicious Bookmarks &raquo;</a></p>
+</section>
+{% endif %}
diff --git a/.themes/classic/source/_includes/asides/pinboard.html b/.themes/classic/source/_includes/asides/pinboard.html
new file mode 100644
index 00000000..1cbb1379
--- /dev/null
+++ b/.themes/classic/source/_includes/asides/pinboard.html
@@ -0,0 +1,19 @@
+{% if site.pinboard_user %}
+<section>
+  <h1>My Pinboard</h1>
+  <ul id="pinboard_linkroll">Fetching linkroll...</ul>
+  <p><a href="http://pinboard.in/u:{{ site.pinboard_user }}">My Pinboard Bookmarks &raquo;</a></p>
+</section>
+<script type="text/javascript">
+  var linkroll = 'pinboard_linkroll'; //id target for pinboard list
+  var pinboard_user = "{{ site.pinboard_user }}"; //id target for pinboard list
+  var pinboard_count = {{ site.pinboard_count }}; //id target for pinboard list
+  (function(){
+    var pinboardInit = document.createElement('script');
+    pinboardInit.type = 'text/javascript';
+    pinboardInit.async = true;
+    pinboardInit.src = '/javascripts/pinboard.js';
+    document.getElementsByTagName('head')[0].appendChild(pinboardInit);
+  })();
+</script>
+{% endif %}
diff --git a/.themes/classic/source/_includes/asides/recent_posts.html b/.themes/classic/source/_includes/asides/recent_posts.html
new file mode 100644
index 00000000..ad3c7cc0
--- /dev/null
+++ b/.themes/classic/source/_includes/asides/recent_posts.html
@@ -0,0 +1,12 @@
+{% if page.single and site.recent_posts %}
+<section>
+  <h1>Recent Posts</h1>
+  <ul id="recent_posts">
+    {% for post in site.posts limit: site.recent_posts %}
+      <li class="post">
+        <a href="{{ post.url }}">{{ post.title }}</a>
+      </li>
+    {% endfor %}
+  </ul>
+</section>
+{% endif %}
diff --git a/.themes/classic/source/_includes/asides/twitter.html b/.themes/classic/source/_includes/asides/twitter.html
new file mode 100644
index 00000000..15cab8bc
--- /dev/null
+++ b/.themes/classic/source/_includes/asides/twitter.html
@@ -0,0 +1,19 @@
+{% if site.twitter_user %}
+<section>
+  <h1>Latest Tweets</h1>
+  <ul id="tweets">
+    <li class="loading">Status updating...</li>
+  </ul>
+  <script type="text/javascript">
+    $.domReady(function(){
+      getTwitterFeed("{{site.twitter_user}}", {{site.twitter_tweet_count}}, {{site.twitter_show_replies}});
+    });
+  </script>
+  <script src="/javascripts/twitter.js" type="text/javascript"> </script>
+  {% if site.twitter_follow_button %}
+    <a href="http://twitter.com/{{ site.twitter_user }}" class="twitter-follow-button" data-width="208px" data-show-count="{{ site.twitter_show_follower_count }}">Follow @{{ site.twitter_user }}</a>
+  {% else %}
+    <p>Follow <a href="http://twitter.com/{{site.twitter_user}}">@{{ site.twitter_user }}</a></p>
+  {% endif %}
+</section>
+{% endif %}
diff --git a/.themes/classic/source/_includes/disqus_thread.html b/.themes/classic/source/_includes/disqus_thread.html
new file mode 100644
index 00000000..f966f03a
--- /dev/null
+++ b/.themes/classic/source/_includes/disqus_thread.html
@@ -0,0 +1,13 @@
+<div id="disqus_thread"></div>
+<script type="text/javascript">
+  var disqus_shortname = '{{ site.disqus_short_name }}';
+  var disqus_identifier = '{{ site.url }}{{ page.url }}';
+  var disqus_url = '{{ site.url }}{{ page.url }}';
+  //var disqus_developer = 1;
+  (function() {
+    var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
+    dsq.src = 'http://' + disqus_shortname + '.disqus.com/embed.js';
+    (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
+  })();
+</script>
+<noscript>Please enable JavaScript to view the <a href="http://disqus.com/?ref_noscript">comments powered by Disqus.</a></noscript>
diff --git a/.themes/classic/source/_includes/footer.html b/.themes/classic/source/_includes/footer.html
new file mode 100644
index 00000000..e12f0678
--- /dev/null
+++ b/.themes/classic/source/_includes/footer.html
@@ -0,0 +1,4 @@
+<p>
+  Copyright &copy; {{ site.time | date: "%Y" }} - {{ site.author }} -
+  <span class="credit">Powered by <a href="http://octopress.org">Octopress</a></span>
+</p>
diff --git a/.themes/classic/source/_includes/google_analytics.html b/.themes/classic/source/_includes/google_analytics.html
new file mode 100644
index 00000000..4d4d5969
--- /dev/null
+++ b/.themes/classic/source/_includes/google_analytics.html
@@ -0,0 +1,13 @@
+{% if site.google_analytics_tracking_id %}
+  <script type="text/javascript">
+    var _gaq = _gaq || [];
+    _gaq.push(['_setAccount', '{{ site.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';
+      var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
+    })();
+  </script>
+{% endif %}
diff --git a/.themes/classic/source/_includes/head.html b/.themes/classic/source/_includes/head.html
new file mode 100644
index 00000000..a4eec3d3
--- /dev/null
+++ b/.themes/classic/source/_includes/head.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!--[if IEMobile 7 ]><html class="no-js iem7" manifest="default.appcache?v=1"><![endif]-->
+<!--[if lt IE 9]><html class="no-js lte-ie8"><![endif]-->
+<!--[if (gt IE 8)|(gt IEMobile 7)|!(IEMobile)|!(IE)]><!--><html class="no-js" manifest="default.appcache?v=1" lang="en"><!--<![endif]-->
+<head>
+  <meta charset="utf-8">
+  {% if page.title %}
+    <title>{{site.title}}: {{page.title}}{% if site.author %} - {{ site.author }}{% endif %}</title>
+  {% else %}
+    <title>{{site.title}}{% if site.author %} - {{ site.author }}{% endif %}</title>
+  {% endif %}
+  <meta name="author" content="{{site.author}}">
+  {% if page.description %}
+    <meta name="description" content="{{page.description}}"/>
+  {% endif %}
+
+  <!-- http://t.co/dKP3o1e -->
+  <meta name="HandheldFriendly" content="True">
+  <meta name="MobileOptimized" content="320">
+  <meta name="viewport" content="width=device-width, initial-scale=1">
+
+  {% if page.keywords %}
+    <meta name="keywords" content="{{page.keywords}}"/>
+  {% endif %}
+
+  <link href="/images/favicon.png" rel="shortcut icon" />
+  <link href="/stylesheets/screen.css" media="screen, projection" rel="stylesheet" type="text/css">
+  <script src="/javascripts/modernizr-2.0.js"></script>
+  <script src="http://s3.amazonaws.com/ender-js/jeesh.min.js"></script>
+  <script src="/javascripts/octopress.js" type="text/javascript"></script>
+  <link href='http://fonts.googleapis.com/css?family=PT+Serif:regular,italic,bold,bolditalic' rel='stylesheet' type='text/css'>
+  <link href='http://fonts.googleapis.com/css?family=PT+Sans:regular,italic,bold,bolditalic' rel='stylesheet' type='text/css'>
+  {% include google_analytics.html %}
+  <link href="/atom.xml" rel="alternate" title="{{site.title}}" type="application/atom+xml"/>
+</head>
diff --git a/.themes/classic/source/_includes/header.html b/.themes/classic/source/_includes/header.html
new file mode 100644
index 00000000..de153086
--- /dev/null
+++ b/.themes/classic/source/_includes/header.html
@@ -0,0 +1,6 @@
+<hgroup>
+  <h1><a href="/">{{ site.title }}</a></h1>
+  {% if site.subtitle %}
+    <h2>{{ site.subtitle }}</h2>
+  {% endif %}
+</hgroup>
diff --git a/.themes/classic/source/_includes/navigation.html b/.themes/classic/source/_includes/navigation.html
new file mode 100644
index 00000000..e2827983
--- /dev/null
+++ b/.themes/classic/source/_includes/navigation.html
@@ -0,0 +1,16 @@
+<ul role="subscription" data-subscription="rss{% if site.subscribe_email %} email{% endif %}">
+  <li><a href="{{ site.subscribe_rss }}" rel="subscribe-rss" title="subscribe via RSS">RSS</a></li>
+  {% if site.subscribe_email %}
+    <li><a href="{{ site.subscribe_email }}" rel="subscribe-email" title="subscribe via email">Email</a></li>
+  {% endif %}
+</ul>
+<form action="{{ site.simple_search }}" method="get">
+  <fieldset role="site-search">
+    <input type="hidden" name="q" value="site:{{ site.url | search_url }}" />
+    <input class="search" type="text" name="q" results="0" placeholder="Search"/>
+  </fieldset>
+</form>
+<ul role="main-nav">
+  <li><a href="/">Blog</a></li>
+  <li><a href="/archives.html">Archives</a></li>
+</ul>
diff --git a/.themes/classic/source/_includes/post_author.html b/.themes/classic/source/_includes/post_author.html
new file mode 100644
index 00000000..b2db9043
--- /dev/null
+++ b/.themes/classic/source/_includes/post_author.html
@@ -0,0 +1,6 @@
+{% if post.author %}
+  {% assign author = post.author %}
+{% else %}
+  {% assign author = site.author %}
+{% endif %}
+{% if author %}<span class="byline author vcard">Posted by <span class="fn">{{ author }}</span></span>{% endif %}
diff --git a/.themes/classic/source/_includes/post_categories.html b/.themes/classic/source/_includes/post_categories.html
new file mode 100644
index 00000000..7bf7528f
--- /dev/null
+++ b/.themes/classic/source/_includes/post_categories.html
@@ -0,0 +1,10 @@
+{% capture category %}{% if post %}{{ post.categories | category_links | size }}{% else %}{{ page.categories | category_links | size }}{% endif %}{% endcapture %}
+{% unless category == '0' %}
+<span class="categories"> in
+  {% if post %}
+    {{ post.categories | category_links }}
+  {% else %}
+    {{ page.categories | category_links }}
+  {% endif %}
+</span>
+{% endunless %}
diff --git a/.themes/classic/source/_includes/post_date.html b/.themes/classic/source/_includes/post_date.html
new file mode 100644
index 00000000..f1ed4815
--- /dev/null
+++ b/.themes/classic/source/_includes/post_date.html
@@ -0,0 +1,10 @@
+{% capture date %}{{ page.date }}{{ post.date }}{% endcapture %}
+{% capture has_date %}{{ date | size }}{% endcapture %}
+{% capture updated %}{{ page.updated }}{{ post.updated }}{% endcapture %}
+{% capture was_updated %}{{ updated | size }}{% endcapture %}
+{% if has_date != '0' %}
+<time datetime="{{ date | datetime }}" pubdate {% if updated %} updated {% endif %}>{{ date | ordinalize }}</time>
+{% endif %}
+{% if was_updated != '0' %}
+<time class="updated" datetime="{{ updated | datetime }}"></time>
+{% endif %}
diff --git a/.themes/classic/source/_includes/sharing.html b/.themes/classic/source/_includes/sharing.html
new file mode 100644
index 00000000..ad3112ee
--- /dev/null
+++ b/.themes/classic/source/_includes/sharing.html
@@ -0,0 +1 @@
+<a href="http://twitter.com/share" class="twitter-share-button" data-url="{{ site.url }}{{ page.url }}" data-via="{{ site.twitter_user }}" data-counturl="{{ site.url }}{{ page.url }}" >Tweet</a>
diff --git a/.themes/classic/source/_includes/sidebar.html b/.themes/classic/source/_includes/sidebar.html
new file mode 100644
index 00000000..0bce3c77
--- /dev/null
+++ b/.themes/classic/source/_includes/sidebar.html
@@ -0,0 +1,8 @@
+<section>
+  <h1>About Me</h1>
+  <p>Hi, I'm Octopress!</p>
+</section>
+{% include asides/recent_posts.html %}
+{% include asides/twitter.html %}
+{% include asides/delicious.html %}
+{% include asides/pinboard.html %}