Commit 3c07e497 authored by Sylvester Keil's avatar Sylvester Keil
Browse files

Merge pull request #103 from hendrikvanantwerpen/master

Details
parents 6fa26332 75fd097f
...@@ -182,7 +182,7 @@ Feature: Details ...@@ -182,7 +182,7 @@ Feature: Details
Then the _site directory should exist Then the _site directory should exist
And I should see "pretty" in "_config.yml" And I should see "pretty" in "_config.yml"
And the "_site/scholar/index.html" file should exist And the "_site/scholar/index.html" file should exist
And I should see "<a[^>]+href=\"/bibliography/ruby/index.html\">" in "_site/scholar/index.html" And I should see "<a[^>]+href=\"/bibliography/ruby/\">" in "_site/scholar/index.html"
And the "_site/bibliography/ruby/index.html" file should exist And the "_site/bibliography/ruby/index.html" file should exist
@generators @parse_months @generators @parse_months
......
...@@ -15,7 +15,7 @@ module Jekyll ...@@ -15,7 +15,7 @@ module Jekyll
process(@name) process(@name)
read_yaml(File.join(base, '_layouts'), config['details_layout']) read_yaml(File.join(base, '_layouts'), config['details_layout'])
data['entry'] = liquidify(entry) data.merge!(reference_data(entry))
end end
end end
......
...@@ -272,16 +272,22 @@ module Jekyll ...@@ -272,16 +272,22 @@ module Jekyll
def bibliography_tag(entry, index) def bibliography_tag(entry, index)
return missing_reference unless entry return missing_reference unless entry
liquid_template.render({ liquid_template.render(
reference_data(entry,index).merge({
'index' => index,
'details' => details_link_for(entry)
}))
end
def reference_data(entry, index = nil)
{
'entry' => liquidify(entry), 'entry' => liquidify(entry),
'reference' => reference_tag(entry, index), 'reference' => reference_tag(entry, index),
'key' => entry.key, 'key' => entry.key,
'type' => entry.type.to_s, 'type' => entry.type.to_s,
'link' => repository_link_for(entry), 'link' => repository_link_for(entry),
'links' => repository_links_for(entry), 'links' => repository_links_for(entry)
'index' => index, }
'details' => details_link_for(entry)
})
end end
def liquidify(entry) def liquidify(entry)
...@@ -323,7 +329,7 @@ module Jekyll ...@@ -323,7 +329,7 @@ module Jekyll
name.gsub!(/[:\s]+/, '_') name.gsub!(/[:\s]+/, '_')
if site.config['permalink'] == 'pretty' if site.config['permalink'] == 'pretty'
name << '/index.html' name << '/'
else else
name << '.html' name << '.html'
end end
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment