Merge branch 'jekyll-3'

Conflicts:
	.gitignore
	Gemfile.lock
	source/_components/media_player.plex.markdown
	source/_includes/site/head.html
This commit is contained in:
Paulus Schoutsen 2015-10-29 00:08:22 -07:00
commit a08459ec8f
296 changed files with 1518 additions and 2884 deletions

View file

@ -17,9 +17,15 @@
</header>
{% endunless %}
{% if index %}
<div class="entry-content">{{ content | excerpt }}</div>
{% capture excerpted %}{{ content | has_excerpt }}{% endcapture %}
{% if excerpted == 'true' %}
<div class="entry-content">
{% if post.excerpted %}
{{ post.excerpt }}
<a href="{{ post.url }}"Continue reading </a>
{% else %}
{{ post.content }}
{% endif %}
</div>
{% if post.excerpted %}
<footer>
<a rel="full-article" href="{{ root_url }}{{ post.url }}">{{ site.excerpt_link }}</a>
</footer>

View file

@ -7,11 +7,12 @@
</div>
{% assign file_parts = page.url | split: '/' | last | split: '.' %}
{% if file_parts.size == 3 %}
{% if file_parts.size == 2 %}
{% assign is_platform = true %}
{% assign imp_name = file_parts[1] %}
{% assign parent_name = file_parts[0] %}
{% assign parent_url = parent_name | prepend: '/components/' | append: '.html' %}
{% assign parent_url = parent_name | prepend: '/components/' | append: '/' %}
{% assign parent_component = components | where: 'url', parent_url | first %}
{% else %}
{% assign is_platform = false %}
@ -54,8 +55,8 @@
{% for component in components %}
{% if component.url != page.url %}
{% assign comp_file_parts = component.url | split: '/' | last | split: '.' %}
{% if comp_file_parts.size == 3 %}
{% assign comp_imp_name = comp_file_parts[1] %}
{% if comp_file_parts.size == 2 %}
{% assign comp_imp_name = comp_file_parts | last %}
{% else %}
{% assign comp_imp_name = comp_file_parts | first %}
{% endif %}

View file

@ -22,13 +22,13 @@
{% endunless %}
</header>
{% capture excerpted %}{{ content | has_excerpt }}{% endcapture %}
{% if excerpted == 'true' and index %}
<div class="entry-content clearfix">
{{ content | excerpt }}
<a class="btn pull-right" href="{{ root_url }}{{ post.url }}#read-more">{{ site.excerpt_link }}</a>
</div>
{% if index %}
<div class="entry-content clearfix">
{{ post.excerpt }}
{% if post.content contains site.excerpt_separator %}
<a class="btn pull-right" href="{{ post.url }}#read-more">{{ site.excerpt_link }}</a>
{% endif %}
</div>
{% else %}
{{ content | replace: site.excerpt_separator, '<a name="read-more"></a>' }}
{% endif %}
{{ post.content | replace: site.excerpt_separator, '<a name="read-more"></a>' }}
{% endif %}

View file

@ -1,5 +1,5 @@
{% capture date %}{{ page.date }}{{ post.date }}{% endcapture %}
{% capture date_formatted %}{{ page.date_formatted }}{{ post.date_formatted }}{% endcapture %}
{% capture date_formatted %}{{ post.date_formatted }}{% endcapture %}
{% capture has_date %}{{ date | size }}{% endcapture %}
{% capture updated %}{{ page.updated }}{{ post.updated }}{% endcapture %}

View file

@ -1,3 +1,3 @@
<p class="copyright">
<span class="credit">Powered by <a href="http://octopress.org">Octopress</a>, <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>
<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>
</p>

View file

@ -2,46 +2,46 @@
<hr>
<p>Home Assistant will track the state of all the devices in your home, so you don't have to.</p>
<div class='supported-brands clearfix'>
<a href='/components/thermostat.nest.html'>
<a href='/components/thermostat.nest/'>
<img src='/images/supported_brands/nest_thermostat.png' />
</a>
<a href='/components/light.hue.html'>
<a href='/components/light.hue/'>
<img src='/images/supported_brands/philips_hue.png' />
</a>
<a href='/components/mqtt.html'>
<a href='/components/mqtt/'>
<img src='/images/supported_brands/mqtt.png' />
</a>
<a href='/components/media_player.cast.html'>
<a href='/components/media_player.cast/'>
<img src='/images/supported_brands/google_cast.png' />
</a>
<a href='/components/switch.wemo.html'>
<a href='/components/switch.wemo/'>
<img src='/images/supported_brands/belkin_wemo.png' />
</a>
<a href='/components/notify.pushbullet.html'>
<a href='/components/notify.pushbullet/'>
<img src='/images/supported_brands/pushbullet.png' />
</a>
<a href='/components/ifttt.html'>
<a href='/components/ifttt/'>
<img src='/images/supported_brands/ifttt.png' />
</a>
<a href='/components/wink.html'>
<a href='/components/wink/'>
<img src='/images/supported_brands/wink.png' />
</a>
<a href='/components/arduino.html'>
<a href='/components/arduino/'>
<img src='/images/supported_brands/arduino.png' />
</a>
<a href='/components/device_tracker.netgear.html'>
<a href='/components/device_tracker.netgear/'>
<img src='/images/supported_brands/netgear.png' />
</a>
<a href='/components/media_player.kodi.html'>
<a href='/components/media_player.kodi/'>
<img src='/images/supported_brands/kodi.png' />
</a>
<a href='/components/media_player.plex.html'>
<a href='/components/media_player.plex/'>
<img src='/images/supported_brands/plex.png' />
</a>
<a href='/components/device_tracker.luci.html'>
<a href='/components/device_tracker.luci/'>
<img src='/images/supported_brands/openwrt.png' />
</a>
<a href='/components/vera.html'>
<a href='/components/vera/'>
<img src='/images/supported_brands/vera.png' />
</a>
</div>

View file

@ -3,10 +3,10 @@
<a href="{{ root_url }}/getting-started/">Getting started</a>
<ul>
<li><a href='/getting-started/'>Installing Home Assistant</a></li>
<li><a href='/getting-started/configuration.html'>Configuration basics</a></li>
<li><a href='/getting-started/devices.html'>Adding devices</a></li>
<li><a href='/getting-started/presence-detection.html'>Presence detection</a></li>
<li><a href='/getting-started/automation.html'>Automation</a></li>
<li><a href='/getting-started/configuration/'>Configuration basics</a></li>
<li><a href='/getting-started/devices/'>Adding devices</a></li>
<li><a href='/getting-started/presence-detection/'>Presence detection</a></li>
<li><a href='/getting-started/automation/'>Automation</a></li>
<li><a href='/cookbook'>Configuration cookbook</a></li>
</ul>
</li>
@ -14,16 +14,16 @@
<li>
<a href="{{ root_url }}/developers/">Developers</a>
<ul>
<li><a href="{{ root_url }}/developers/architecture.html">Architecture</a></li>
<li><a href="{{ root_url}}/developers/frontend.html">Frontend development</a></li>
<li><a href="{{ root_url}}/developers/creating_components.html">
<li><a href="{{ root_url }}/developers/architecture/">Architecture</a></li>
<li><a href="{{ root_url}}/developers/frontend/">Frontend development</a></li>
<li><a href="{{ root_url}}/developers/creating_components/">
Creating components
</a></li>
<li><a href="{{ root_url}}/developers/add_new_platform.html">
<li><a href="{{ root_url}}/developers/add_new_platform/">
Adding platform support
</a></li>
<li><a href="{{ root_url }}/developers/api.html">API</a></li>
<li><a href="{{ root_url }}/developers/credits.html">Credits</a></li>
<li><a href="{{ root_url }}/developers/api/">API</a></li>
<li><a href="{{ root_url }}/developers/credits/">Credits</a></li>
</ul>
</li>
<li><a href="{{ root_url }}/blog/">Blog</a></li>

View file

@ -3,8 +3,8 @@
Home Assistant is an open-source home automation platform running on Python 3. Track and control all devices at home and automate control. Installation in less than a minute.
</p>
<code class='front-install'>
<span class='sh'>$</span> pip3 install homeassistant<br />
<span class='sh'>$</span> hass --open-ui
<div>pip3 install homeassistant</div>
<div>hass --open-ui</div>
</code>
<p class='hero-buttons'>
<a href='{{ root_url }}/demo/' target='_blank'>View demo</a>

View file

@ -1 +1 @@
<span><i class='icon-time'></i> {{ content | reading_time_as_s }} reading time</span>
<span><i class='icon-time'></i> {{ post.content | reading_time_as_s }} reading time</span>

View file

@ -4,8 +4,6 @@
<!--[if IE 8]> <html class="no-js lt-ie9"> <![endif]-->
<!--[if gt IE 8]><!--> <html> <!--<![endif]-->
{% capture canonical %}{{ site.url }}{% if site.permalink contains '.html' %}{{ page.url }}{% else %}{{ page.url | remove:'index.html' }}{% endif %}{% endcapture %}
{% if page.description %} {% capture fb_description %}{{ page.description }}{% endcapture %} {% else %} {% capture fb_description %}{{ content | raw_content }}{% endcapture %} {% endif %}
<head>
<meta charset="utf-8">
@ -16,12 +14,12 @@
<meta name="description" content="{{ description | strip_html | condense_spaces | truncate:150 }}">
{% if page.keywords %}<meta name="keywords" content="{{ page.keywords }}">{% endif %}
<meta name="viewport" content="width=device-width">
<link rel="canonical" href="{{ canonical }}">
<link rel="canonical" href="{{ page.url | canonical_url }}">
{% if site.social.facebook.app_id %}
<meta property="fb:app_id" content="{{ site.social.facebook.app_id }}">
<meta property="og:title" content="{% if post.title %}{{ post.title }}{% elsif page.title %}{{ page.title }}{% else %}{{ site.title }}{% endif %}">
<meta property="og:site_name" content="{{ site.title }}">
<meta property="og:url" content="{% if canonical %}{{ canonical }}{% else %}{{ site.url }}/{% endif %}">
<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:image" content="{% if page.og_image %}{{ page.og_image | prepend: site.url }}{% else %}https://home-assistant.io/images/home-assistant-logo-2164x2164.png{% endif %}">

View file

@ -1,7 +1,7 @@
<div class="grid">
{% assign url_parts = page.url | split: '/' %}
{% if url_parts[1] == 'components' %}
{% include asides/component_navigation.html %}
{% include asides/component_navigation.html | compact_newlines %}
{% else %}
{% include asides/social.html %}
{% include_array default_asides %}