Mic92/blog
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' of github.com:imathis/octopress

Browse Source 
* 'master' of github.com:imathis/octopress:
  Update plugins/pygments_code.rb
  Async load of Facebook JS
  Update plugins/pygments_code.rb
  Upgrade ruby version
  optimized order of styles and scripts in header
  Added stringex and changed to use #to_url for create directory. To don't receive error in url to accented characters.
This commit is contained in:
Parker Moore 2013-03-06 01:29:52 +01:00
commit cf5e909626
4 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3,7 +3,7 @@
<script>(function(d, s, id) {
var js, fjs = d.getElementsByTagName(s)[0];
if (d.getElementById(id)) {return;}
js = d.createElement(s); js.id = id;
js = d.createElement(s); js.id = id; js.async = true;
js.src = "//connect.facebook.net/en_US/all.js#appId=212934732101925&xfbml=1";
fjs.parentNode.insertBefore(js, fjs);
}(document, 'script', 'facebook-jssdk'));</script>

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

@ -20,10 +20,10 @@
<link rel="canonical" href="{{ canonical }}">
<link href="{{ root_url }}/favicon.png" rel="icon">
<link href="{{ root_url }}/stylesheets/screen.css" media="screen, projection" rel="stylesheet" type="text/css">
<link href="{{ site.subscribe_rss }}" rel="alternate" title="{{site.title}}" type="application/atom+xml">
{% include custom/head.html %}
<script src="{{ root_url }}/javascripts/modernizr-2.0.js"></script>
<script src="{{ root_url }}/javascripts/ender.js"></script>
<script src="{{ root_url }}/javascripts/octopress.js" type="text/javascript"></script>
<link href="{{ site.subscribe_rss }}" rel="alternate" title="{{site.title}}" type="application/atom+xml">
{% include custom/head.html %}
{% include google_analytics.html %}
</head>

6
plugins/category_generator.rb
View File

@ -19,6 +19,8 @@
# - category_title_prefix: The string used before the category name in the page title (default is
# 'Category: ').
require 'stringex'
module Jekyll
# The CategoryIndex class creates a single category page for the specified category.
@ -106,7 +108,7 @@ module Jekyll
if self.layouts.key? 'category_index'
dir = self.config['category_dir'] || 'categories'
self.categories.keys.each do |category|
self.write_category_index(File.join(dir, category.gsub(/_|\P{Word}/, '-').gsub(/-{2,}/, '-').downcase), category)
self.write_category_index(File.join(dir, category.to_url), category)
end
# Throw an exception if the layout couldn't be found.
@ -171,7 +173,7 @@ ERR
#
def category_link(category)
dir = @context.registers[:site].config['category_dir']
"<a class='category' href='/#{dir}/#{category.gsub(/_|\P{Word}/, '-').gsub(/-{2,}/, '-').downcase}/'>#{category}</a>"
"<a class='category' href='/#{dir}/#{category.to_url}/'>#{category}</a>"
end
# Outputs the post.date as formatted html, with hooks for CSS styling.

6
plugins/pygments_code.rb
View File

@ -21,7 +21,11 @@ module HighlightCode
if File.exist?(path)
highlighted_code = File.read(path)
else
highlighted_code = Pygments.highlight(code, :lexer => lang, :formatter => 'html', :options => {:encoding => 'utf-8'})
begin
highlighted_code = Pygments.highlight(code, :lexer => lang, :formatter => 'html', :options => {:encoding => 'utf-8'})
rescue MentosError
raise "Pygments can't parse unknown language: #{lang}."
end
File.open(path, 'w') {|f| f.print(highlighted_code) }
end
else