aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrigham Brown <me@brighambrown.com>2011-08-11 21:30:45 -0700
committerBrigham Brown <me@brighambrown.com>2011-08-11 21:30:45 -0700
commit648d4cc238ea8cf1aacd7b780f0742c031eae243 (patch)
treedd3d86b3d9ba033fd0b1ae09bc8092266c4649d9
parent5958810eb286e914777eac6956f56692fd9e2239 (diff)
downloadmy_new_personal_website-648d4cc238ea8cf1aacd7b780f0742c031eae243.tar.xz
my_new_personal_website-648d4cc238ea8cf1aacd7b780f0742c031eae243.zip
Fix extra subdirectories appearing in category links and atom.xml link.
-rw-r--r--.themes/classic/source/_includes/head.html3
-rw-r--r--plugins/category_generator.rb3
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