1. Made default layout more generic.

2. Added a page layout and improved html on post layout.
3. Improved flexibility of stylesheets for different layout types.
4. Collapsing sidebar now moves it to the bottom of the page and floats
content into columns.
5. Improved sharing settings, added Google plus one.

6 files changed, 31 insertions, 8 deletions

diff --git a/.themes/classic/source/_includes/asides/recent_posts.html b/.themes/classic/source/_includes/asides/recent_posts.html
index ad3c7cc0..1f100960 100644
--- a/.themes/classic/source/_includes/asides/recent_posts.html
+++ b/.themes/classic/source/_includes/asides/recent_posts.html
@@ -1,4 +1,3 @@
-{% if page.single and site.recent_posts %}
 <section>
   <h1>Recent Posts</h1>
   <ul id="recent_posts">
@@ -9,4 +8,3 @@
     {% endfor %}
   </ul>
 </section>
-{% endif %}
diff --git a/.themes/classic/source/_includes/google_plus_one.html b/.themes/classic/source/_includes/google_plus_one.html
new file mode 100644
index 00000000..b69ddaeb
--- /dev/null
+++ b/.themes/classic/source/_includes/google_plus_one.html
@@ -0,0 +1,9 @@
+{% if site.google_plus_one %}
+  <script type="text/javascript">
+    (function() {
+      var script = document.createElement('script'); script.type = 'text/javascript'; script.async = true;
+      script.src = 'https://apis.google.com/js/plusone.js';
+      var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(script, s);
+    })();
+  </script>
+{% endif %}
diff --git a/.themes/classic/source/_includes/head.html b/.themes/classic/source/_includes/head.html
index 7f2b0715..ff684edd 100644
--- a/.themes/classic/source/_includes/head.html
+++ b/.themes/classic/source/_includes/head.html
@@ -26,6 +26,8 @@
   <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"/>
+  {% include google_analytics.html %}
+  {% include google_plus_one.html %}
+  {% include twitter_sharing.html %}
 </head>
diff --git a/.themes/classic/source/_includes/sharing.html b/.themes/classic/source/_includes/sharing.html
index ad3112ee..7b074af5 100644
--- a/.themes/classic/source/_includes/sharing.html
+++ b/.themes/classic/source/_includes/sharing.html
@@ -1 +1,8 @@
-<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>
+<div class="sharing">
+  {% if site.twitter_tweet_button %}
+  <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>
+  {% endif %}
+  {% if site.google_plus_one %}
+  <g:plusone size="{{ site.google_plus_one_size }}"></g:plusone>
+  {% endif %}
+</div>
diff --git a/.themes/classic/source/_includes/sidebar.html b/.themes/classic/source/_includes/sidebar.html
index 0bce3c77..f2e07347 100644
--- a/.themes/classic/source/_includes/sidebar.html
+++ b/.themes/classic/source/_includes/sidebar.html
@@ -1,7 +1,3 @@
-<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 %}
diff --git a/.themes/classic/source/_includes/twitter_sharing.html b/.themes/classic/source/_includes/twitter_sharing.html
new file mode 100644
index 00000000..687e77de
--- /dev/null
+++ b/.themes/classic/source/_includes/twitter_sharing.html
@@ -0,0 +1,11 @@
+{% if site.twitter_follow_button or site.twitter_tweet_button %}
+  <script type="text/javascript">
+    (function(){
+      var twitterWidgets = document.createElement('script');
+      twitterWidgets.type = 'text/javascript';
+      twitterWidgets.async = true;
+      twitterWidgets.src = 'http://platform.twitter.com/widgets.js';
+      document.getElementsByTagName('head')[0].appendChild(twitterWidgets);
+    })();
+  </script>
+{% endif %}