Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
sane post title display (cc @Aeyoun)
Signed-off-by: Chris Warrick <kwpolska@gmail.com>
  • Loading branch information
Kwpolska committed Feb 2, 2015
1 parent d741c58 commit 6e71bd1
Show file tree
Hide file tree
Showing 10 changed files with 13 additions and 15 deletions.
2 changes: 1 addition & 1 deletion nikola/data/themes/base-jinja/templates/gallery.tmpl
Expand Up @@ -7,7 +7,7 @@
{% block content %}
{{ ui.bar(crumbs) }}
{% if title %}
<h1>{{ title }}</h1>
<h1>{{ title|e }}</h1>
{% endif %}
{% if post %}
<p>
Expand Down
2 changes: 1 addition & 1 deletion nikola/data/themes/base-jinja/templates/index.tmpl
Expand Up @@ -8,7 +8,7 @@
{% for post in posts %}
<article class="h-entry post-{{ post.meta('type') }}">
<header>
<h1 class="p-name entry-title"><a href="{{ post.permalink() }}" class="u-url">{{ post.title() }}</a></h1>
<h1 class="p-name entry-title"><a href="{{ post.permalink() }}" class="u-url">{{ post.title()|e }}</a></h1>
<div class="metadata">
<p class="byline author vcard"><span class="byline-name fn">{{ post.author() }}</span></p>
<p class="dateline"><a href="{{ post.permalink() }}" rel="bookmark"><time class="published dt-published" datetime="{{ post.date.isoformat() }}" title="{{ post.formatted_date(date_format) }}">{{ post.formatted_date(date_format) }}</time></a></p>
Expand Down
2 changes: 1 addition & 1 deletion nikola/data/themes/base-jinja/templates/post_header.tmpl
Expand Up @@ -4,7 +4,7 @@

{% macro html_title() %}
{% if title and not post.meta('hidetitle') %}
<h1 class="p-name entry-title" itemprop="headline name"><a href="{{ post.permalink() }}" class="u-url">{{ title|e }}</a></h1>
<h1 class="p-name entry-title" itemprop="headline name"><a href="{{ post.permalink() }}" class="u-url">{{ post.title()|e }}</a></h1>
{% endif %}
{% endmacro %}

Expand Down
4 changes: 2 additions & 2 deletions nikola/data/themes/base/templates/gallery.tmpl
Expand Up @@ -7,7 +7,7 @@
<%block name="content">
${ui.bar(crumbs)}
%if title:
<h1>${title}</h1>
<h1>${title|h}</h1>
%endif
%if post:
<p>
Expand Down Expand Up @@ -38,4 +38,4 @@
<%block name="extra_head">
${parent.extra_head()}
<link rel="alternate" type="application/rss+xml" title="RSS" href="rss.xml">
</%block>
</%block>
2 changes: 1 addition & 1 deletion nikola/data/themes/base/templates/index.tmpl
Expand Up @@ -8,7 +8,7 @@
% for post in posts:
<article class="h-entry post-${post.meta('type')}">
<header>
<h1 class="p-name entry-title"><a href="${post.permalink()}" class="u-url">${post.title()}</a></h1>
<h1 class="p-name entry-title"><a href="${post.permalink()}" class="u-url">${post.title()|h}</a></h1>
<div class="metadata">
<p class="byline author vcard"><span class="byline-name fn">${post.author()}</span></p>
<p class="dateline"><a href="${post.permalink()}" rel="bookmark"><time class="published dt-published" datetime="${post.date.isoformat()}" title="${post.formatted_date(date_format)}">${post.formatted_date(date_format)}</time></a></p>
Expand Down
2 changes: 1 addition & 1 deletion nikola/data/themes/base/templates/post_header.tmpl
Expand Up @@ -4,7 +4,7 @@

<%def name="html_title()">
%if title and not post.meta('hidetitle'):
<h1 class="p-name entry-title" itemprop="headline name"><a href="${post.permalink()}" class="u-url">${title|h}</a></h1>
<h1 class="p-name entry-title" itemprop="headline name"><a href="${post.permalink()}" class="u-url">${post.title()|h}</a></h1>
%endif
</%def>

Expand Down
2 changes: 1 addition & 1 deletion nikola/data/themes/bootstrap-jinja/templates/gallery.tmpl
Expand Up @@ -7,7 +7,7 @@
{% block content %}
{{ ui.bar(crumbs) }}
{% if title %}
<h1>{{ title }}</h1>
<h1>{{ title|e }}</h1>
{% endif %}
{% if post %}
<p>
Expand Down
2 changes: 1 addition & 1 deletion nikola/data/themes/bootstrap/templates/gallery.tmpl
Expand Up @@ -7,7 +7,7 @@
<%block name="content">
${ui.bar(crumbs)}
%if title:
<h1>${title}</h1>
<h1>${title|h}</h1>
%endif
%if post:
<p>
Expand Down
5 changes: 2 additions & 3 deletions nikola/data/themes/bootstrap3-jinja/templates/gallery.tmpl
Expand Up @@ -7,7 +7,7 @@
{% block content %}
{{ ui.bar(crumbs) }}
{% if title %}
<h1>{{ title }}</h1>
<h1>{{ title|e }}</h1>
{% endif %}
{% if post %}
<p>
Expand All @@ -17,8 +17,7 @@
{% if folders %}
<ul>
{% for folder, ftitle in folders %}
<li><a href="{{ folder }}"><i class="glyphicon
glyphicon-folder-open"></i>&nbsp;{{ ftitle }}</a></li>
<li><a href="{{ folder }}"><i class="glyphicon glyphicon-folder-open"></i>&nbsp;{{ ftitle }}</a></li>
{% endfor %}
</ul>
{% endif %}
Expand Down
5 changes: 2 additions & 3 deletions nikola/data/themes/bootstrap3/templates/gallery.tmpl
Expand Up @@ -7,7 +7,7 @@
<%block name="content">
${ui.bar(crumbs)}
%if title:
<h1>${title}</h1>
<h1>${title|h}</h1>
%endif
%if post:
<p>
Expand All @@ -17,8 +17,7 @@
%if folders:
<ul>
% for folder, ftitle in folders:
<li><a href="${folder}"><i class="glyphicon
glyphicon-folder-open"></i>&nbsp;${ftitle}</a></li>
<li><a href="${folder}"><i class="glyphicon glyphicon-folder-open"></i>&nbsp;${ftitle}</a></li>
% endfor
</ul>
%endif
Expand Down

0 comments on commit 6e71bd1

Please sign in to comment.