updated theme

source/_includes/asides/googleplus.html

@@ -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 %}
-

source/_includes/custom/asides/about.html

@@ -1,4 +0,0 @@
-<section>
-  <h1>About Me</h1>
-  <p>A little something about me.</p>
-</section>

source/_includes/head.html

@@ -17,7 +17,7 @@
   <meta name="MobileOptimized" content="320">
   <meta name="viewport" content="width=device-width, initial-scale=1">
 
-  {% capture canonical %}{{ site.url }}{% if site.permalink contains '.html' %}{{ page.url }}{% else %}{{ page.url | remove:'index.html' | strip_slash }}{% endif %}{% endcapture %}
+  {% capture canonical %}{{ site.url }}{% if site.permalink contains '.html' %}{{ page.url }}{% else %}{{ page.url | remove:'index.html' }}{% endif %}{% endcapture %}
   <link rel="canonical" href="{{ canonical }}">
   <link href="{{ root_url }}/stylesheets/screen.css" media="screen, projection" rel="stylesheet" type="text/css">
   <script src="{{ root_url }}/javascripts/modernizr-2.0.js"></script>

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 %}

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 %}

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 %}

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 %}
+

source/_layouts/page.html

@@ -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 %}

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 %}

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 %}

source/javascripts/octopress.js

@@ -38,6 +38,7 @@ var octopress = (function(){
       }
       if (sections.length >= 3){ $('aside.sidebar').addClass('thirds'); }
     }
+    
     , addCodeLineNumbers: function () {
       if (navigator.appName === 'Microsoft Internet Explorer') { return; }
       $('div.gist-highlight').each(function(index) {
@@ -208,11 +209,21 @@ var octopress = (function(){
     })()
     
     , github: (function(){
+
+      htmlEscape = function (str) {
+        return String(str)
+          .replace(/&/g, '&')
+          .replace(/"/g, '"')
+          .replace(/'/g, ''')
+          .replace(/</g, '&lt;')
+          .replace(/>/g, '&gt;');
+      }
+
       function render(target, data){
         var i = 0, repos = '';
 
         for(i = 0; i < data.length; i++) {
-          repos += '<li><a href="'+data[i].html_url+'">'+data[i].name+'</a><p>'+data[i].description+'</p></li>';
+          repos += '<li><a href="'+data[i].html_url+'">'+htmlEscape(data[i].name)+'</a><p>'+htmlEscape(data[i].description)+'</p></li>';
         }
         target.html(repos);
       }
@@ -264,6 +275,20 @@ $(document).ready(function() {
   octopress.github.showRepos('#gh_repos');
 });
 
+var htmlEncode = (function() {
+  var entities = {
+    '&' : '&amp;'
+    , '<' : '&lt;'
+    , '"' : '&quot;'
+  };
+
+  return function(value) {
+    return value.replace(/[&<"]/g, function(c) {
+      return entities[c];
+    });
+  };
+})();
+
 // iOS scaling bug fix
 // Rewritten version
 // By @mathias, @cheeaun and @jdalton