summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--_site_build/_includes/head.html5
-rw-r--r--_site_build/_includes/header.html4
-rw-r--r--_site_build/_plugins/posts.rb8
-rw-r--r--_site_build/archives/index.html2
-rw-r--r--_site_build/index.html2
-rw-r--r--templates/post.markdown2
6 files changed, 15 insertions, 8 deletions
diff --git a/_site_build/_includes/head.html b/_site_build/_includes/head.html
index b573f7c..33ea474 100644
--- a/_site_build/_includes/head.html
+++ b/_site_build/_includes/head.html
@@ -1,8 +1,11 @@
<meta charset="utf-8">
<title>{{ page.title }} - {{ site.title }}</title>
-<meta name="description" content="{{ site.description }}">
+<meta name="author" content="{% if page.author %}{{ page.author }}{% else %}{{ site.author }}{% endif %}">
+<meta name="description" content="{% if page.description %}{{ page.description }}{% else %}{{ site.description }}{% endif %}">
+<meta name="copyright" content="Copyright &copy; {{ site.copyright_year }} by {% if page.author %}{{ page.author }}{% else %}{{ site.author }}{% endif %}. All Rights Reserved.">
{% if page.robots %}<meta name="robots" content="{{ page.robots }}">{% endif %}
<meta name="viewport" content="width=device-width,initial-scale=1">
+<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="/rss/" title="{{ site.title }}">
<script src="/js/modernizr-2.0.6.min.js"></script>
diff --git a/_site_build/_includes/header.html b/_site_build/_includes/header.html
index 7a3c22e..4f9d01e 100644
--- a/_site_build/_includes/header.html
+++ b/_site_build/_includes/header.html
@@ -1,8 +1,6 @@
<header>
<hgroup>
<h1><a href="/" rel="home" target="_self" title="{{ site.title }}">{{ site.title }}</a></h1>
- {% if site.subtitle %}
- <h2>{{ site.subtitle }}</h2>
- {% endif %}
+ {% if site.subtitle %}<h2>{{ site.subtitle }}</h2>{% endif %}
</hgroup>
</header>
diff --git a/_site_build/_plugins/posts.rb b/_site_build/_plugins/posts.rb
index 75c1c18..41826dd 100644
--- a/_site_build/_plugins/posts.rb
+++ b/_site_build/_plugins/posts.rb
@@ -1,11 +1,15 @@
require 'sanitize'
module Jekyll
- module TruncateFilter
+ module PostFilter
def truncate(html, num_characters = 1000, indicator = ' [...]')
'<p>' << Sanitize.clean(html).slice(Regexp.new(".{1,#{num_characters}}( |$)")).chomp(' ') << indicator << '</p>'
end
+
+ def chomp_url(url, str = 'index.html')
+ url.chomp(str)
+ end
end
end
-Liquid::Template.register_filter(Jekyll::TruncateFilter)
+Liquid::Template.register_filter(Jekyll::PostFilter)
diff --git a/_site_build/archives/index.html b/_site_build/archives/index.html
index 45d9bdc..e09e2b0 100644
--- a/_site_build/archives/index.html
+++ b/_site_build/archives/index.html
@@ -1,7 +1,7 @@
---
layout: default
title: Archives
-robots: noindex, noodp, noydir
+robots: follow, noindex, noodp, noydir
---
<section id="archives">
<h1>Archives</h1>
diff --git a/_site_build/index.html b/_site_build/index.html
index ac66924..6fe253c 100644
--- a/_site_build/index.html
+++ b/_site_build/index.html
@@ -1,7 +1,7 @@
---
layout: default
title: Home
-robots: noindex, noodp, noydir
+robots: follow, noindex, noodp, noydir
---
<section id="excerpts">
{% for post in site.posts limit:site.max_recent_posts %}
diff --git a/templates/post.markdown b/templates/post.markdown
index fda21cf..9c1ae66 100644
--- a/templates/post.markdown
+++ b/templates/post.markdown
@@ -1,6 +1,8 @@
---
layout: post
title: :title
+author:
+description:
---
Lorem ipsum dolor sit amet, consectetur adipiscing elit. Fusce et tellus ac sem vestibulum tristique ac at magna. Proin eros ipsum, egestas sit amet rutrum non, fringilla ut tellus. Sed facilisis rhoncus libero ornare interdum. Morbi a dui id quam dignissim mollis at sit amet purus. Ut pretium malesuada dolor, eu luctus lorem bibendum id. Mauris cursus cursus est sit amet lobortis. Quisque sit amet dui quis sapien fringilla tempus et convallis lectus. Integer pretium tristique sollicitudin. Fusce at ante et tellus vulputate congue. Aliquam nec ligula est. Vestibulum aliquet scelerisque neque, ut elementum neque mattis id. Sed non mauris quam. Vivamus id augue felis. Etiam eleifend, erat sit amet tempor tempor, nibh neque tristique lorem, pretium adipiscing nulla lorem sit amet lacus. Vestibulum odio mauris, hendrerit non dictum sit amet, consequat in mi. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Nulla est nulla, pulvinar eget volutpat quis, placerat nec metus. Vivamus tristique elit ac lectus vestibulum bibendum. Phasellus ac diam purus, cursus imperdiet lorem. Sed a nulla nec velit placerat tempus.