diff --git a/personal/_plugins/categories.rb b/personal/_plugins/categories.rb new file mode 100644 index 0000000..69375da --- /dev/null +++ b/personal/_plugins/categories.rb @@ -0,0 +1,65 @@ +module Jekyll + + class CategoryPage < Page + def initialize(site, base, dir, name, category, layout) + @site = site + @base = base + @dir = dir + @name = name + + self.process(@name) + self.read_yaml(File.join(base, '_layouts'), layout) + self.data['category'] = category + + category_title_prefix = site.config['blog']['category_title_prefix'] || 'Category: ' + self.data['title'] = "#{category_title_prefix}#{category.capitalize}" + end + end + + class CategoryPageGenerator < Generator + safe true + + def generate(site) + dir = site.config['blog']['category_dir'] || 'categories' + if site.layouts.key? 'category_index' + site.categories.each_key do |category| + site.pages << CategoryPage.new(site, site.source, dir, "#{category}.html", category, 'category_index.html') + end + end + if site.layouts.key? 'category_feed' + site.categories.each_key do |category| + site.pages << CategoryPage.new(site, site.source, dir, "#{category}.xml", category, 'category_feed.html') + end + end + end + end + + # Adds some extra filters used during the category creation process. + module Filters + + # Outputs a list of categories as comma-separated links. This is used + # to output the category list for each post on a category page. + # + # +categories+ is the list of categories to format. + # + # Returns string + def category_links(categories) + base_dir = @context.registers[:site].config['blog']['category_dir'] + categories = categories.sort!.map do |category| + category_url = File.join(base_dir, "#{category}.html") + # Make sure the category directory begins with a slash. + category_dir = "/#{category_dir}" unless category_dir =~ /^\// + "#{category.capitalize}" + end + + case categories.length + when 0 + "" + when 1 + categories[0].to_s + else + categories.join(', ') + end + end + end +end diff --git a/personal/_plugins/readmes.rb b/personal/_plugins/readmes.rb index 922d3a8..63df995 100644 --- a/personal/_plugins/readmes.rb +++ b/personal/_plugins/readmes.rb @@ -12,7 +12,7 @@ module Jekyll content = File.read(src, self.merged_file_read_opts({})).each_line.to_a - self.data['layout'] = 'default' + self.data['layout'] = 'page' self.data['title'] = content[0].match(/^#* ?(.*)\n$/)[1] slug = self.data['title'].match(/^([^:]*):.*$/) if slug diff --git a/personal/blog/feed.xml b/personal/blog/feed.xml index 7a7e919..17b789d 100644 --- a/personal/blog/feed.xml +++ b/personal/blog/feed.xml @@ -1,31 +1,7 @@ --- -layout: null +layout: feed slug: Subscribe +vars: blog-index.html --- - - - - {{ site.blog.title | xml_escape }} - {{ site.blog.title | xml_escape }} - {{ site.url }}{{ site.baseurl }}/ - - {{ site.time | date_to_rfc822 }} - {{ site.time | date_to_rfc822 }} - Jekyll v{{ jekyll.version }} - {% for post in site.posts limit:10 %} - - {{ post.title | xml_escape }} - {{ post.content | xml_escape }} - {{ post.date | date_to_rfc822 }} - {{ post.url | prepend: site.baseurl | prepend: site.url }} - {{ post.url | prepend: site.baseurl | prepend: site.url }} - {% for tag in post.tags %} - {{ tag | xml_escape }} - {% endfor %} - {% for cat in post.categories %} - {{ cat | xml_escape }} - {% endfor %} - - {% endfor %} - - + +{% include post-feed.html posts=site.posts %} diff --git a/personal/blog/index.html b/personal/blog/index.html index 380aaaa..f85ed56 100644 --- a/personal/blog/index.html +++ b/personal/blog/index.html @@ -5,16 +5,4 @@ rss: true sort: 10 --- -{% assign num_posts = 5 %} -{% for post in site.posts %} - {% assign num_posts = num_posts | minus: 1 %} - {% if num_posts >= 0 %} -

- {% include post-header.html item=post %} -

- {{ post.excerpt }} - -

{{ post.title }}

{{ post.title }}