Tweak sidebar and twitter link

_config.yml

@@ -67,10 +67,6 @@ excerpt_separator: "<!--more-->"
 
 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: [post/sharing.html, asides/recent_posts.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:
@@ -130,4 +126,4 @@ social:
     app_id: 338291289691179
 
   twitter:
-    account: balloob
+    account: home_assistant

sass/custom/_paulus.scss

@@ -186,6 +186,20 @@ p.note {
 
 }
 
+.copyright {
+  text-align: center;
+
+  i {
+    font-size: 2.2em;
+    margin-right: 8px;
+  }
+  .credit {
+    text-align: left;
+    display: inline-block;
+    font-size: .8em;
+  }
+}
+
 #site-search .search {
   width: calc(100% - 36px);
 }

source/_includes/asides/about.html

@@ -5,7 +5,8 @@
       Home Assistant is an open-source home automation platform running on Python 3. Track and control all devices at home and automate control.
     </li>
     <li><a href='/getting-started/'>Get started with Home Assistant</a></li>
-    <li><a href='/demo/'>Open the online demo</a></li>
+    <li><a href='/demo/'>Try the online demo</a></li>
-    <li><a href='https://github.com/balloob/home-assistant/'>Browse code on GitHub</a></li>
+    <li><a class="twitter-follow-button" href="https://twitter.com/Home_Assistant">Follow Home Assistant on Twitter</a></li>
   </ul>
 </section>
+<script>!function(d,s,id){var js,fjs=d.getElementsByTagName(s)[0];if(!d.getElementById(id)){js=d.createElement(s);js.id=id;js.async=true;js.src='//platform.twitter.com/widgets.js';fjs.parentNode.insertBefore(js,fjs);}}(document, 'script', 'twitter-wjs');</script>

source/_includes/asides/categories.html

@@ -3,7 +3,7 @@
   <ul class="divided">
     {% assign categories = site.categories | sort %}
     {% for category in categories %}
-      <li><a href="/blog/categories/{{ category | first }}/">{{ category | first | replace: '-', ' '}}</a></li>
+      <li><a href="/blog/categories/{{ category | first | downcase }}/">{{ category | first | replace: '-', ' '}}</a></li>
     {% endfor %}
   </ul>
 </section>

source/_includes/asides/github.html

@@ -1,19 +0,0 @@
-{% if site.social.github.user %}
-<section id="github-repos" class="aside-module grid__item one-whole lap-one-half">
-  <h1 class="title delta">
-    GitHub Repos
-    {% if site.social.github.show_profile_link or site.github_show_profile_link %}
-    <small class="pull-right">
-      <a class="btn" href="//github.com/{{ site.social.github.user }}" title="@{{ site.social.github.user }} on GitHub" target="_blank">
-        <i class="icon-external-link"></i>
-      </a>
-    </small>
-    {% endif %}
-  </h1>
-  <ul id="gh_repos" class="divided">
-    <li class="loading">
-      <i class="icon-spinner icon-spin"></i>
-    </li>
-  </ul>
-</section>
-{% endif %}

source/_includes/asides/search.html

@@ -1,4 +1,5 @@
 <section id="site-search" class="aside-module grid__item one-whole lap-one-half">
+  <h1 class="title delta">Search</h1>
   <form action="{{ site.simple_search }}" method="get">
     <input type="hidden" name="q" value="site:{{ site.url | shorthand_url }}" />
     <input class="search" type="text" name="q" results="0" placeholder="Search home-assistant.io"/>

source/_includes/asides/social.html

@@ -1,19 +0,0 @@
-{% unless site.social.visible == false %}
-<section class="social aside-module grid__item one-whole lap-one-half">
-  <h1 class="title delta">
-    {% if site.social.title %}{{ site.social.title }}{% else %}Follow me!{% endif %}
-  </h1>
-  <ul class="unstyled">
-    {% if site.social.adn %}<li><a class="adn" rel="me" href="//alpha.app.net/{{ site.social.adn }}"><i class="icon-adn"></i> App.net</a></li>{% endif %}
-    {% if site.social.dribbble %}<li><a class="dribbble" href="//dribbble.com/{{ site.social.dribbble }}"><i class="icon-dribbble"></i> Dribbble</a></li>{% endif %}
-    {% if site.social.github.user %}<li><a class="github" href="//github.com/{{ site.social.github.user }}"><i class="icon-github"></i> Github</a></li>{% endif %}
-    {% if site.social.facebook.user %}<li><a class="facebook" href="//facebook.com/{{ site.social.facebook.user }}"><i class="icon-facebook-sign"></i> Facebook</a></li>{% endif %}
-    {% if site.social.googleplus %}<li><a class="gplus" href="//plus.google.com/{{ site.social.googleplus }}"><i class="icon-google-plus-sign"></i> Google+</a></li>{% endif %}
-    {% if site.social.linkedin %}<li><a class="linkedin" href="//linkedin.com/in/{{ site.social.linkedin }}"><i class="icon-linkedin-sign"></i> LinkedIn</a></li>{% endif %}
-    {% if site.social.pinterest %}<li><a class="pinterest" href="//pinterest.com/{{ site.social.pinterest }}"><i class="icon-pinterest"></i> Pinterest</a></li>{% endif %}
-    {% if site.social.stackoverflow %}<li><a class="stackoverflow" href="//stackoverflow.com/users/{{ site.social.stackoverflow }}"><i class="icon-stackexchange"></i> StackOverflow</a></li>{% endif %}
-    {% if site.social.twitter.user %}<li><a class="twitter" href="//twitter.com/{{ site.social.twitter.user }}"><i class="icon-twitter"></i> Twitter</a></li>{% endif %}
-    {% if site.social.youtube %}<li><a class="youtube" href="//youtube.com/user/{{ site.social.youtube }}"><i class="icon-youtube"></i> YouTube</a></li>{% endif %}
-  </ul>
-</section>
-{% endunless %}

source/_includes/asides/twitter.html

@@ -1,17 +0,0 @@
-{% if site.social.twitter.user and site.social.twitter.widget.is_shown %}
-<section id="twitter-timeline" class="aside-module grid__item one-whole lap-one-half">
-  <h1 class="title delta">
-    Latest Tweets
-    {% if site.social.twitter.widget.show_profile_link %}
-    <small class="pull-right">
-      <a class="btn" href="//twitter.com/{{ site.social.twitter.user }}" title="@{{ site.social.twitter.user }} on Twitter" target="_blank">
-        <i class="icon-external-link"></i>
-      </a>
-    </small>
-    {% endif %}
-  </h1>
-
-  <a class="twitter-timeline" data-dnt="true" href="//twitter.com/{{ site.social.twitter.user }}"  data-widget-id="{{ site.social.twitter.widget.widget_id }}"  data-link-color="#049cdb" data-tweet-limit="{{ site.social.twitter.widget.tweet_count }}" data-chrome="noheader nofooter transparent noscrollbar">Tweets by @{{ site.social.twitter.user }}</a>
-  <script>!function(d,s,id){var js,fjs=d.getElementsByTagName(s)[0],p=/^http:/.test(d.location)?'http':'https';if(!d.getElementById(id)){js=d.createElement(s);js.id=id;js.src=p+"://platform.twitter.com/widgets.js";fjs.parentNode.insertBefore(js,fjs);}}(document,"script","twitter-wjs");</script>
-</section>
-{% endif %}

source/_includes/custom/footer.html

@@ -1,3 +1,9 @@
-<p class="copyright">
+<div class="copyright">
-  <span class="credit">Powered by <a href='http://jekyllrb.com/'>Jekyll</a> and the <a href='https://github.com/coogie/oscailte'>Oscalite theme</a>. Hosted by <a href='https://pages.github.com/'>GitHub</a> and served by <a href='https://cloudflare.com'>CloudFlare</a>.</span>
+  <a rel="me" href='https://twitter.com/home_assistant'><i class="icon-twitter"></i></a>
-</p>
+  <a rel="me" href='https://github.com/balloob/home-assistant'><i class="icon-github"></i></a>
+
+  <div class="credit">
+    Website powered by <a href='http://jekyllrb.com/'>Jekyll</a> and the <a href='https://github.com/coogie/oscailte'>Oscalite theme</a>.<br />
+    Hosted by <a href='https://pages.github.com/'>GitHub</a> and served by <a href='https://cloudflare.com'>CloudFlare</a>.
+  </div>
+</div>

source/_includes/custom/welcome.html

@@ -9,5 +9,5 @@ Home Assistant is an open-source home automation platform running on Python 3. T
 <p class='hero-buttons'>
   <a href='{{ root_url }}/getting-started/'>Get started</a>
   <a href='{{ root_url }}/demo/' target='_blank'>View demo</a>
-  <a href='https://www.github.com/balloob/home-assistant'>Browse code on GitHub</a>
+  <a rel="me" href='https://www.github.com/balloob/home-assistant'>Browse code on GitHub</a>
 </p>

source/_includes/post/sharing.html

@@ -3,37 +3,32 @@
   {% if site.twitter_tweet_button %}
   <a href="//twitter.com/share"
      class="twitter-share-button"
-     data-url="{{ site.url }}{{ page.url }}"
+     data-via="{{ site.social.twitter.account }}"
-     data-counturl="{{ site.url }}{{ page.url }}" >Tweet</a>
+     data-related="{{ site.social.twitter.account }}"
+     data-url="{{ page.url | canonical_url }}"
+     data-counturl="{{ page.url | canonical_url }}" >Tweet</a>
+  {% endif %}
+  {% if site.facebook_like %}
+    <div class="fb-share-button" style='top: -6px;'
+         data-href="{{ page.url | canonical_url }}"
+         data-layout="button_count">
+    </div>
   {% endif %}
   {% if site.google_plus_one %}
   <div class="g-plusone" data-size="{{ site.google_plus_one_size }}"></div>
   {% endif %}
-  {% if site.facebook_like %}
-    <div class="fb-share-button" style='top: -6px;'
-         data-href="{{ site.url }}{{ page.url }}"
-         data-layout="button_count">
-    </div>
-  {% endif %}
 </section>
 
-<script>!function(d,s,id){var js,fjs=d.getElementsByTagName(s)[0],p=/^http:/.test(d.location)?'http':'https';if(!d.getElementById(id)){js=d.createElement(s);js.id=id;js.src=p+'://platform.twitter.com/widgets.js';fjs.parentNode.insertBefore(js,fjs);}}(document, 'script', 'twitter-wjs');</script>
-
 <script src="https://apis.google.com/js/platform.js" async defer></script>
-
 <script>
   window.fbAsyncInit = function() {
-    FB.init({
+    FB.init({appId: '338291289691179', xfbml: true, version: 'v2.2'});
-      appId      : '338291289691179',
-      xfbml      : true,
-      version    : 'v2.2'
-    });
   };
 
   (function(d, s, id){
      var js, fjs = d.getElementsByTagName(s)[0];
      if (d.getElementById(id)) {return;}
-     js = d.createElement(s); js.id = id;
+     js = d.createElement(s); js.id = id; js.async = true;
      js.src = "//connect.facebook.net/en_US/sdk.js";
      fjs.parentNode.insertBefore(js, fjs);
    }(document, 'script', 'facebook-jssdk'));

source/_includes/site/head.html

@@ -1,5 +1,5 @@
-{% capture fb_description %}{% if page.description %}{{ page.description }}{% else %}{{ content | raw_content }}{% endif %}{% endcapture %}
+{% capture fb_description %}{% if page.description %}{{ page.description }}{% endif %}{% endcapture %}
-{% capture description %}{% if page.description %}{{ page.description }}{% elsif site.description %}{{ site.description }}{% else %}{{ content | raw_content }}{% endif %}{% endcapture %}
+{% capture description %}{% if page.description %}{{ page.description }}{% else site.description %}{{ site.description }}{% endif %}{% endcapture %}
 {% capture social_image %}{% if page.og_image %}{{ page.og_image | prepend: site.url }}{% else %}https://home-assistant.io/images/home-assistant-logo-2164x2164.png{% endif %}{% endcapture %}
 <!doctype html>
   <!--[if lt IE 7]>      <html class="no-js lt-ie9 lt-ie8 lt-ie7"> <![endif]-->
@@ -22,13 +22,14 @@
     <meta property="og:site_name" content="{{ site.title }}">
     <meta property="og:url" content="{{ page.url | canonical_url }}">
     <meta property="og:type" content="{% if page.categories %}article{% else %}website{% endif %}">
-    <meta property="og:description" content="{{ fb_description | strip_html | condense_spaces | truncate:200 }}">
+    <meta property="og:description" content="{{ fb_description | truncate:200 }}">
     <meta property="og:image" content="{{ social_image }}">
 
     <meta name="twitter:card" content="{% if page.og_image %}summary_large_image{% else %}summary{% endif %}">
     <meta name="twitter:site" content="@{{ site.social.twitter.account }}">
+    {% if page.author_twitter %}<meta name="twitter:creator" content="@{{ page.author_twitter }}">{% endif %}
     <meta name="twitter:title" content="{% if post.title %}{{ post.title }}{% elsif page.title %}{{ page.title }}{% else %}{{ site.title }}{% endif %}">
-    <meta name="twitter:description" content="{{ fb_description | strip_html | condense_spaces | truncate:200 }}">
+    <meta name="twitter:description" content="{{ fb_description | truncate:200 }}">
     <meta name="twitter:image" content="{{ social_image }}">
 
     <link href="{{ root_url }}/stylesheets/screen.css" media="screen, projection" rel="stylesheet">

source/_includes/site/sidebar.html

@@ -3,14 +3,15 @@
   {% if url_parts[1] == 'components' %}
     {% include asides/component_navigation.html | compact_newlines %}
   {% else %}
-    {% include asides/search.html %}
     {% include asides/about.html %}
 
     {% if page.blog_index %}
       {% include asides/categories.html %}
     {% else %}
-      {% include asides/social.html %}
+      {% include post/sharing.html %}
-      {% include_array default_asides %}
+      {% include asides/recent_posts.html %}
     {% endif %}
+
+    {% include asides/search.html %}
   {% endif %}
 </div>