github/pelican
1
0
Fork 1
mirror of https://github.com/getpelican/pelican.git synced 2025-10-15 20:28:56 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Normalize whitespace via lstrip Jinja parameter

Browse source 
This adds the lstrip_blocks Jinja parameter and removes unnecessary
whitespace from a few notmyidea templates.

Note: The lstrip_blocks parameter requires Jinja 2.7+, which has been
noted in Pelican's setup.py.

Credit for this commit goes entirely to Russ Webber, who has earned my
eternal thanks for discovering and applying this useful Jinja parameter.

Refs #969
This commit is contained in:
Justin Mayer 2013-08-03 16:17:26 -07:00
commit 76fa457654
66 changed files with 2004 additions and 2143 deletions
Download patch file Download diff file Expand all files Collapse all files

46
pelican/tests/output/basic/category/bar.html
View file

@ -4,8 +4,8 @@
<meta charset="utf-8">
<title>A Pelican Blog - bar</title>
<link rel="stylesheet" href="/theme/css/main.css">
<link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
<link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
<!--[if IE]>
<script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
<![endif]-->
@ -15,29 +15,27 @@
<header id="banner" class="body">
<h1><a href="/">A Pelican Blog </a></h1>
<nav><ul>
<li><a href="/override/">Override url/save_as</a></li>
<li><a href="/pages/this-is-a-test-page.html">This is a test page</a></li>
<li class="active"><a href="/category/bar.html">bar</a></li>
<li><a href="/category/cat1.html">cat1</a></li>
<li><a href="/category/misc.html">misc</a></li>
<li><a href="/category/yeah.html">yeah</a></li>
</ul></nav>
<li><a href="/override/">Override url/save_as</a></li>
<li><a href="/pages/this-is-a-test-page.html">This is a test page</a></li>
<li class="active"><a href="/category/bar.html">bar</a></li>
<li><a href="/category/cat1.html">cat1</a></li>
<li><a href="/category/misc.html">misc</a></li>
<li><a href="/category/yeah.html">yeah</a></li>
</ul></nav>
</header><!-- /#banner -->
<aside id="featured" class="body">
<aside id="featured" class="body">
<article>
<h1 class="entry-title"><a href="/oh-yeah.html">Oh yeah !</a></h1>
<footer class="post-info">
<h1 class="entry-title"><a href="/oh-yeah.html">Oh yeah !</a></h1>
<footer class="post-info">
<abbr class="published" title="2010-10-20T10:14:00">
Wed 20 October 2010
</abbr>
<address class="vcard author">
<address class="vcard author">
By <a class="url fn" href="/author/alexis-metaireau.html">Alexis Métaireau</a>
</address>
<p>In <a href="/category/bar.html">bar</a>. </p>
<p>In <a href="/category/bar.html">bar</a>. </p>
<p>tags: <a href="/tag/oh.html">oh</a><a href="/tag/bar.html">bar</a><a href="/tag/yeah.html">yeah</a></p>
</footer><!-- /.post-info --><div class="section" id="why-not">
<h2>Why not ?</h2>
@ -46,18 +44,18 @@ YEAH !</p>
<img alt="alternate text" src="|filename|/pictures/Sushi.jpg" style="width: 600px; height: 450px;" />
</div>
</article>
</aside><!-- /#featured -->
</ol><!-- /#posts-list -->
</section><!-- /#content -->
<section id="extras" class="body">
<div class="social">
</aside><!-- /#featured -->
</ol><!-- /#posts-list -->
</section><!-- /#content -->
<section id="extras" class="body">
<div class="social">
<h2>social</h2>
<ul>
<li><a href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
</ul>
</ul>
</div><!-- /.social -->
</section><!-- /#extras -->
</section><!-- /#extras -->
<footer id="contentinfo" class="body">
<address id="about" class="vcard body">

82
pelican/tests/output/basic/category/cat1.html
View file

@ -4,8 +4,8 @@
<meta charset="utf-8">
<title>A Pelican Blog - cat1</title>
<link rel="stylesheet" href="/theme/css/main.css">
<link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
<link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
<!--[if IE]>
<script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
<![endif]-->
@ -15,112 +15,104 @@
<header id="banner" class="body">
<h1><a href="/">A Pelican Blog </a></h1>
<nav><ul>
<li><a href="/override/">Override url/save_as</a></li>
<li><a href="/pages/this-is-a-test-page.html">This is a test page</a></li>
<li><a href="/category/bar.html">bar</a></li>
<li class="active"><a href="/category/cat1.html">cat1</a></li>
<li><a href="/category/misc.html">misc</a></li>
<li><a href="/category/yeah.html">yeah</a></li>
</ul></nav>
<li><a href="/override/">Override url/save_as</a></li>
<li><a href="/pages/this-is-a-test-page.html">This is a test page</a></li>
<li><a href="/category/bar.html">bar</a></li>
<li class="active"><a href="/category/cat1.html">cat1</a></li>
<li><a href="/category/misc.html">misc</a></li>
<li><a href="/category/yeah.html">yeah</a></li>
</ul></nav>
</header><!-- /#banner -->
<aside id="featured" class="body">
<aside id="featured" class="body">
<article>
<h1 class="entry-title"><a href="/a-markdown-powered-article.html">A markdown powered article</a></h1>
<footer class="post-info">
<h1 class="entry-title"><a href="/a-markdown-powered-article.html">A markdown powered article</a></h1>
<footer class="post-info">
<abbr class="published" title="2011-04-20T00:00:00">
Wed 20 April 2011
</abbr>
<p>In <a href="/category/cat1.html">cat1</a>. </p>
<p>In <a href="/category/cat1.html">cat1</a>. </p>
</footer><!-- /.post-info --><p>You're mutually oblivious.</p>
<p><a href="/unbelievable.html">a root-relative link to unbelievable</a>
<a href="/unbelievable.html">a file-relative link to unbelievable</a></p> </article>
</aside><!-- /#featured -->
<section id="content" class="body">
</aside><!-- /#featured -->
<section id="content" class="body">
<h1>Other articles</h1>
<hr />
<ol id="posts-list" class="hfeed">
<li><article class="hentry">
<li><article class="hentry">
<header>
<h1><a href="/article-1.html" rel="bookmark"
title="Permalink to Article 1">Article 1</a></h1>
</header>
<div class="entry-content">
<footer class="post-info">
<footer class="post-info">
<abbr class="published" title="2011-02-17T00:00:00">
Thu 17 February 2011
</abbr>
<p>In <a href="/category/cat1.html">cat1</a>. </p>
<p>In <a href="/category/cat1.html">cat1</a>. </p>
</footer><!-- /.post-info --> <p>Article 1</p>
<a class="readmore" href="/article-1.html">read more</a>
</div><!-- /.entry-content -->
</div><!-- /.entry-content -->
</article></li>
<li><article class="hentry">
<li><article class="hentry">
<header>
<h1><a href="/article-2.html" rel="bookmark"
title="Permalink to Article 2">Article 2</a></h1>
</header>
<div class="entry-content">
<footer class="post-info">
<footer class="post-info">
<abbr class="published" title="2011-02-17T00:00:00">
Thu 17 February 2011
</abbr>
<p>In <a href="/category/cat1.html">cat1</a>. </p>
<p>In <a href="/category/cat1.html">cat1</a>. </p>
</footer><!-- /.post-info --> <p>Article 2</p>
<a class="readmore" href="/article-2.html">read more</a>
</div><!-- /.entry-content -->
</div><!-- /.entry-content -->
</article></li>
<li><article class="hentry">
<li><article class="hentry">
<header>
<h1><a href="/article-3.html" rel="bookmark"
title="Permalink to Article 3">Article 3</a></h1>
</header>
<div class="entry-content">
<footer class="post-info">
<footer class="post-info">
<abbr class="published" title="2011-02-17T00:00:00">
Thu 17 February 2011
</abbr>
<p>In <a href="/category/cat1.html">cat1</a>. </p>
<p>In <a href="/category/cat1.html">cat1</a>. </p>
</footer><!-- /.post-info --> <p>Article 3</p>
<a class="readmore" href="/article-3.html">read more</a>
</div><!-- /.entry-content -->
</div><!-- /.entry-content -->
</article></li>
</ol><!-- /#posts-list -->
</section><!-- /#content -->
<section id="extras" class="body">
<div class="social">
</ol><!-- /#posts-list -->
</section><!-- /#content -->
<section id="extras" class="body">
<div class="social">
<h2>social</h2>
<ul>
<li><a href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
</ul>
</ul>
</div><!-- /.social -->
</section><!-- /#extras -->
</section><!-- /#extras -->
<footer id="contentinfo" class="body">
<address id="about" class="vcard body">

76
pelican/tests/output/basic/category/misc.html
View file

@ -4,8 +4,8 @@
<meta charset="utf-8">
<title>A Pelican Blog - misc</title>
<link rel="stylesheet" href="/theme/css/main.css">
<link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
<link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
<!--[if IE]>
<script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
<![endif]-->
@ -15,93 +15,87 @@
<header id="banner" class="body">
<h1><a href="/">A Pelican Blog </a></h1>
<nav><ul>
<li><a href="/override/">Override url/save_as</a></li>
<li><a href="/pages/this-is-a-test-page.html">This is a test page</a></li>
<li><a href="/category/bar.html">bar</a></li>
<li><a href="/category/cat1.html">cat1</a></li>
<li class="active"><a href="/category/misc.html">misc</a></li>
<li><a href="/category/yeah.html">yeah</a></li>
</ul></nav>
<li><a href="/override/">Override url/save_as</a></li>
<li><a href="/pages/this-is-a-test-page.html">This is a test page</a></li>
<li><a href="/category/bar.html">bar</a></li>
<li><a href="/category/cat1.html">cat1</a></li>
<li class="active"><a href="/category/misc.html">misc</a></li>
<li><a href="/category/yeah.html">yeah</a></li>
</ul></nav>
</header><!-- /#banner -->
<aside id="featured" class="body">
<aside id="featured" class="body">
<article>
<h1 class="entry-title"><a href="/filename_metadata-example.html">FILENAME_METADATA example</a></h1>
<footer class="post-info">
<h1 class="entry-title"><a href="/filename_metadata-example.html">FILENAME_METADATA example</a></h1>
<footer class="post-info">
<abbr class="published" title="2012-11-30T00:00:00">
Fri 30 November 2012
</abbr>
<p>In <a href="/category/misc.html">misc</a>. </p>
<p>In <a href="/category/misc.html">misc</a>. </p>
</footer><!-- /.post-info --><p>Some cool stuff!</p>
</article>
</aside><!-- /#featured -->
<section id="content" class="body">
</aside><!-- /#featured -->
<section id="content" class="body">
<h1>Other articles</h1>
<hr />
<ol id="posts-list" class="hfeed">
<li><article class="hentry">
<li><article class="hentry">
<header>
<h1><a href="/second-article.html" rel="bookmark"
title="Permalink to Second article">Second article</a></h1>
</header>
<div class="entry-content">
<footer class="post-info">
<footer class="post-info">
<abbr class="published" title="2012-02-29T00:00:00">
Wed 29 February 2012
</abbr>
<p>In <a href="/category/misc.html">misc</a>. </p>
<p>tags: <a href="/tag/foo.html">foo</a><a href="/tag/bar.html">bar</a><a href="/tag/baz.html">baz</a></p>Translations:
<a href="/second-article-fr.html">fr</a>
<p>In <a href="/category/misc.html">misc</a>. </p>
<p>tags: <a href="/tag/foo.html">foo</a><a href="/tag/bar.html">bar</a><a href="/tag/baz.html">baz</a></p>Translations:
<a href="/second-article-fr.html">fr</a>
</footer><!-- /.post-info --> <p>This is some article, in english</p>
<a class="readmore" href="/second-article.html">read more</a>
</div><!-- /.entry-content -->
</div><!-- /.entry-content -->
</article></li>
<li><article class="hentry">
<li><article class="hentry">
<header>
<h1><a href="/unbelievable.html" rel="bookmark"
title="Permalink to Unbelievable !">Unbelievable !</a></h1>
</header>
<div class="entry-content">
<footer class="post-info">
<footer class="post-info">
<abbr class="published" title="2010-10-15T20:30:00">
Fri 15 October 2010
</abbr>
<p>In <a href="/category/misc.html">misc</a>. </p>
<p>In <a href="/category/misc.html">misc</a>. </p>
</footer><!-- /.post-info --> <p>Or completely awesome. Depends the needs.</p>
<p><a class="reference external" href="/a-markdown-powered-article.html">a root-relative link to markdown-article</a>
<a class="reference external" href="/a-markdown-powered-article.html">a file-relative link to markdown-article</a></p>
<a class="readmore" href="/unbelievable.html">read more</a>
</div><!-- /.entry-content -->
</div><!-- /.entry-content -->
</article></li>
</ol><!-- /#posts-list -->
</section><!-- /#content -->
<section id="extras" class="body">
<div class="social">
</ol><!-- /#posts-list -->
</section><!-- /#content -->
<section id="extras" class="body">
<div class="social">
<h2>social</h2>
<ul>
<li><a href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
</ul>
</ul>
</div><!-- /.social -->
</section><!-- /#extras -->
</section><!-- /#extras -->
<footer id="contentinfo" class="body">
<address id="about" class="vcard body">

46
pelican/tests/output/basic/category/yeah.html
View file

@ -4,8 +4,8 @@
<meta charset="utf-8">
<title>A Pelican Blog - yeah</title>
<link rel="stylesheet" href="/theme/css/main.css">
<link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
<link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
<!--[if IE]>
<script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
<![endif]-->
@ -15,29 +15,27 @@
<header id="banner" class="body">
<h1><a href="/">A Pelican Blog </a></h1>
<nav><ul>
<li><a href="/override/">Override url/save_as</a></li>
<li><a href="/pages/this-is-a-test-page.html">This is a test page</a></li>
<li><a href="/category/bar.html">bar</a></li>
<li><a href="/category/cat1.html">cat1</a></li>
<li><a href="/category/misc.html">misc</a></li>
<li class="active"><a href="/category/yeah.html">yeah</a></li>
</ul></nav>
<li><a href="/override/">Override url/save_as</a></li>
<li><a href="/pages/this-is-a-test-page.html">This is a test page</a></li>
<li><a href="/category/bar.html">bar</a></li>
<li><a href="/category/cat1.html">cat1</a></li>
<li><a href="/category/misc.html">misc</a></li>
<li class="active"><a href="/category/yeah.html">yeah</a></li>
</ul></nav>
</header><!-- /#banner -->
<aside id="featured" class="body">
<aside id="featured" class="body">
<article>
<h1 class="entry-title"><a href="/this-is-a-super-article.html">This is a super article !</a></h1>
<footer class="post-info">
<h1 class="entry-title"><a href="/this-is-a-super-article.html">This is a super article !</a></h1>
<footer class="post-info">
<abbr class="published" title="2010-12-02T10:14:00">
Thu 02 December 2010
</abbr>
<address class="vcard author">
<address class="vcard author">
By <a class="url fn" href="/author/alexis-metaireau.html">Alexis Métaireau</a>
</address>
<p>In <a href="/category/yeah.html">yeah</a>. </p>
<p>In <a href="/category/yeah.html">yeah</a>. </p>
<p>tags: <a href="/tag/foo.html">foo</a><a href="/tag/bar.html">bar</a><a href="/tag/foobar.html">foobar</a></p>
</footer><!-- /.post-info --><p>Some content here !</p>
<div class="section" id="this-is-a-simple-title">
@ -52,18 +50,18 @@
<p>→ And now try with some utf8 hell: ééé</p>
</div>
</article>
</aside><!-- /#featured -->
</ol><!-- /#posts-list -->
</section><!-- /#content -->
<section id="extras" class="body">
<div class="social">
</aside><!-- /#featured -->
</ol><!-- /#posts-list -->
</section><!-- /#content -->
<section id="extras" class="body">
<div class="social">
<h2>social</h2>
<ul>
<li><a href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
</ul>
</ul>
</div><!-- /.social -->
</section><!-- /#extras -->
</section><!-- /#extras -->
<footer id="contentinfo" class="body">
<address id="about" class="vcard body">