Skip to content
Permalink
Browse files

Merge branch 'master' into fix-1983

  • Loading branch information
ralsina committed Sep 2, 2015
2 parents 791a168 + 72c1360 commit 2bef946cce85c8c014e377b7a3b4d0715cd4f523
@@ -5,10 +5,10 @@
${parent.extra_head()}
%if len(translations) > 1 and generate_rss:
%for language in sorted(translations):
<link rel="alternate" type="application/rss+xml" type="application/rss+xml" title="RSS for ${kind} ${author} (${language})" href="${_link(kind + "_rss", author, language)}">
<link rel="alternate" type="application/rss+xml" title="RSS for ${kind} ${author} (${language})" href="${_link(kind + "_rss", author, language)}">
%endfor
%elif generate_rss:
<link rel="alternate" type="application/rss+xml" type="application/rss+xml" title="RSS for ${kind} ${author}" href="${_link(kind + "_rss", author)}">
<link rel="alternate" type="application/rss+xml" title="RSS for ${kind} ${author}" href="${_link(kind + "_rss", author)}">
%endif
</%block>

@@ -5,10 +5,10 @@
${parent.extra_head()}
%if len(translations) > 1 and generate_rss:
%for language in sorted(translations):
<link rel="alternate" type="application/rss+xml" type="application/rss+xml" title="RSS for ${kind} ${tag} (${language})" href="${_link(kind + "_rss", tag, language)}">
<link rel="alternate" type="application/rss+xml" title="RSS for ${kind} ${tag} (${language})" href="${_link(kind + "_rss", tag, language)}">
%endfor
%elif generate_rss:
<link rel="alternate" type="application/rss+xml" type="application/rss+xml" title="RSS for ${kind} ${tag}" href="${_link(kind + "_rss", tag)}">
<link rel="alternate" type="application/rss+xml" title="RSS for ${kind} ${tag}" href="${_link(kind + "_rss", tag)}">
%endif
</%block>

@@ -77,7 +77,9 @@ def gen_tasks(self):
task['uptodate'] = [utils.config_changed(kw, 'nikola.plugins.task.copy_assets')]
task['basename'] = self.name
if code_css_input:
task['file_dep'] = [code_css_input]
if 'file_dep' not in task:
task['file_dep'] = []
task['file_dep'].append(code_css_input)
yield utils.apply_filters(task, kw['filters'])

# Check whether or not there is a code.css file around.

0 comments on commit 2bef946

Please sign in to comment.
You can’t perform that action at this time.