From 318e348163dc39297dff960fdb01886c8cfe2bd3 Mon Sep 17 00:00:00 2001
From: Brandon Mathis <brandon@imathis.com>
Date: Sat, 16 Jun 2012 17:17:33 -0500
Subject: [PATCH] Removed include_array plugin, replaced it with
 include_sidebar plugin and reorganized sidebars

---
 .../source/_includes/asides/googleplus.html   | 11 ----
 .../source/_includes/custom/asides/about.html |  4 --
 .../sidebars/blog_index_default.html          |  4 ++
 .../_includes/sidebars/page_default.html      |  5 ++
 .../_includes/sidebars/post_default.html      |  5 ++
 .../sections}/delicious.html                  |  0
 .../{asides => sidebars/sections}/github.html |  0
 .../sidebars/sections/google_plus.html        |  6 ++
 .../sections}/pinboard.html                   |  0
 .../sections}/recent_posts.html               |  0
 .../sections}/twitter.html                    |  0
 .themes/classic/source/_layouts/page.html     | 14 ++---
 .themes/classic/source/_layouts/post.html     | 12 ++--
 .themes/classic/source/index.html             | 12 ++--
 _config.yml                                   | 19 +++---
 plugins/include_array.rb                      | 58 -------------------
 plugins/include_sidebar.rb                    | 24 ++++++++
 17 files changed, 72 insertions(+), 102 deletions(-)
 delete mode 100644 .themes/classic/source/_includes/asides/googleplus.html
 delete mode 100644 .themes/classic/source/_includes/custom/asides/about.html
 create mode 100644 .themes/classic/source/_includes/sidebars/blog_index_default.html
 create mode 100644 .themes/classic/source/_includes/sidebars/page_default.html
 create mode 100644 .themes/classic/source/_includes/sidebars/post_default.html
 rename .themes/classic/source/_includes/{asides => sidebars/sections}/delicious.html (100%)
 rename .themes/classic/source/_includes/{asides => sidebars/sections}/github.html (100%)
 create mode 100644 .themes/classic/source/_includes/sidebars/sections/google_plus.html
 rename .themes/classic/source/_includes/{asides => sidebars/sections}/pinboard.html (100%)
 rename .themes/classic/source/_includes/{asides => sidebars/sections}/recent_posts.html (100%)
 rename .themes/classic/source/_includes/{asides => sidebars/sections}/twitter.html (100%)
 delete mode 100644 plugins/include_array.rb
 create mode 100644 plugins/include_sidebar.rb

diff --git a/.themes/classic/source/_includes/asides/googleplus.html b/.themes/classic/source/_includes/asides/googleplus.html
deleted file mode 100644
index 00a0aa8..0000000
--- a/.themes/classic/source/_includes/asides/googleplus.html
+++ /dev/null
@@ -1,11 +0,0 @@
-{% if site.googleplus_user %}
-<section class="googleplus{% if site.googleplus_hidden %} googleplus-hidden{% endif %}">
-  <h1>
-    <a href="https://plus.google.com/{{ site.googleplus_user }}?rel=author">
-      <img src="http://www.google.com/images/icons/ui/gprofile_button-32.png" width="32" height="32">
-      Google+
-    </a>
-  </h1>
-</section>
-{% endif %}
-
diff --git a/.themes/classic/source/_includes/custom/asides/about.html b/.themes/classic/source/_includes/custom/asides/about.html
deleted file mode 100644
index 59d309e..0000000
--- a/.themes/classic/source/_includes/custom/asides/about.html
+++ /dev/null
@@ -1,4 +0,0 @@
-<section>
-  <h1>About Me</h1>
-  <p>A little something about me.</p>
-</section>
diff --git a/.themes/classic/source/_includes/sidebars/blog_index_default.html b/.themes/classic/source/_includes/sidebars/blog_index_default.html
new file mode 100644
index 0000000..8e90a22
--- /dev/null
+++ b/.themes/classic/source/_includes/sidebars/blog_index_default.html
@@ -0,0 +1,4 @@
+{% include sidebars/sections/twitter.html %}
+{% include sidebars/sections/delicious.html %}
+{% include sidebars/sections/pinboard.html %}
+{% include sidebars/sections/google_plus.html %}
diff --git a/.themes/classic/source/_includes/sidebars/page_default.html b/.themes/classic/source/_includes/sidebars/page_default.html
new file mode 100644
index 0000000..1d91fc8
--- /dev/null
+++ b/.themes/classic/source/_includes/sidebars/page_default.html
@@ -0,0 +1,5 @@
+{% include sidebars/sections/recent_posts.html %}
+{% include sidebars/sections/twitter.html %}
+{% include sidebars/sections/delicious.html %}
+{% include sidebars/sections/pinboard.html %}
+{% include sidebars/sections/google_plus.html %}
diff --git a/.themes/classic/source/_includes/sidebars/post_default.html b/.themes/classic/source/_includes/sidebars/post_default.html
new file mode 100644
index 0000000..1d91fc8
--- /dev/null
+++ b/.themes/classic/source/_includes/sidebars/post_default.html
@@ -0,0 +1,5 @@
+{% include sidebars/sections/recent_posts.html %}
+{% include sidebars/sections/twitter.html %}
+{% include sidebars/sections/delicious.html %}
+{% include sidebars/sections/pinboard.html %}
+{% include sidebars/sections/google_plus.html %}
diff --git a/.themes/classic/source/_includes/asides/delicious.html b/.themes/classic/source/_includes/sidebars/sections/delicious.html
similarity index 100%
rename from .themes/classic/source/_includes/asides/delicious.html
rename to .themes/classic/source/_includes/sidebars/sections/delicious.html
diff --git a/.themes/classic/source/_includes/asides/github.html b/.themes/classic/source/_includes/sidebars/sections/github.html
similarity index 100%
rename from .themes/classic/source/_includes/asides/github.html
rename to .themes/classic/source/_includes/sidebars/sections/github.html
diff --git a/.themes/classic/source/_includes/sidebars/sections/google_plus.html b/.themes/classic/source/_includes/sidebars/sections/google_plus.html
new file mode 100644
index 0000000..57d3e00
--- /dev/null
+++ b/.themes/classic/source/_includes/sidebars/sections/google_plus.html
@@ -0,0 +1,6 @@
+{% if site.google_plus_user %}
+  <a href="https://plus.google.com/{{ site.google_plus_user }}?rel=author">
+    <img src="https://ssl.gstatic.com/images/icons/gplus-{{ site.google_plus_image_size}}.png" alt="Google Plus icon">
+  </a>
+{% endif %}
+
diff --git a/.themes/classic/source/_includes/asides/pinboard.html b/.themes/classic/source/_includes/sidebars/sections/pinboard.html
similarity index 100%
rename from .themes/classic/source/_includes/asides/pinboard.html
rename to .themes/classic/source/_includes/sidebars/sections/pinboard.html
diff --git a/.themes/classic/source/_includes/asides/recent_posts.html b/.themes/classic/source/_includes/sidebars/sections/recent_posts.html
similarity index 100%
rename from .themes/classic/source/_includes/asides/recent_posts.html
rename to .themes/classic/source/_includes/sidebars/sections/recent_posts.html
diff --git a/.themes/classic/source/_includes/asides/twitter.html b/.themes/classic/source/_includes/sidebars/sections/twitter.html
similarity index 100%
rename from .themes/classic/source/_includes/asides/twitter.html
rename to .themes/classic/source/_includes/sidebars/sections/twitter.html
diff --git a/.themes/classic/source/_layouts/page.html b/.themes/classic/source/_layouts/page.html
index b610c0b..1e7802e 100644
--- a/.themes/classic/source/_layouts/page.html
+++ b/.themes/classic/source/_layouts/page.html
@@ -13,7 +13,7 @@ layout: default
   {{ content }}
   {% unless page.footer == false %}
     <footer>
-      <p class="meta">{% include post/meta.html %}{% include custom/page_meta.html %}</p>
+      <p class="meta">{% include post/meta.html %}{% include custom/page-meta.html %}</p>
       {% unless page.sharing == false %}
         {% include post/sharing.html %}
       {% endunless %}
@@ -23,12 +23,12 @@ layout: default
 {% include custom/after_page.html %}
 {% if page.comments == true %}{% include comments.html %}{% endif %}
 </div>
-{% unless page.sidebar == false %}
+{% unless page.sidebar == false or site.default_sidebar == false %}
 <aside class="sidebar">
-  {% if site.page_asides.size %}
-    {% include_array page_asides %}
-  {% else %}
-    {% include_array default_asides %}
-  {% endif %}
+  {% if page.sidebar == nil or page.sidebar == 'collapse' %}
+    {% include_sidebar site.page_sidebar %}
+  {% else %}
+    {% include_sidebar %}
+  {% endif %}
 </aside>
 {% endunless %}
diff --git a/.themes/classic/source/_layouts/post.html b/.themes/classic/source/_layouts/post.html
index a440b29..d58b043 100644
--- a/.themes/classic/source/_layouts/post.html
+++ b/.themes/classic/source/_layouts/post.html
@@ -28,12 +28,12 @@ single: true
 {% include custom/after_post.html %}
 {% if page.comments == true %}{% include comments.html %}{% endif %}
 </div>
-{% unless page.sidebar == false %}
+{% unless page.sidebar == false or site.default_sidebar == false %}
 <aside class="sidebar">
-  {% if site.post_asides.size %}
-    {% include_array post_asides %}
-  {% else %}
-    {% include_array default_asides %}
-  {% endif %}
+  {% if page.sidebar == nil or page.sidebar == 'collapse' %}
+    {% include_sidebar site.post_sidebar %}
+  {% else %}
+    {% include_sidebar %}
+  {% endif %}
 </aside>
 {% endunless %}
diff --git a/.themes/classic/source/index.html b/.themes/classic/source/index.html
index d201912..96cf416 100644
--- a/.themes/classic/source/index.html
+++ b/.themes/classic/source/index.html
@@ -19,10 +19,12 @@ layout: default
     {% endif %}
   </div>
 </div>
+{% unless page.sidebar == false or site.default_sidebar == false %}
 <aside class="sidebar">
-  {% if site.blog_index_asides.size %}
-    {% include_array blog_index_asides %}
-  {% else %}
-    {% include_array default_asides %}
-  {% endif %}
+  {% if page.sidebar == nil or page.sidebar == 'collapse' %}
+    {% include_sidebar site.blog_index_sidebar %}
+  {% else %}
+    {% include_sidebar %}
+  {% endif %}
 </aside>
+{% endunless %}
diff --git a/_config.yml b/_config.yml
index cc65879..9cf7d52 100644
--- a/_config.yml
+++ b/_config.yml
@@ -51,15 +51,11 @@ standard_post_marker:
 
 titlecase: true       # Converts page and post titles to titlecase
 
-# list each of the sidebar modules you want to include, in the order you want them to appear.
-# To add custom asides, create files in /source/_includes/custom/asides/ and add them to the list like 'custom/asides/custom_aside_name.html'
-default_asides: [asides/recent_posts.html, asides/github.html, asides/twitter.html, asides/delicious.html, asides/pinboard.html, asides/googleplus.html]
-
-# Each layout uses the default asides, but they can have their own asides instead. Simply uncomment the lines below
-# and add an array with the asides you want to use.
-# blog_index_asides:
-# post_asides:
-# page_asides:
+# To change the layout's default sidebar Add a new sidebar source/_includes/sidebars/your_sidebar.html
+# then make changes below, eg. post_sidebar: your_sidebar.html
+blog_index_sidebar: blog_index_default.html
+page_sidebar: page_default.html
+post_sidebar: post_default.html
 
 # ----------------------- #
 #   3rd Party Settings    #
@@ -89,8 +85,9 @@ google_plus_one_size: medium
 
 # Google Plus Profile
 # Hidden: No visible button, just add author information to search results
-googleplus_user:
-googleplus_hidden: false
+google_plus_user:
+google_plus_hidden: false
+google_plus_image_size: 32
 
 # Pinboard
 pinboard_user:
diff --git a/plugins/include_array.rb b/plugins/include_array.rb
deleted file mode 100644
index 000040f..0000000
--- a/plugins/include_array.rb
+++ /dev/null
@@ -1,58 +0,0 @@
-# Title: Include Array Tag for Jekyll
-# Author: Jason Woodward http://www.woodwardjd.com
-# Description: Import files on your filesystem as specified in a configuration variable in _config.yml.  Mostly cribbed from Jekyll's include tag.
-# Syntax: {% include_array variable_name_from_config.yml %}
-#
-# Example 1:
-# {% include_array asides  %}
-#
-# _config.yml snippet:
-# asides: [asides/twitter.html, asides/custom/my_picture.html]
-#
-module Jekyll
-
-  class IncludeArrayTag < Liquid::Tag
-    Syntax = /(#{Liquid::QuotedFragment}+)/
-    def initialize(tag_name, markup, tokens)
-      if markup =~ Syntax
-        @array_name = $1
-      else
-        raise SyntaxError.new("Error in tag 'include_array' - Valid syntax: include_array [array from _config.yml]")
-      end
-
-      super
-    end
-
-    def render(context)
-      includes_dir = File.join(context.registers[:site].source, '_includes')
-
-      if File.symlink?(includes_dir)
-        return "Includes directory '#{includes_dir}' cannot be a symlink"
-      end
-
-      rtn = ''
-      (context.environments.first['site'][@array_name] || []).each do |file|
-        if file !~ /^[a-zA-Z0-9_\/\.-]+$/ || file =~ /\.\// || file =~ /\/\./
-          rtn = rtn + "Include file '#{file}' contains invalid characters or sequences"
-        end
-
-        Dir.chdir(includes_dir) do
-          choices = Dir['**/*'].reject { |x| File.symlink?(x) }
-          if choices.include?(file)
-            source = File.read(file)
-            partial = Liquid::Template.parse(source)
-            context.stack do
-              rtn = rtn + partial.render(context)
-            end
-          else
-            rtn = rtn + "Included file '#{file}' not found in _includes directory"
-          end
-        end
-      end
-      rtn
-    end
-  end
-
-end
-
-Liquid::Template.register_tag('include_array', Jekyll::IncludeArrayTag)
diff --git a/plugins/include_sidebar.rb b/plugins/include_sidebar.rb
new file mode 100644
index 0000000..625ae5a
--- /dev/null
+++ b/plugins/include_sidebar.rb
@@ -0,0 +1,24 @@
+module Jekyll
+  class IncludeSidebarTag < Liquid::Tag
+    def initialize(tag_name, file, tokens)
+    super
+      @file = file.strip
+    end
+
+    def render(context)
+      file = (@file == "" ? context['page.sidebar'] : @file)
+      if file.include? 'site.'
+        file = context[file]
+      end
+      render_include "sidebars/#{file}", context
+    end
+
+    def render_include(file, context)
+      tag = IncludeTag.new('', file, [])
+      tag.render(context)
+    end
+  end
+
+end
+
+Liquid::Template.register_tag('include_sidebar', Jekyll::IncludeSidebarTag)