make category code more readable

[web.git] / personal / _plugins / categories.rb

diff --git a/personal/_plugins/categories.rb b/personal/_plugins/categories.rb
index 65776d72b067790e98677386f8df0f52c70ac1e9..4d08693c9ef574150d198c2f395ff834252ac660 100644 (file)
--- a/personal/_plugins/categories.rb
+++ b/personal/_plugins/categories.rb
@@ -45,11 +45,9 @@ module Jekyll
     #
     # Returns string
     def category_links(categories)
     #
     # Returns string
     def category_links(categories)

-      base_dir = @context.registers[:site].config['blog']['category_dir']
+      cat_base_dir = File.join(@context.registers[:site].config['baseurl'], @context.registers[:site].config['blog']['category_dir'])

       categories = categories.sort!.map do |category|
       categories = categories.sort!.map do |category|

-        category_url = File.join(base_dir, "#{category}.html")
-        # Make sure the category directory begins with a slash.
-        category_dir = "/#{category_dir}" unless category_dir =~ /^\//
+        category_url = File.join(cat_base_dir, "#{category}.html")

         "<a class='category' href='#{category_url}'>#{category.capitalize}</a>"
       end
 
         "<a class='category' href='#{category_url}'>#{category.capitalize}</a>"
       end