updated to use configurable sidebars

_config.yml

@@ -40,7 +40,7 @@ default_asides: [asides/recent_posts.html, asides/twitter.html, asides/delicious
 
 # 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:
+blog_index_asides: [asides/twitter.html, asides/delicious.html, asides/pinboard.html]
 # post_asides:
 # page_asides:
 

source/_layouts/default.html

@@ -6,9 +6,6 @@
   <div id="main">
     <div id="content">
       {{ content | expand_urls: root_url | backtick_codeblock | smart_quotes }}
-      {% unless page.sidebar == false %}
-        <aside role=sidebar>{% include sidebar.html %}</aside>
-      {% endunless %}
     </div>
   </div>
   <footer>{% include footer.html %}</footer>

source/_layouts/page.html

@@ -29,3 +29,12 @@ layout: default
   </section>
 {% endif %}
 </div>
+{% unless page.sidebar == false %}
+<aside role=sidebar>
+  {% if site.page_asides.size %}
+    {% include_array page_asides %}
+  {% else %}
+    {% include_array default_asides %}
+  {% endif %}
+</aside>
+{% endunless %}

source/_layouts/post.html

@@ -24,3 +24,12 @@ single: true
   </section>
 {% endif %}
 </div>
+{% unless page.sidebar == false %}
+<aside role=sidebar>
+  {% if site.post_asides.size %}
+    {% include_array post_asides %}
+  {% else %}
+    {% include_array default_asides %}
+  {% endif %}
+</aside>
+{% endunless %}

source/index.html

@@ -1,6 +1,5 @@
 ---
 layout: default
-meta: false
 footer: false
 ---
 <div class="blog-index">
@@ -36,3 +35,10 @@ footer: false
 </script>
 {% endif %}
 </div>
+<aside role=sidebar>
+  {% if site.blog_index_asides.size %}
+    {% include_array blog_index_asides %}
+  {% else %}
+    {% include_array default_asides %}
+  {% endif %}
+</aside>