Merge pull request #34 from morm/master

Subfolder deploy and disqus spec chars fix

sass/base/_theme.scss

@@ -8,7 +8,7 @@
   background-attachment: scroll;
   background-clip: border-box;
   background-color: #323232;
-  background-image: url("/images/heroBack.jpg");
+  background-image: image-url("heroBack.jpg");
   background-origin: padding-box;
   background-position: 0 0;
   background-repeat: repeat;
@@ -80,7 +80,7 @@ article h1 {
 }
 .wrapper_single {
   background-color: #F1F1F1;
-  background-image: url("/images/heroBack.jpg");
+  background-image: image-url("heroBack.jpg");
   background-attachment: fixed;
   padding-top: 75px;
   padding-bottom: 75px;

source/_includes/archive_post.html

@@ -1,8 +1,8 @@
 {% capture category %}{{ post.categories | size }}{% endcapture %}
-<h2><a href="{{ root_url }}{{ post.url }}">{% if site.titlecase %}{{ post.title | titlecase }}{% else %}{{ post.title }}{% endif %}</a></h2>
+<h2><a href="{{ site.url }}{{ post.url }}">{% if site.titlecase %}{{ post.title | titlecase }}{% else %}{{ post.title }}{% endif %}</a></h2>
 <time datetime="{{ post.date | datetime | date_to_xmlschema }}" 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 meta">posted in {{ post.categories | category_links }}</span>
+  <span class="categories meta">posted in {{ post.categories | category_links | expand_urls: site.url }}</span>
 </footer>
 {% endif %}

source/_includes/article.html

@@ -57,10 +57,10 @@ <h1 class="entry-title">{% if site.titlecase %}{{ page.title | titlecase }}{% el
       {% include post/sharing.html %}
     {% endunless %}
     {% if page.previous.url %}
-      <a class="pull-left" href="{{page.previous.url}}" title="Previous Post: {{page.previous.title}}">&laquo; {{page.previous.title}}</a>
+      <a class="pull-left" href="{{root_url}}{{page.previous.url}}" title="Previous Post: {{page.previous.title}}">&laquo; {{page.previous.title}}</a>
     {% endif %}
     {% if page.next.url %}
-      <a class="pull-right" href="{{page.next.url}}" title="Next Post: {{page.next.title}}">{{page.next.title}} &raquo;</a>
+      <a class="pull-right" href="{{root_url}}{{page.next.url}}" title="Next Post: {{page.next.title}}">{{page.next.title}} &raquo;</a>
     {% endif %}
   </footer>
 {% endunless %}

source/_includes/custom/footer_widgets.html

@@ -8,7 +8,7 @@ <h2>recent posts</h2>
         </li>
       {% endfor %}
     </ul>
-    <h2><a href="/blog/archives">archives</a></h2>
+    <h2><a href="{{ root_url }}/blog/archives">archives</a></h2>
   </div>
   <div class="span3">
     {% include custom/asides/instagram.html %}

source/_includes/disqus.html

@@ -5,8 +5,8 @@
       {% if page.comments == true %}
         {% comment %} `page.comments` can be only be set to true on pages/posts, so we embed the comments here. {% endcomment %}
         // var disqus_developer = 1;
-        var disqus_identifier = '{{ site.url }}{{ page.url }}';
-        var disqus_url = '{{ site.url }}{{ page.url }}';
+        var disqus_identifier = '{{ site.url }}{{ page.url | cgi_escape}}';
+        var disqus_url = '{{ site.url }}{{ page.url | cgi_escape}}';
         var disqus_script = 'embed.js';
       {% else %}
         {% comment %} As `page.comments` is empty, we must be on the index page. {% endcomment %}

source/_includes/post/categories.html

@@ -5,7 +5,7 @@
   {% if post %}
     {{ post.categories | category_links }}
   {% else %}
-    {{ page.categories | category_links }}
+    {{ page.categories | category_links | expand_urls: root_url }}
   {% endif %}
 </span>
 {% endunless %}

source/javascripts/github.js

@@ -29,8 +29,8 @@ var github = {
     var i = 0, fragment = '', t = $(target)[0];
 
     for(i = 0; i < repos.length; i++) {
-      fragment += '<dt><a href="'+repos[i].html_url+'">'+repos[i].name+'</a><a rel="tooltip" href="'+repos[i].html_url+'" title="open sourced at Github"><img class="social_icon" src="/images/glyphicons_381_github.png" alt="github icon" title="Github"/></a></dt><dd>'+(repos[i].description||'&nbsp;')+'</p></dd>';
+      fragment += '<dt><a href="'+repos[i].html_url+'">'+repos[i].name+'</a><a rel="tooltip" href="'+repos[i].html_url+'" title="open sourced at Github"><img class="social_icon" src="images/glyphicons_381_github.png" alt="github icon" title="Github"/></a></dt><dd>'+(repos[i].description||'&nbsp;')+'</p></dd>';
     }
     t.innerHTML = fragment;
   }
-};
+};