From 8b8fff3b033318d9ae5d63ee73c065ee3a86ea89 Mon Sep 17 00:00:00 2001 From: Luke Karrys Date: Fri, 23 Mar 2012 13:06:01 -0700 Subject: [PATCH 1/5] Don't display comments link for post excerpts on index page when comments for that post are set to false. --- .themes/classic/source/_includes/article.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.themes/classic/source/_includes/article.html b/.themes/classic/source/_includes/article.html index 9db0745..23f4884 100644 --- a/.themes/classic/source/_includes/article.html +++ b/.themes/classic/source/_includes/article.html @@ -8,7 +8,7 @@ {% unless page.meta == false %}

{% include post/date.html %}{{ time }} - {% if site.disqus_short_name and page.comments != false and site.disqus_show_comment_count == true %} + {% if site.disqus_short_name and page.comments != false and post.comments != false and site.disqus_show_comment_count == true %} | Comments {% endif %}

From c5e2e524f81bec60c9c7d44662d8394abf6a0862 Mon Sep 17 00:00:00 2001 From: Andrew Patton Date: Wed, 2 May 2012 18:43:33 -0300 Subject: [PATCH 2/5] =?UTF-8?q?Fixed=20=E2=80=9C3rd=20party=20plugins?= =?UTF-8?q?=E2=80=9D=20wiki=20page=20link?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Brandon Mathis --- README.markdown | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.markdown b/README.markdown index c181401..06ea423 100644 --- a/README.markdown +++ b/README.markdown @@ -16,7 +16,7 @@ Check out [Octopress.org](http://octopress.org/docs) for guides and documentatio ## Contributing -We love to see people contributing to Octopress, whether it's a bug report, feature suggestion or a pull request. At the moment, we try to keep the core slick and lean, focusing on basic blogging needs, so some of your suggestions might not find their way into Octopress. For those ideas, we started a [list of 3rd party plug-ins](https://github.com/imathis/octopress/wiki/3rd-party-plug-ins), where you can link your own Octopress plug-in repositories. For the future, we're thinking about ways to easier add them them into our main releases. +We love to see people contributing to Octopress, whether it's a bug report, feature suggestion or a pull request. At the moment, we try to keep the core slick and lean, focusing on basic blogging needs, so some of your suggestions might not find their way into Octopress. For those ideas, we started a [list of 3rd party plug-ins](https://github.com/imathis/octopress/wiki/3rd-party-plugins), where you can link your own Octopress plug-in repositories. For the future, we're thinking about ways to easier add them them into our main releases. ## License From 8753a6b00cad6c4c822df79967c6d5a8fb41b4dd Mon Sep 17 00:00:00 2001 From: Brandon Mathis Date: Mon, 21 May 2012 15:58:42 -0500 Subject: [PATCH 3/5] Octopress filters are now limited to html producing templating languages, Fixes #536 --- plugins/octopress_filters.rb | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/plugins/octopress_filters.rb b/plugins/octopress_filters.rb index a5bb235..2ba93e9 100644 --- a/plugins/octopress_filters.rb +++ b/plugins/octopress_filters.rb @@ -24,10 +24,14 @@ module Jekyll class ContentFilters < PostFilter include OctopressFilters def pre_render(post) - post.content = pre_filter(post.content) + if post.ext.match('html|textile|markdown|haml|slim|xml') + post.content = pre_filter(post.content) + end end def post_render(post) - post.content = post_filter(post.content) + if post.ext.match('html|textile|markdown|haml|slim|xml') + post.content = post_filter(post.content) + end end end end From 82f8142cc425b26a4d9977ea6a473a84a5b9470c Mon Sep 17 00:00:00 2001 From: Robert Wijas Date: Sat, 1 Oct 2011 23:11:41 +0200 Subject: [PATCH 4/5] render_partial - content coverting Signed-off-by: Brandon Mathis --- plugins/render_partial.rb | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/plugins/render_partial.rb b/plugins/render_partial.rb index b6ebfe8..0241618 100644 --- a/plugins/render_partial.rb +++ b/plugins/render_partial.rb @@ -31,9 +31,11 @@ module Jekyll def initialize(tag_name, markup, tokens) @file = nil @raw = false + @convert = false if markup =~ /^(\S+)\s?(\w+)?/ @file = $1.strip @raw = $2 == 'raw' + @convert = $2 == 'convert' end super end @@ -58,7 +60,16 @@ module Jekyll else partial = Liquid::Template.parse(contents) context.stack do - partial.render(context) + contents = partial.render(context) + if @convert + site = context.registers[:site] + ext = File.extname(@file) + + converter = site.converters.find { |c| c.matches(ext) } + contents = converter.convert(contents) unless converter.nil? + end + + contents end end end From 1ac51f09506acf45edd5c209ee1f408a8788623a Mon Sep 17 00:00:00 2001 From: Robert Wijas Date: Sun, 2 Oct 2011 09:41:11 +0200 Subject: [PATCH 5/5] render_partial always converts the content Signed-off-by: Brandon Mathis --- plugins/render_partial.rb | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/plugins/render_partial.rb b/plugins/render_partial.rb index 0241618..970a180 100644 --- a/plugins/render_partial.rb +++ b/plugins/render_partial.rb @@ -31,11 +31,9 @@ module Jekyll def initialize(tag_name, markup, tokens) @file = nil @raw = false - @convert = false if markup =~ /^(\S+)\s?(\w+)?/ @file = $1.strip @raw = $2 == 'raw' - @convert = $2 == 'convert' end super end @@ -61,15 +59,16 @@ module Jekyll partial = Liquid::Template.parse(contents) context.stack do contents = partial.render(context) - if @convert - site = context.registers[:site] - ext = File.extname(@file) - - converter = site.converters.find { |c| c.matches(ext) } - contents = converter.convert(contents) unless converter.nil? - end - contents + site = context.registers[:site] + ext = File.extname(@file) + converter = site.converters.find { |c| c.matches(ext) } + + if converter.nil? + contents + else + converter.convert(contents) + end end end end