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

Signed-off-by: Chris Warrick <kwpolska@gmail.com>
getnikola · Sep 20, 2015 · e2fb828 · e2fb828
1 parent 99759ad
commit e2fb828
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 16 deletions.
diff --git a/nikola/data/themes/base-jinja/templates/base_header.tmpl b/nikola/data/themes/base-jinja/templates/base_header.tmpl
@@ -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 %}

diff --git a/nikola/data/themes/base/templates/base_header.tmpl b/nikola/data/themes/base/templates/base_header.tmpl
@@ -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

diff --git a/nikola/data/themes/bootstrap3-jinja/templates/base_helper.tmpl b/nikola/data/themes/bootstrap3-jinja/templates/base_helper.tmpl
@@ -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 %}

diff --git a/nikola/data/themes/bootstrap3/templates/base_helper.tmpl b/nikola/data/themes/bootstrap3/templates/base_helper.tmpl
@@ -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