More fixes

home-assistant · Oct 27, 2015 · 8f47eb2 · 8f47eb2
1 parent e59252a
commit 8f47eb2
Show file tree

Hide file tree

Showing 12 changed files with 30 additions and 232 deletions.
diff --git a/Gemfile b/Gemfile
@@ -4,8 +4,6 @@ group :development do
   gem 'rake', '~> 10.0'
   gem 'jekyll', '~> 3.0'
   gem 'pygments.rb', '~> 0.6.3'
-  # gem 'octopress-hooks', '~> 2.2'
-  # gem 'octopress-date-format', '~> 2.0'
   gem 'rdiscount', '~> 2.0'
   gem 'RedCloth', '~> 4.2.9'
   gem 'haml', '~> 4.0'
@@ -19,10 +17,14 @@ group :development do
 end
 
 group :jekyll_plugins do
-  gem 'jekyll-sitemap'
   gem 'jekyll-paginate'
-  gem 'octopress', '~> 3.0'
+  gem 'jekyll-sitemap'
   gem 'jekyll-time-to-read'
+  gem 'octopress', '~> 3.0'
+  gem 'octopress-codefence'
+  gem 'octopress-filters'
+  gem 'octopress-include-tag'
+  # gem 'octopress-solarized'
 end
 
 gem 'sinatra', '~> 1.4.2'
diff --git a/_config.yml b/_config.yml
@@ -26,8 +26,6 @@ email:
 #    Jekyll & Plugins     #
 # ----------------------- #
 
-# If publishing to a subdirectory as in http://site.com/project set 'root: /project'
-root: /
 permalink: /blog/:year/:month/:day/:title/
 source: source
 destination: public/
@@ -44,6 +42,10 @@ highlighter: pygments # default python pygments have been replaced by pygments.r
 
 gems:
   - jekyll-time-to-read
+  - octopress-filters
+  # - octopress-solarized
+  - octopress-codefence
+  - octopress-include-tag
 
 paginate: 10          # Posts per page on the blog index
 paginate_path: "blog/posts/:num"  # Directory base for pagination URLs eg. /posts/2/

diff --git a/config.ru b/config.ru
@@ -16,7 +16,7 @@ class SinatraStaticServer < Sinatra::Base
 
   def send_sinatra_file(path, &missing_file_block)
     file_path = File.join(File.dirname(__FILE__), 'public',  path)
-    file_path = File.join(file_path, 'index.html') unless file_path =~ /\.[a-z]+$/i
+    file_path = File.join(file_path, 'index.html') if File.directory?(file_path)
     File.exist?(file_path) ? send_file(file_path) : missing_file_block.call
   end
 

diff --git a/plugins/octopress_filters.rb b/plugins/octopress_filters.rb
diff --git a/plugins/render_partial.rb b/plugins/render_partial.rb
diff --git a/source/_includes/article.html b/source/_includes/article.html
@@ -17,9 +17,15 @@ <h1 class="entry-title">{% if site.titlecase %}{{ page.title | titlecase }}{% el
   </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>

diff --git a/source/_includes/blog/post/article.html b/source/_includes/blog/post/article.html
@@ -22,13 +22,11 @@ <h1 class="title indent">{{ page.title }}</h1>
   {% endunless %}
 </header>
 
-{% capture excerpted %}{{ content | has_excerpt }}{% endcapture %}
-
-{% if excerpted == 'true' and index %}
+{% if post.excerpted and index %}
 <div class="entry-content clearfix">
-  {{ content | excerpt }}
+  {{ post.excerpt }}
   <a class="btn pull-right" href="{{ root_url }}{{ post.url }}#read-more">{{ site.excerpt_link }}</a>
 </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 %}
diff --git a/source/_includes/post/time_to_read.html b/source/_includes/post/time_to_read.html
@@ -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>
diff --git a/source/_includes/site/head.html b/source/_includes/site/head.html
@@ -4,7 +4,7 @@
   <!--[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' | strip_slash }}{% endif %}{% endcapture %}
+  {% 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">

diff --git a/source/_layouts/post.html b/source/_layouts/post.html
@@ -4,10 +4,11 @@
 ---
 
 <article class="post">
+  {% assign post = page %}
   {% include blog/post/article.html %}
 </article>
 
-{% if site.disqus_short_name and page.comments == true %} 
+{% if site.disqus_short_name and page.comments == true %}
 <section id="disqus">
   <h3 class="indent title">Comments</h3>
   <div id="disqus_thread" aria-live="polite">{% include blog/post/disqus_thread.html %}</div>

diff --git a/source/blog/index.html b/source/blog/index.html
@@ -1,10 +1,10 @@
 ---
 layout: default
 sidebar: false
+regenerate: true
 ---
   {% assign index = true %}
   {% for post in paginator.posts %}
-  {% assign content = post.content %}
   <article class="listing">
     {% include blog/post/article.html %}
   </article>

diff --git a/source/getting-started/automation.markdown b/source/getting-started/automation.markdown
@@ -169,7 +169,7 @@ go automate!
  - Learn about the available [automation conditions](/components/automation/#conditions)
  - Learn about [scripts](/components/script/) to help you trigger multiple actions and delays
  - Learn about [scenes](/components/scene/) to help you set many entities at once to your liking
- - Setup the [notification component](/components/#notify-service) to sent yourself messages
+ - Setup a [notification platform](/components/#notifications) to sent yourself messages
 
 <p class='note warning'>
   Whenever you write the value <code>on</code> or <code>off</code>, surround it with quotes to avoid