moparisthebest/android.moparisthebest.org
1
0
Fork 0
mirror of https://github.com/moparisthebest/android.moparisthebest.org synced 2025-02-28 16:31:44 -05:00
Code Issues Releases Wiki Activity

Merge branch 'master' into site

Browse Source 
Conflicts:
	.themes/classic/source/_includes/head.html
	plugins/category_generator.rb
This commit is contained in:
Brandon Mathis 2011-09-04 09:23:58 -05:00
commit 788c0e64be
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -4,7 +4,7 @@
<!--[if (gt IE 8)|(gt IEMobile 7)|!(IEMobile)|!(IE)]><!--><html class="no-js" lang="en"><!--<![endif]--> <!--[if (gt IE 8)|(gt IEMobile 7)|!(IEMobile)|!(IE)]><!--><html class="no-js" lang="en"><!--<![endif]-->
<head> <head>
<meta charset="utf-8"> <meta charset="utf-8">
<title>{% if page.title %}{{page.title}} « {% endif %}{{site.title}}</title> <title>{% if page.title %}{{page.title}} - {% endif %}{{site.title}}</title>
<meta name="author" content="{{site.author}}"> <meta name="author" content="{{site.author}}">
{% if page.description %} {% if page.description %}
<meta name="description" content="{{page.description}}"/> <meta name="description" content="{{page.description}}"/>

4
plugins/category_generator.rb
View File

@ -69,7 +69,7 @@ module Jekyll
if self.layouts.key? 'category_index' if self.layouts.key? 'category_index'
dir = self.config['category_dir'] || 'categories' dir = self.config['category_dir'] || 'categories'
self.categories.keys.each do |category| self.categories.keys.each do |category|
self.write_category_index(File.join(dir, UnicodeUtils.nfkd(category).gsub(/[^\x00-\x7F]/, '').gsub(/_|\W/, '-').to_s), category) self.write_category_index(File.join(dir, UnicodeUtils.nfkd(category).gsub(/[^\x00-\x7F]/, '').gsub(/_|\W/, '-').gsub(/-{2,}/, '-').to_s), category)
end end
# Throw an exception if the layout couldn't be found. # Throw an exception if the layout couldn't be found.
@ -106,7 +106,7 @@ module Jekyll
def category_links(categories) def category_links(categories)
dir = @context.registers[:site].config['category_dir'] dir = @context.registers[:site].config['category_dir']
categories = categories.sort!.map do |item| categories = categories.sort!.map do |item|
"<a class='category' href='/#{dir}/#{UnicodeUtils.nfkd(item).gsub(/[^\x00-\x7F]/, '').gsub(/_|\W/, '-').to_s}/'>#{item}</a>" "<a class='category' href='/#{dir}/#{UnicodeUtils.nfkd(item).gsub(/[^\x00-\x7F]/, '').gsub(/_|\W/, '-').gsub(/-{2,}/, '-').to_s}/'>#{item}</a>"
end end
case categories.length case categories.length