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: e2fb828831ba
Choose a base ref
...
head repository: getnikola/nikola
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 602fcede01e1
Choose a head ref
  • 2 commits
  • 8 files changed
  • 1 contributor

Commits on Sep 20, 2015

  1. Remove leftover escape (navbar dropdown header) 

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

  2. Remove escapes from author and tag descriptions 

    Signed-off-by: Chris Warrick <kwpolska@gmail.com>
    @Kwpolska
    Kwpolska committed Sep 20, 2015
    Copy the full SHA
    602fced View commit details
2 changes: 1 addition & 1 deletion nikola/data/themes/base-jinja/templates/author.tmpl
View file
Original file line number Diff line number Diff line change
@@ -18,7 +18,7 @@
<header>
<h1>{{ title|e }}</h1>
{% if description %}
<p>{{ description|e }}</p>
<p>{{ description }}</p>
{% endif %}
<div class="metadata">
{% if translations|length > 1 and generate_rss %}
2 changes: 1 addition & 1 deletion nikola/data/themes/base-jinja/templates/base_header.tmpl
View file
Original file line number Diff line number Diff line change
@@ -32,7 +32,7 @@
<ul>
{% for url, text in navigation_links[lang] %}
{% if isinstance(url, tuple) %}
<li> {{ text|e }}
<li> {{ text }}
<ul>
{% for suburl, text in url %}
{% if rel_link(permalink, suburl) == "#" %}
2 changes: 1 addition & 1 deletion nikola/data/themes/base-jinja/templates/tag.tmpl
View file
Original file line number Diff line number Diff line change
@@ -18,7 +18,7 @@
<header>
<h1>{{ title|e }}</h1>
{% if description %}
<p>{{ description|e }}</p>
<p>{{ description }}</p>
{% endif %}
{% if subcategories %}
{{ messages('Subcategories:') }}
2 changes: 1 addition & 1 deletion nikola/data/themes/base/templates/author.tmpl
View file
Original file line number Diff line number Diff line change
@@ -18,7 +18,7 @@
<header>
<h1>${title|h}</h1>
%if description:
<p>${description|h}</p>
<p>${description}</p>
%endif
<div class="metadata">
%if len(translations) > 1 and generate_rss:
2 changes: 1 addition & 1 deletion nikola/data/themes/base/templates/base_header.tmpl
View file
Original file line number Diff line number Diff line change
@@ -32,7 +32,7 @@
<ul>
%for url, text in navigation_links[lang]:
% if isinstance(url, tuple):
<li> ${text|h}
<li> ${text}
<ul>
%for suburl, text in url:
% if rel_link(permalink, suburl) == "#":
2 changes: 1 addition & 1 deletion nikola/data/themes/base/templates/tag.tmpl
View file
Original file line number Diff line number Diff line change
@@ -18,7 +18,7 @@
<header>
<h1>${title|h}</h1>
%if description:
<p>${description|h}</p>
<p>${description}</p>
%endif
%if subcategories:
${messages('Subcategories:')}
2 changes: 1 addition & 1 deletion nikola/data/themes/bootstrap3-jinja/templates/base_helper.tmpl
View file
Original file line number Diff line number Diff line change
@@ -135,7 +135,7 @@ lang="{{ lang }}">
{% macro html_navigation_links() %}
{% for url, text in navigation_links[lang] %}
{% if isinstance(url, tuple) %}
<li class="dropdown"><a href="#" class="dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">{{ text|e }} <b class="caret"></b></a>
<li class="dropdown"><a href="#" class="dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">{{ text }} <b class="caret"></b></a>
<ul class="dropdown-menu">
{% for suburl, text in url %}
{% if rel_link(permalink, suburl) == "#" %}
2 changes: 1 addition & 1 deletion nikola/data/themes/bootstrap3/templates/base_helper.tmpl
View file
Original file line number Diff line number Diff line change
@@ -135,7 +135,7 @@ lang="${lang}">
<%def name="html_navigation_links()">
%for url, text in navigation_links[lang]:
% if isinstance(url, tuple):
<li class="dropdown"><a href="#" class="dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">${text|h} <b class="caret"></b></a>
<li class="dropdown"><a href="#" class="dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">${text} <b class="caret"></b></a>
<ul class="dropdown-menu">
%for suburl, text in url:
% if rel_link(permalink, suburl) == "#":