moparisthebest/www.moparscape.org
1
0
Fork 0
mirror of https://github.com/moparisthebest/www.moparscape.org synced 2024-11-16 06:15:13 -05:00
Code Issues Releases Wiki Activity

Merge pull request #91 from brigham/extra-subdir

Browse Source 
Fix extra subdirectories appearing in category links and atom.xml link.
This commit is contained in:
Brandon Mathis 2011-08-12 06:46:02 -07:00
commit 80f95b8b6c
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.themes/classic/source/_includes/head.html
View File

@ -25,8 +25,7 @@
<script src="{{ root_url }}/javascripts/modernizr-2.0.js"></script> <script src="{{ root_url }}/javascripts/modernizr-2.0.js"></script>
<script src="http://s3.amazonaws.com/ender-js/jeesh.min.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> <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="{{ site.subscribe_rss }}" rel="alternate" title="{{site.title}}" type="application/atom+xml"/>
<link href="{{ rss_url }}" rel="alternate" title="{{site.title}}" type="application/atom+xml"/>
{% include google_analytics.html %} {% include google_analytics.html %}
{% include google_plus_one.html %} {% include google_plus_one.html %}
{% include twitter_sharing.html %} {% include twitter_sharing.html %}

3
plugins/category_generator.rb
View File

@ -104,9 +104,8 @@ module Jekyll
# #
def category_links(categories) def category_links(categories)
dir = @context.registers[:site].config['category_dir'] dir = @context.registers[:site].config['category_dir']
root_url = @context.registers[:site].config['root'].sub(/\/$/, '')
categories = categories.sort!.map do |item| 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 end
case categories.length case categories.length