diff options
| author | Brandon Mathis <brandon@imathis.com> | 2011-08-12 06:46:02 -0700 |
|---|---|---|
| committer | Brandon Mathis <brandon@imathis.com> | 2011-08-12 06:46:02 -0700 |
| commit | 80f95b8b6c9f37dc9d09df418ad86d9e9dd6d5d9 (patch) | |
| tree | dd3d86b3d9ba033fd0b1ae09bc8092266c4649d9 | |
| parent | 5958810eb286e914777eac6956f56692fd9e2239 (diff) | |
| parent | 648d4cc238ea8cf1aacd7b780f0742c031eae243 (diff) | |
| download | my_new_personal_website-80f95b8b6c9f37dc9d09df418ad86d9e9dd6d5d9.tar.xz my_new_personal_website-80f95b8b6c9f37dc9d09df418ad86d9e9dd6d5d9.zip | |
Merge pull request #91 from brigham/extra-subdir
Fix extra subdirectories appearing in category links and atom.xml link.
Diffstat (limited to '')
| -rw-r--r-- | .themes/classic/source/_includes/head.html | 3 | ||||
| -rw-r--r-- | plugins/category_generator.rb | 3 |
2 files changed, 2 insertions, 4 deletions
diff --git a/.themes/classic/source/_includes/head.html b/.themes/classic/source/_includes/head.html index 97f62de2..d6a6735b 100644 --- a/.themes/classic/source/_includes/head.html +++ b/.themes/classic/source/_includes/head.html @@ -25,8 +25,7 @@ <script src="{{ root_url }}/javascripts/modernizr-2.0.js"></script> <script src="http://s3.amazonaws.com/ender-js/jeesh.min.js"></script> <script src="{{ root_url }}/javascripts/octopress.js" type="text/javascript"></script> - {% capture rss_url %}{% if site.subscribe_rss contains ':' %}{{ site.subscribe_rss }}{% else %}{{ root_url }}{{ site.subscribe_rss }}{% endif %}{% endcapture %} - <link href="{{ rss_url }}" rel="alternate" title="{{site.title}}" type="application/atom+xml"/> + <link href="{{ site.subscribe_rss }}" rel="alternate" title="{{site.title}}" type="application/atom+xml"/> {% include google_analytics.html %} {% include google_plus_one.html %} {% include twitter_sharing.html %} diff --git a/plugins/category_generator.rb b/plugins/category_generator.rb index 205022d3..aa1180e1 100644 --- a/plugins/category_generator.rb +++ b/plugins/category_generator.rb @@ -104,9 +104,8 @@ module Jekyll # def category_links(categories) dir = @context.registers[:site].config['category_dir'] - root_url = @context.registers[:site].config['root'].sub(/\/$/, '') categories = categories.sort!.map do |item| - "<a class='category' href='#{root_url}/#{dir}/#{item.gsub(/_|\W/, '-')}/'>#{item}</a>" + "<a class='category' href='/#{dir}/#{item.gsub(/_|\W/, '-')}/'>#{item}</a>" end case categories.length |