diff options
| author | Parker Moore <parkrmoore@gmail.com> | 2013-11-17 22:47:27 -0500 |
|---|---|---|
| committer | Parker Moore <parkrmoore@gmail.com> | 2013-11-17 22:47:27 -0500 |
| commit | 1230e018843ec3bcb17dc4297f2b0f47693a7608 (patch) | |
| tree | 64d9578e934d058dd0bcd1da380ae6379fe187f2 | |
| parent | 7f26224bb84e5fef01c4a55effd22fc2b7f1e9c4 (diff) | |
| parent | d577da7c0af912cec131fa76ea5f265388aae5eb (diff) | |
| download | my_new_personal_website-1230e018843ec3bcb17dc4297f2b0f47693a7608.tar.xz my_new_personal_website-1230e018843ec3bcb17dc4297f2b0f47693a7608.zip | |
Merge branch 'master' of github.com:imathis/octopress
* 'master' of github.com:imathis/octopress:
removing border from iframe in jsFiddle plugin
* properly escaped site title and post/page title in the RSS feeds;
* consistently convert page and post titles to titlecase if site.titlecase is true;
Diffstat (limited to '')
| -rw-r--r-- | .themes/classic/source/_includes/archive_post.html | 2 | ||||
| -rw-r--r-- | .themes/classic/source/_includes/custom/category_feed.xml | 4 | ||||
| -rw-r--r-- | .themes/classic/source/_includes/head.html | 2 | ||||
| -rw-r--r-- | .themes/classic/source/atom.xml | 4 | ||||
| -rw-r--r-- | plugins/jsfiddle.rb | 2 |
5 files changed, 7 insertions, 7 deletions
diff --git a/.themes/classic/source/_includes/archive_post.html b/.themes/classic/source/_includes/archive_post.html index fef3328e..210dbbbe 100644 --- a/.themes/classic/source/_includes/archive_post.html +++ b/.themes/classic/source/_includes/archive_post.html @@ -1,5 +1,5 @@ {% capture category %}{{ post.categories | size }}{% endcapture %} -<h1><a href="{{ root_url }}{{ post.url }}">{{post.title}}</a></h1> +<h1><a href="{{ root_url }}{{ post.url }}">{% if site.titlecase %}{{ post.title | titlecase }}{% else %}{{ post.title }}{% endif %}</a></h1> <time datetime="{{ post.date | datetime | date_to_xmlschema }}" pubdate>{{ post.date | date: "<span class='month'>%b</span> <span class='day'>%d</span> <span class='year'>%Y</span>"}}</time> {% if category != '0' %} <footer> diff --git a/.themes/classic/source/_includes/custom/category_feed.xml b/.themes/classic/source/_includes/custom/category_feed.xml index f47c5536..2f16eeea 100644 --- a/.themes/classic/source/_includes/custom/category_feed.xml +++ b/.themes/classic/source/_includes/custom/category_feed.xml @@ -4,7 +4,7 @@ layout: nil <?xml version="1.0" encoding="utf-8"?> <feed xmlns="http://www.w3.org/2005/Atom"> - <title><![CDATA[{{ page.title }} | {{ site.title }}]]></title> + <title><![CDATA[{% if site.titlecase %}{{ page.title | titlecase | cdata_escape }}{% else %}{{ page.title | cdata_escape }}{% endif %} | {{ site.title | cdata_escape }}]]></title> <link href="{{ site.url }}/{{ page.feed_url }}" rel="self"/> <link href="{{ site.url }}/"/> <updated>{{ site.time | date_to_xmlschema }}</updated> @@ -17,7 +17,7 @@ layout: nil {% for post in site.categories[page.category] limit: 5 %} <entry> - <title type="html"><![CDATA[{{ post.title | cdata_escape }}]]></title> + <title type="html"><![CDATA[{% if site.titlecase %}{{ post.title | titlecase | cdata_escape }}{% else %}{{ post.title | cdata_escape }}{% endif %}]]></title> <link href="{{ site.url }}{{ post.url }}"/> <updated>{{ post.date | date_to_xmlschema }}</updated> <id>{{ site.url }}{{ post.id }}</id> diff --git a/.themes/classic/source/_includes/head.html b/.themes/classic/source/_includes/head.html index b4af2b87..6b5412ca 100644 --- a/.themes/classic/source/_includes/head.html +++ b/.themes/classic/source/_includes/head.html @@ -4,7 +4,7 @@ <!--[if (gt IE 8)|(gt IEMobile 7)|!(IEMobile)|!(IE)]><!--><html class="no-js" lang="en"><!--<![endif]--> <head> <meta charset="utf-8"> - <title>{% if page.title %}{{ page.title }} - {% endif %}{{ site.title }}</title> + <title>{% if page.title %}{% if site.titlecase %}{{ page.title | titlecase }}{% else %}{{ page.title }}{% endif %} - {% endif %}{{ site.title }}</title> <meta name="author" content="{{ site.author }}"> {% capture description %}{% if page.description %}{{ page.description }}{% else %}{{ content | raw_content }}{% endif %}{% endcapture %} diff --git a/.themes/classic/source/atom.xml b/.themes/classic/source/atom.xml index 83af3f81..d4a44278 100644 --- a/.themes/classic/source/atom.xml +++ b/.themes/classic/source/atom.xml @@ -4,7 +4,7 @@ layout: nil <?xml version="1.0" encoding="utf-8"?> <feed xmlns="http://www.w3.org/2005/Atom"> - <title><![CDATA[{{ site.title }}]]></title> + <title><![CDATA[{{ site.title | cdata_escape }}]]></title> <link href="{{ site.url }}/atom.xml" rel="self"/> <link href="{{ site.url }}/"/> <updated>{{ site.time | date_to_xmlschema }}</updated> @@ -17,7 +17,7 @@ layout: nil {% for post in site.posts limit: 20 %} <entry> - <title type="html"><![CDATA[{{ post.title | cdata_escape }}]]></title> + <title type="html"><![CDATA[{% if site.titlecase %}{{ post.title | titlecase | cdata_escape }}{% else %}{{ post.title | cdata_escape }}{% endif %}]]></title> <link href="{{ site.url }}{{ post.url }}"/> <updated>{{ post.date | date_to_xmlschema }}</updated> <id>{{ site.url }}{{ post.id }}</id> diff --git a/plugins/jsfiddle.rb b/plugins/jsfiddle.rb index 0046f9b5..815910e2 100644 --- a/plugins/jsfiddle.rb +++ b/plugins/jsfiddle.rb @@ -29,7 +29,7 @@ module Jekyll def render(context) if @fiddle - "<iframe style=\"width: #{@width}; height: #{@height}\" src=\"http://jsfiddle.net/#{@fiddle}/embedded/#{@sequence}/#{@skin}/\"></iframe>" + "<iframe style=\"width: #{@width}; height: #{@height}\" frameborder=\"0\" seamless=\"seamless\" src=\"http://jsfiddle.net/#{@fiddle}/embedded/#{@sequence}/#{@skin}/\"></iframe>" else "Error processing input, expected syntax: {% jsfiddle shorttag [tabs] [skin] [height] [width] %}" end |