change terminology: activate -> reactivate

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

diff --git a/personal/_plugins/categories.rb b/personal/_plugins/categories.rb
index 65776d72b067790e98677386f8df0f52c70ac1e9..83fef6e3625fef4227a2bd832da23c1349aa5776 100644 (file)
--- a/personal/_plugins/categories.rb
+++ b/personal/_plugins/categories.rb
@@ -11,7 +11,7 @@ module Jekyll
       self.read_yaml(File.join(base, '_layouts'), layout)
       self.data['category'] = category # this tells the site template to add a link to the RSS feed
 
       self.read_yaml(File.join(base, '_layouts'), layout)
       self.data['category'] = category # this tells the site template to add a link to the RSS feed
 

-      category_title_prefix = site.config['blog']['category_title_prefix'] || 'Category: '
+      category_title_prefix = site.config['blog']['title'] + ": "

       self.data['title'] = "#{category_title_prefix}#{category.capitalize}"
     end
   end
       self.data['title'] = "#{category_title_prefix}#{category.capitalize}"
     end
   end


@@ -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