mirror of
https://github.com/getpelican/pelican.git
synced 2025-10-15 20:28:56 +02:00
Apply typogrify on the title.
As it is done when reading the file, we need to remove html tags for the permalink and the slug (this is done here for the notmyidea and simple themes). While modifying the themes I also replaced the `pagename` template tag with `article.url` (`pagename` was an empty variable, no more used ?).
This commit is contained in:
parent
acf9b0597d
commit
4a0d4461e1
4 changed files with 53 additions and 42 deletions
|
|
@ -174,5 +174,6 @@ def read_file(filename, fmt=None, settings=None):
|
||||||
if settings and settings['TYPOGRIFY']:
|
if settings and settings['TYPOGRIFY']:
|
||||||
from typogrify import Typogrify
|
from typogrify import Typogrify
|
||||||
content = Typogrify.typogrify(content)
|
content = Typogrify.typogrify(content)
|
||||||
|
metadata['title'] = Typogrify.typogrify(metadata['title'])
|
||||||
|
|
||||||
return content, metadata
|
return content, metadata
|
||||||
|
|
|
||||||
|
|
@ -1,11 +1,15 @@
|
||||||
{% extends "base.html" %}
|
{% extends "base.html" %}
|
||||||
{% block title %}{{ article.title }}{% endblock %}
|
{% block title %}{{ article.title|striptags }}{% endblock %}
|
||||||
{% block content %}
|
{% block content %}
|
||||||
<section id="content" class="body">
|
<section id="content" class="body">
|
||||||
<article>
|
<article>
|
||||||
<header> <h1 class="entry-title"><a href="{{ pagename }}"
|
<header>
|
||||||
rel="bookmark" title="Permalink to {{ article.title }}">{{ article.title
|
<h1 class="entry-title">
|
||||||
}}</a></h1> {% include 'twitter.html' %} </header>
|
<a href="{{ article.url }}" rel="bookmark"
|
||||||
|
title="Permalink to {{ article.title|striptags }}">{{ article.title}}</a></h1>
|
||||||
|
{% include 'twitter.html' %}
|
||||||
|
</header>
|
||||||
|
|
||||||
<div class="entry-content">
|
<div class="entry-content">
|
||||||
{% include 'article_infos.html' %}
|
{% include 'article_infos.html' %}
|
||||||
{{ article.content }}
|
{{ article.content }}
|
||||||
|
|
|
||||||
|
|
@ -1,7 +1,11 @@
|
||||||
{% extends "base.html" %}
|
{% extends "base.html" %}
|
||||||
{% block content %}
|
{% block content %}
|
||||||
<section id="content" class="body">
|
<section id="content" class="body">
|
||||||
<header> <h2 class="entry-title"><a href="{{ pagename }}" rel="bookmark" title="Permalink to {{ article.title}}">{{ article.title }}</a></h2> </header>
|
<header>
|
||||||
|
<h2 class="entry-title">
|
||||||
|
<a href="{{ article.url }}" rel="bookmark"
|
||||||
|
title="Permalink to {{ article.title|striptags }}">{{ article.title }}</a></h2>
|
||||||
|
</header>
|
||||||
<footer class="post-info">
|
<footer class="post-info">
|
||||||
<abbr class="published" title="{{ article.date.isoformat() }}">
|
<abbr class="published" title="{{ article.date.isoformat() }}">
|
||||||
{{ article.locale_date }}
|
{{ article.locale_date }}
|
||||||
|
|
|
||||||
|
|
@ -8,6 +8,7 @@ import logging
|
||||||
from codecs import open as _open
|
from codecs import open as _open
|
||||||
from datetime import datetime
|
from datetime import datetime
|
||||||
from itertools import groupby
|
from itertools import groupby
|
||||||
|
from jinja2 import Markup
|
||||||
from operator import attrgetter
|
from operator import attrgetter
|
||||||
|
|
||||||
logger = logging.getLogger(__name__)
|
logger = logging.getLogger(__name__)
|
||||||
|
|
@ -44,6 +45,7 @@ def slugify(value):
|
||||||
|
|
||||||
Took from django sources.
|
Took from django sources.
|
||||||
"""
|
"""
|
||||||
|
value = Markup(value).striptags()
|
||||||
if type(value) == unicode:
|
if type(value) == unicode:
|
||||||
import unicodedata
|
import unicodedata
|
||||||
value = unicodedata.normalize('NFKD', value).encode('ascii', 'ignore')
|
value = unicodedata.normalize('NFKD', value).encode('ascii', 'ignore')
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue