Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: getnikola/nikola
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 99759ad1fa39^
Choose a base ref
...
head repository: getnikola/nikola
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: e2fb828831ba
Choose a head ref
  • 2 commits
  • 6 files changed
  • 1 contributor

Commits on Sep 20, 2015

  1. Add missing escape for author 

    Signed-off-by: Chris Warrick <kwpolska@gmail.com>
    @Kwpolska
    Kwpolska committed Sep 20, 2015
    Copy the full SHA
    99759ad View commit details

  2. Fix getnikola/nikola-site#32 -- don’t escape navbar contents 

    Signed-off-by: Chris Warrick <kwpolska@gmail.com>
    @Kwpolska
    Kwpolska committed Sep 20, 2015
    Copy the full SHA
    e2fb828 View commit details
8 changes: 4 additions & 4 deletions nikola/data/themes/base-jinja/templates/base_header.tmpl
View file
Original file line number Diff line number Diff line change
@@ -36,17 +36,17 @@
<ul>
{% for suburl, text in url %}
{% if rel_link(permalink, suburl) == "#" %}
<li class="active"><a href="{{ permalink }}">{{ text|e }} <span class="sr-only">{{ messages("(active)", lang) }}</span></a></li>
<li class="active"><a href="{{ permalink }}">{{ text }} <span class="sr-only">{{ messages("(active)", lang) }}</span></a></li>
{% else %}
<li><a href="{{ suburl }}">{{ text|e }}</a></li>
<li><a href="{{ suburl }}">{{ text }}</a></li>
{% endif %}
{% endfor %}
</ul>
{% else %}
{% if rel_link(permalink, url) == "#" %}
<li class="active"><a href="{{ permalink }}">{{ text|e }} <span class="sr-only">{{ messages("(active)", lang) }}</span></a></li>
<li class="active"><a href="{{ permalink }}">{{ text }} <span class="sr-only">{{ messages("(active)", lang) }}</span></a></li>
{% else %}
<li><a href="{{ url }}">{{ text|e }}</a></li>
<li><a href="{{ url }}">{{ text }}</a></li>
{% endif %}
{% endif %}
{% endfor %}
2 changes: 1 addition & 1 deletion nikola/data/themes/base-jinja/templates/index.tmpl
View file
Original file line number Diff line number Diff line change
@@ -20,7 +20,7 @@
<div class="metadata">
<p class="byline author vcard"><span class="byline-name fn">
{% if author_pages_generated %}
<a href="{{ _link('author', post.author()) }}">{{ post.author() }}</a>
<a href="{{ _link('author', post.author()) }}">{{ post.author()|e }}</a>
{% else %}
{{ post.author()|e }}
{% endif %}
8 changes: 4 additions & 4 deletions nikola/data/themes/base/templates/base_header.tmpl
View file
Original file line number Diff line number Diff line change
@@ -36,17 +36,17 @@
<ul>
%for suburl, text in url:
% if rel_link(permalink, suburl) == "#":
<li class="active"><a href="${permalink}">${text|h} <span class="sr-only">${messages("(active)", lang)}</span></a></li>
<li class="active"><a href="${permalink}">${text} <span class="sr-only">${messages("(active)", lang)}</span></a></li>
%else:
<li><a href="${suburl}">${text|h}</a></li>
<li><a href="${suburl}">${text}</a></li>
%endif
%endfor
</ul>
% else:
% if rel_link(permalink, url) == "#":
<li class="active"><a href="${permalink}">${text|h} <span class="sr-only">${messages("(active)", lang)}</span></a></li>
<li class="active"><a href="${permalink}">${text} <span class="sr-only">${messages("(active)", lang)}</span></a></li>
%else:
<li><a href="${url}">${text|h}</a></li>
<li><a href="${url}">${text}</a></li>
%endif
% endif
%endfor
2 changes: 1 addition & 1 deletion nikola/data/themes/base/templates/index.tmpl
View file
Original file line number Diff line number Diff line change
@@ -20,7 +20,7 @@
<div class="metadata">
<p class="byline author vcard"><span class="byline-name fn">
% if author_pages_generated:
<a href="${_link('author', post.author())}">${post.author()}</a>
<a href="${_link('author', post.author())}">${post.author()|h}</a>
% else:
${post.author()|h}
% endif
8 changes: 4 additions & 4 deletions nikola/data/themes/bootstrap3-jinja/templates/base_helper.tmpl
View file
Original file line number Diff line number Diff line change
@@ -139,17 +139,17 @@ lang="{{ lang }}">
<ul class="dropdown-menu">
{% for suburl, text in url %}
{% if rel_link(permalink, suburl) == "#" %}
<li class="active"><a href="{{ permalink }}">{{ text|e }} <span class="sr-only">{{ messages("(active)", lang) }}</span></a>
<li class="active"><a href="{{ permalink }}">{{ text }} <span class="sr-only">{{ messages("(active)", lang) }}</span></a>
{% else %}
<li><a href="{{ suburl }}">{{ text|e }}</a>
<li><a href="{{ suburl }}">{{ text }}</a>
{% endif %}
{% endfor %}
</ul>
{% else %}
{% if rel_link(permalink, url) == "#" %}
<li class="active"><a href="{{ permalink }}">{{ text|e }} <span class="sr-only">{{ messages("(active)", lang) }}</span></a>
<li class="active"><a href="{{ permalink }}">{{ text }} <span class="sr-only">{{ messages("(active)", lang) }}</span></a>
{% else %}
<li><a href="{{ url }}">{{ text|e }}</a>
<li><a href="{{ url }}">{{ text }}</a>
{% endif %}
{% endif %}
{% endfor %}
8 changes: 4 additions & 4 deletions nikola/data/themes/bootstrap3/templates/base_helper.tmpl
View file
Original file line number Diff line number Diff line change
@@ -139,17 +139,17 @@ lang="${lang}">
<ul class="dropdown-menu">
%for suburl, text in url:
% if rel_link(permalink, suburl) == "#":
<li class="active"><a href="${permalink}">${text|h} <span class="sr-only">${messages("(active)", lang)}</span></a>
<li class="active"><a href="${permalink}">${text} <span class="sr-only">${messages("(active)", lang)}</span></a>
%else:
<li><a href="${suburl}">${text|h}</a>
<li><a href="${suburl}">${text}</a>
%endif
%endfor
</ul>
% else:
% if rel_link(permalink, url) == "#":
<li class="active"><a href="${permalink}">${text|h} <span class="sr-only">${messages("(active)", lang)}</span></a>
<li class="active"><a href="${permalink}">${text} <span class="sr-only">${messages("(active)", lang)}</span></a>
%else:
<li><a href="${url}">${text|h}</a>
<li><a href="${url}">${text}</a>
%endif
% endif
%endfor