Merge remote-tracking branch 'upstream/master'

14 files changed, 67 insertions, 11 deletions

diff --git a/_site_build/_includes/google_analytics.html b/_site_build/_includes/google_analytics.html
deleted file mode 100644
index 8b82edd..0000000
--- a/_site_build/_includes/google_analytics.html
+++ /dev/null
@@ -1,6 +0,0 @@
-<script>
-  var _gaq=[['_setAccount','{{ site.google_ua }}'],['_trackPageview']];
-  (function(d,t){var g=d.createElement(t),s=d.getElementsByTagName(t)[0];
-  g.src=('https:'==location.protocol?'//ssl':'//www')+'.google-analytics.com/ga.js';
-  s.parentNode.insertBefore(g,s)}(document,'script'));
-</script>
diff --git a/_site_build/_includes/head.html b/_site_build/_includes/head.html
index 10d4463..651102e 100644
--- a/_site_build/_includes/head.html
+++ b/_site_build/_includes/head.html
@@ -8,4 +8,4 @@
 <link rel="canonical" href="{{ site.url}}{{ page.url | chomp_url }}">
 <link rel="stylesheet" href="/css/style.css?v=1">
 <link rel="alternate" type="application/rss+xml" href="{% if site.feedburner %}http://feeds.feedburner.com/{{ site.feedburner }}{% else %}/feed/{% endif %}" title="Feed for {{ site.title }}">
-<script src="js/modernizr-2.5.3.min.js"></script>
+<script src="/js/modernizr-2.5.3.min.js"></script>
diff --git a/_site_build/_includes/disqus.html b/_site_build/_includes/javascript/disqus.html
index ae4be5e..06d96d5 100644
--- a/_site_build/_includes/disqus.html
+++ b/_site_build/_includes/javascript/disqus.html
@@ -1,7 +1,7 @@
-<script type="text/javascript">
+<script>
     var disqus_shortname='{{ site.disqus_shortname }}',disqus_identifier='{{ page.url }}',disqus_url='{{ site.url}}{{ page.url }}',disqus_title='{{ page.title | replace: "'", "\\'" }}'{% unless site.production %},disqus_developer=1{% endunless %};
     (function(d,t){
-      function i(u){var q=d.createElement(t),s=d.getElementsByTagName(t)[0];q.src=u;s.parentNode.insertBefore(q,s);}
+      function i(u){var j=d.createElement(t),s=d.getElementsByTagName(t)[0];j.src=u;s.parentNode.insertBefore(j,s);}
       {% if page.comments %}
       i('//{{ site.disqus_shortname }}.disqus.com/embed.js');
       {% endif %}
diff --git a/_site_build/_includes/javascript/facebook.html b/_site_build/_includes/javascript/facebook.html
new file mode 100644
index 0000000..badc26a
--- /dev/null
+++ b/_site_build/_includes/javascript/facebook.html
@@ -0,0 +1,5 @@
+<script>
+  (function(d,t){var j=d.createElement(t),s=d.getElementsByTagName(t)[0];
+  j.src='//connect.facebook.net/en_GB/all.js#xfbml=1';
+  s.parentNode.insertBefore(j,s);}(document,'script'));
+</script>
diff --git a/_site_build/_includes/javascript/google_analytics.html b/_site_build/_includes/javascript/google_analytics.html
new file mode 100644
index 0000000..0b1bd9a
--- /dev/null
+++ b/_site_build/_includes/javascript/google_analytics.html
@@ -0,0 +1,6 @@
+<script>
+  var _gaq=[['_setAccount','{{ site.google_ua }}'],['_trackPageview']];
+  (function(d,t){var j=d.createElement(t),s=d.getElementsByTagName(t)[0];
+  j.src=('https:'==location.protocol?'//ssl':'//www')+'.google-analytics.com/ga.js';
+  s.parentNode.insertBefore(j,s);}(document,'script'));
+</script>
diff --git a/_site_build/_includes/javascript/google_plus.html b/_site_build/_includes/javascript/google_plus.html
new file mode 100644
index 0000000..d0cfd4f
--- /dev/null
+++ b/_site_build/_includes/javascript/google_plus.html
@@ -0,0 +1,6 @@
+<script>
+  window.___gcfg={lang:'en-GB'};
+  (function(d,t){var j=d.createElement(t),s=d.getElementsByTagName(t)[0];
+  j.src='https://apis.google.com/js/plusone.js';
+  s.parentNode.insertBefore(j,s);}(document,'script'));
+</script>
diff --git a/_site_build/_includes/javascript/twitter.html b/_site_build/_includes/javascript/twitter.html
new file mode 100644
index 0000000..ddac6c0
--- /dev/null
+++ b/_site_build/_includes/javascript/twitter.html
@@ -0,0 +1,5 @@
+<script>
+  (function(d,t){var j=d.createElement(t),s=d.getElementsByTagName(t)[0];
+  j.src='//platform.twitter.com/widgets.js';
+  s.parentNode.insertBefore(j,s);}(document,'script'));
+</script>
diff --git a/_site_build/_includes/social/buttons.html b/_site_build/_includes/social/buttons.html
new file mode 100644
index 0000000..828b435
--- /dev/null
+++ b/_site_build/_includes/social/buttons.html
@@ -0,0 +1,5 @@
+<div class="social-buttons">
+  {% if page.google_plus %}{% include social/google_plus.html %}{% endif %}
+  {% if page.twitter_share %}{% include social/twitter_share.html %}{% endif %}
+  {% if page.facebook_like %}{% include social/facebook_like.html %}{% endif %}
+</div>
diff --git a/_site_build/_includes/social/facebook_like.html b/_site_build/_includes/social/facebook_like.html
new file mode 100644
index 0000000..4a2f6fd
--- /dev/null
+++ b/_site_build/_includes/social/facebook_like.html
@@ -0,0 +1 @@
+<div class="fb-like" data-href="{{site.url}}{{ page.url }}" data-send="false" data-layout="button_count" data-width="90" data-show-faces="false" data-font="verdana"></div>
diff --git a/_site_build/_includes/social/google_plus.html b/_site_build/_includes/social/google_plus.html
new file mode 100644
index 0000000..eee47ec
--- /dev/null
+++ b/_site_build/_includes/social/google_plus.html
@@ -0,0 +1 @@
+<div class="google-plus"><div class="g-plusone" data-size="medium" data-annotation="none" data-href="{{ site.url }}{{ page.url}}"></div></div>
diff --git a/_site_build/_includes/social/twitter_share.html b/_site_build/_includes/social/twitter_share.html
new file mode 100644
index 0000000..2a4b55c
--- /dev/null
+++ b/_site_build/_includes/social/twitter_share.html
@@ -0,0 +1 @@
+<div class="twitter-share"><a href="https://twitter.com/share" rel="external nofollow" class="twitter-share-button" data-url="{{ site.url }}{{ page.url }}" data-text="{{ page.title}}" {% if site.twitter %}data-via="{{ site.twitter }}"{% endif %} data-count="none">Tweet</a></div>
diff --git a/_site_build/_layouts/default.html b/_site_build/_layouts/default.html
index 17944c5..264ad87 100644
--- a/_site_build/_layouts/default.html
+++ b/_site_build/_layouts/default.html
@@ -28,10 +28,19 @@
     </div>
   </div>
 {% if site.production and site.google_ua %}
-  {% include google_analytics.html %}
+  {% include javascript/google_analytics.html %}
+{% endif %}
+{% if page.google_plus %}
+  {% include javascript/google_plus.html %}
+{% endif %}
+{% if page.twitter_share %}
+  {% include javascript/twitter.html %}
+{% endif %}
+{% if page.facebook_like %}
+  {% include javascript/facebook.html %}
 {% endif %}
 {% if (page.comments or page.show_comment_counts) and site.disqus_shortname %}
-  {% include disqus.html %}
+  {% include javascript/disqus.html %}
 {% endif %}
 </body>
 </html>
diff --git a/_site_build/_layouts/post.html b/_site_build/_layouts/post.html
index df3a342..df0dcd0 100644
--- a/_site_build/_layouts/post.html
+++ b/_site_build/_layouts/post.html
@@ -11,9 +11,15 @@ layout: default
     {% if page.comments and site.disqus_shortname %}
     <span class="comment-count"> | <a href="{{ page.url }}#disqus_thread" data-disqus-identifier="{{ page.url }}">Comments</a></span>
     {% endif %}
+    {% if site.social_buttons %}
+      {% include social/buttons.html %}
+    {% endif %}
   </header>
   {{ content }}
   <footer>
+    {% if site.social_buttons %}
+      {% include social/buttons.html %}
+    {% endif %}
     <nav>
       <ul>
         {% if page.previous.url %}
diff --git a/_site_build/css/style.css b/_site_build/css/style.css
index d1b0349..f6a2511 100644
--- a/_site_build/css/style.css
+++ b/_site_build/css/style.css
@@ -223,6 +223,19 @@ article header time, article .categories, article .comment-count {
   color: #999999;
 }
 
+article header .social-buttons {
+  margin-top: 0.5em;
+}
+
+article .google-plus, article .twitter-share, article .fb-like {
+  font-size: 1px;
+  display: inline;
+}
+
+article div .fb_reset {
+    display: inline;
+} 
+
 article .categories a {
   font-style: italic
 }
@@ -246,6 +259,10 @@ article li.next-article {
   width: 50%;
 }
 
+article footer nav {
+  margin-top: 1em;
+}
+
 article footer nav ul:after {
   clear: both;
   content: ".";