weeheavy/pelican-theme
1
0
Fork 0
forked from github/pelican
Code Pull requests Activity

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

1
pelican/generators.py
View file

@ -56,6 +56,7 @@ class Generator(object):
"themes", "simple", "templates"))
self.env = Environment(
trim_blocks=True,
lstrip_blocks=True,
loader=ChoiceLoader([
FileSystemLoader(self._templates_path),
simple_loader, # implicit inheritance

4
pelican/tests/output/basic/author/alexis-metaireau.html
View file

@ -24,8 +24,6 @@
</ul></nav>
</header><!-- /#banner -->
<aside id="featured" class="body">
<article>
<h1 class="entry-title"><a href="/oh-yeah.html">Oh yeah !</a></h1>
@ -52,8 +50,6 @@ YEAH !</p>
<hr />
<ol id="posts-list" class="hfeed">
<li><article class="hentry">
<header>
<h1><a href="/this-is-a-super-article.html" rel="bookmark"

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

@ -24,8 +24,6 @@
</ul></nav>
</header><!-- /#banner -->
<aside id="featured" class="body">
<article>
<h1 class="entry-title"><a href="/oh-yeah.html">Oh yeah !</a></h1>

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

@ -24,8 +24,6 @@
</ul></nav>
</header><!-- /#banner -->
<aside id="featured" class="body">
<article>
<h1 class="entry-title"><a href="/a-markdown-powered-article.html">A markdown powered article</a></h1>
@ -45,8 +43,6 @@
<hr />
<ol id="posts-list" class="hfeed">
<li><article class="hentry">
<header>
<h1><a href="/article-1.html" rel="bookmark"
@ -67,8 +63,6 @@
</div><!-- /.entry-content -->
</article></li>
<li><article class="hentry">
<header>
<h1><a href="/article-2.html" rel="bookmark"
@ -89,8 +83,6 @@
</div><!-- /.entry-content -->
</article></li>
<li><article class="hentry">
<header>
<h1><a href="/article-3.html" rel="bookmark"

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

@ -24,8 +24,6 @@
</ul></nav>
</header><!-- /#banner -->
<aside id="featured" class="body">
<article>
<h1 class="entry-title"><a href="/filename_metadata-example.html">FILENAME_METADATA example</a></h1>
@ -44,8 +42,6 @@
<hr />
<ol id="posts-list" class="hfeed">
<li><article class="hentry">
<header>
<h1><a href="/second-article.html" rel="bookmark"
@ -68,8 +64,6 @@
</div><!-- /.entry-content -->
</article></li>
<li><article class="hentry">
<header>
<h1><a href="/unbelievable.html" rel="bookmark"

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

@ -24,8 +24,6 @@
</ul></nav>
</header><!-- /#banner -->
<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>

18
pelican/tests/output/basic/index.html
View file

@ -24,8 +24,6 @@
</ul></nav>
</header><!-- /#banner -->
<aside id="featured" class="body">
<article>
<h1 class="entry-title"><a href="/filename_metadata-example.html">FILENAME_METADATA example</a></h1>
@ -44,8 +42,6 @@
<hr />
<ol id="posts-list" class="hfeed">
<li><article class="hentry">
<header>
<h1><a href="/second-article.html" rel="bookmark"
@ -68,8 +64,6 @@
</div><!-- /.entry-content -->
</article></li>
<li><article class="hentry">
<header>
<h1><a href="/a-markdown-powered-article.html" rel="bookmark"
@ -91,8 +85,6 @@
</div><!-- /.entry-content -->
</article></li>
<li><article class="hentry">
<header>
<h1><a href="/article-1.html" rel="bookmark"
@ -113,8 +105,6 @@
</div><!-- /.entry-content -->
</article></li>
<li><article class="hentry">
<header>
<h1><a href="/article-2.html" rel="bookmark"
@ -135,8 +125,6 @@
</div><!-- /.entry-content -->
</article></li>
<li><article class="hentry">
<header>
<h1><a href="/article-3.html" rel="bookmark"
@ -157,8 +145,6 @@
</div><!-- /.entry-content -->
</article></li>
<li><article class="hentry">
<header>
<h1><a href="/this-is-a-super-article.html" rel="bookmark"
@ -183,8 +169,6 @@ as well as <strong>inline markup</strong>.</p>
</div><!-- /.entry-content -->
</article></li>
<li><article class="hentry">
<header>
<h1><a href="/oh-yeah.html" rel="bookmark"
@ -213,8 +197,6 @@ YEAH !</p>
</div><!-- /.entry-content -->
</article></li>
<li><article class="hentry">
<header>
<h1><a href="/unbelievable.html" rel="bookmark"

1
pelican/tests/output/basic/override/index.html
View file

@ -23,7 +23,6 @@
<li><a href="/category/yeah.html">yeah</a></li>
</ul></nav>
</header><!-- /#banner -->
<section id="content" class="body">
<h1 class="entry-title">Override url/save_as</h1>

1
pelican/tests/output/basic/pages/this-is-a-test-hidden-page.html
View file

@ -23,7 +23,6 @@
<li><a href="/category/yeah.html">yeah</a></li>
</ul></nav>
</header><!-- /#banner -->
<section id="content" class="body">
<h1 class="entry-title">This is a test hidden page</h1>

1
pelican/tests/output/basic/pages/this-is-a-test-page.html
View file

@ -23,7 +23,6 @@
<li><a href="/category/yeah.html">yeah</a></li>
</ul></nav>
</header><!-- /#banner -->
<section id="content" class="body">
<h1 class="entry-title">This is a test page</h1>

6
pelican/tests/output/basic/tag/bar.html
View file

@ -24,8 +24,6 @@
</ul></nav>
</header><!-- /#banner -->
<aside id="featured" class="body">
<article>
<h1 class="entry-title"><a href="/second-article.html">Second article</a></h1>
@ -46,8 +44,6 @@
<hr />
<ol id="posts-list" class="hfeed">
<li><article class="hentry">
<header>
<h1><a href="/this-is-a-super-article.html" rel="bookmark"
@ -72,8 +68,6 @@ as well as <strong>inline markup</strong>.</p>
</div><!-- /.entry-content -->
</article></li>
<li><article class="hentry">
<header>
<h1><a href="/oh-yeah.html" rel="bookmark"

2
pelican/tests/output/basic/tag/baz.html
View file

@ -24,8 +24,6 @@
</ul></nav>
</header><!-- /#banner -->
<aside id="featured" class="body">
<article>
<h1 class="entry-title"><a href="/second-article.html">Second article</a></h1>

4
pelican/tests/output/basic/tag/foo.html
View file

@ -24,8 +24,6 @@
</ul></nav>
</header><!-- /#banner -->
<aside id="featured" class="body">
<article>
<h1 class="entry-title"><a href="/second-article.html">Second article</a></h1>
@ -46,8 +44,6 @@
<hr />
<ol id="posts-list" class="hfeed">
<li><article class="hentry">
<header>
<h1><a href="/this-is-a-super-article.html" rel="bookmark"

2
pelican/tests/output/basic/tag/foobar.html
View file

@ -24,8 +24,6 @@
</ul></nav>
</header><!-- /#banner -->
<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>

2
pelican/tests/output/basic/tag/oh.html
View file

@ -24,8 +24,6 @@
</ul></nav>
</header><!-- /#banner -->
<aside id="featured" class="body">
<article>
<h1 class="entry-title"><a href="/oh-yeah.html">Oh yeah !</a></h1>

2
pelican/tests/output/basic/tag/yeah.html
View file

@ -24,8 +24,6 @@
</ul></nav>
</header><!-- /#banner -->
<aside id="featured" class="body">
<article>
<h1 class="entry-title"><a href="/oh-yeah.html">Oh yeah !</a></h1>

8
pelican/tests/output/custom/author/alexis-metaireau.html
View file

@ -28,8 +28,6 @@
</ul></nav>
</header><!-- /#banner -->
<aside id="featured" class="body">
<article>
<h1 class="entry-title"><a href="../a-markdown-powered-article.html">A markdown powered article</a></h1>
@ -52,8 +50,6 @@
<hr />
<ol id="posts-list" class="hfeed">
<li><article class="hentry">
<header>
<h1><a href="../article-1.html" rel="bookmark"
@ -77,8 +73,6 @@
<p>There are <a href="../article-1.html#disqus_thread">comments</a>.</p> </div><!-- /.entry-content -->
</article></li>
<li><article class="hentry">
<header>
<h1><a href="../article-2.html" rel="bookmark"
@ -102,8 +96,6 @@
<p>There are <a href="../article-2.html#disqus_thread">comments</a>.</p> </div><!-- /.entry-content -->
</article></li>
<li><article class="hentry">
<header>
<h1><a href="../article-3.html" rel="bookmark"

9
pelican/tests/output/custom/author/alexis-metaireau2.html
View file

@ -28,9 +28,6 @@
</ul></nav>
</header><!-- /#banner -->
<section id="content" class="body">
<ol id="posts-list" class="hfeed" start="3">
<li><article class="hentry">
@ -56,8 +53,6 @@
<p>There are <a href="../filename_metadata-example.html#disqus_thread">comments</a>.</p> </div><!-- /.entry-content -->
</article></li>
<li><article class="hentry">
<header>
<h1><a href="../oh-yeah.html" rel="bookmark"
@ -88,8 +83,6 @@ YEAH !</p>
<p>There are <a href="../oh-yeah.html#disqus_thread">comments</a>.</p> </div><!-- /.entry-content -->
</article></li>
<li><article class="hentry">
<header>
<h1><a href="../second-article.html" rel="bookmark"
@ -115,8 +108,6 @@ YEAH !</p>
<p>There are <a href="../second-article.html#disqus_thread">comments</a>.</p> </div><!-- /.entry-content -->
</article></li>
<li><article class="hentry">
<header>
<h1><a href="../this-is-a-super-article.html" rel="bookmark"

3
pelican/tests/output/custom/author/alexis-metaireau3.html
View file

@ -28,9 +28,6 @@
</ul></nav>
</header><!-- /#banner -->
<section id="content" class="body">
<ol id="posts-list" class="hfeed" start="3">
<li><article class="hentry">

2
pelican/tests/output/custom/category/bar.html
View file

@ -28,8 +28,6 @@
</ul></nav>
</header><!-- /#banner -->
<aside id="featured" class="body">
<article>
<h1 class="entry-title"><a href="../oh-yeah.html">Oh yeah !</a></h1>

8
pelican/tests/output/custom/category/cat1.html
View file

@ -28,8 +28,6 @@
</ul></nav>
</header><!-- /#banner -->
<aside id="featured" class="body">
<article>
<h1 class="entry-title"><a href="../a-markdown-powered-article.html">A markdown powered article</a></h1>
@ -52,8 +50,6 @@
<hr />
<ol id="posts-list" class="hfeed">
<li><article class="hentry">
<header>
<h1><a href="../article-1.html" rel="bookmark"
@ -77,8 +73,6 @@
<p>There are <a href="../article-1.html#disqus_thread">comments</a>.</p> </div><!-- /.entry-content -->
</article></li>
<li><article class="hentry">
<header>
<h1><a href="../article-2.html" rel="bookmark"
@ -102,8 +96,6 @@
<p>There are <a href="../article-2.html#disqus_thread">comments</a>.</p> </div><!-- /.entry-content -->
</article></li>
<li><article class="hentry">
<header>
<h1><a href="../article-3.html" rel="bookmark"

6
pelican/tests/output/custom/category/misc.html
View file

@ -28,8 +28,6 @@
</ul></nav>
</header><!-- /#banner -->
<aside id="featured" class="body">
<article>
<h1 class="entry-title"><a href="../filename_metadata-example.html">FILENAME_METADATA example</a></h1>
@ -51,8 +49,6 @@
<hr />
<ol id="posts-list" class="hfeed">
<li><article class="hentry">
<header>
<h1><a href="../second-article.html" rel="bookmark"
@ -78,8 +74,6 @@
<p>There are <a href="../second-article.html#disqus_thread">comments</a>.</p> </div><!-- /.entry-content -->
</article></li>
<li><article class="hentry">
<header>
<h1><a href="../unbelievable.html" rel="bookmark"

2
pelican/tests/output/custom/category/yeah.html
View file

@ -28,8 +28,6 @@
</ul></nav>
</header><!-- /#banner -->
<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>

8
pelican/tests/output/custom/index.html
View file

@ -28,8 +28,6 @@
</ul></nav>
</header><!-- /#banner -->
<aside id="featured" class="body">
<article>
<h1 class="entry-title"><a href="./filename_metadata-example.html">FILENAME_METADATA example</a></h1>
@ -51,8 +49,6 @@
<hr />
<ol id="posts-list" class="hfeed">
<li><article class="hentry">
<header>
<h1><a href="./second-article.html" rel="bookmark"
@ -78,8 +74,6 @@
<p>There are <a href="./second-article.html#disqus_thread">comments</a>.</p> </div><!-- /.entry-content -->
</article></li>
<li><article class="hentry">
<header>
<h1><a href="./a-markdown-powered-article.html" rel="bookmark"
@ -104,8 +98,6 @@
<p>There are <a href="./a-markdown-powered-article.html#disqus_thread">comments</a>.</p> </div><!-- /.entry-content -->
</article></li>
<li><article class="hentry">
<header>
<h1><a href="./article-1.html" rel="bookmark"

9
pelican/tests/output/custom/index2.html
View file

@ -28,9 +28,6 @@
</ul></nav>
</header><!-- /#banner -->
<section id="content" class="body">
<ol id="posts-list" class="hfeed" start="3">
<li><article class="hentry">
@ -56,8 +53,6 @@
<p>There are <a href="./article-2.html#disqus_thread">comments</a>.</p> </div><!-- /.entry-content -->
</article></li>
<li><article class="hentry">
<header>
<h1><a href="./article-3.html" rel="bookmark"
@ -81,8 +76,6 @@
<p>There are <a href="./article-3.html#disqus_thread">comments</a>.</p> </div><!-- /.entry-content -->
</article></li>
<li><article class="hentry">
<header>
<h1><a href="./this-is-a-super-article.html" rel="bookmark"
@ -107,8 +100,6 @@ as well as <strong>inline markup</strong>.</p>
<p>There are <a href="./this-is-a-super-article.html#disqus_thread">comments</a>.</p> </div><!-- /.entry-content -->
</article></li>
<li><article class="hentry">
<header>
<h1><a href="./oh-yeah.html" rel="bookmark"

3
pelican/tests/output/custom/index3.html
View file

@ -28,9 +28,6 @@
</ul></nav>
</header><!-- /#banner -->
<section id="content" class="body">
<ol id="posts-list" class="hfeed" start="3">
<li><article class="hentry">

1
pelican/tests/output/custom/override/index.html
View file

@ -27,7 +27,6 @@
<li><a href="../category/bar.html">bar</a></li>
</ul></nav>
</header><!-- /#banner -->
<section id="content" class="body">
<h1 class="entry-title">Override url/save_as</h1>

1
pelican/tests/output/custom/pages/this-is-a-test-hidden-page.html
View file

@ -27,7 +27,6 @@
<li><a href="../category/bar.html">bar</a></li>
</ul></nav>
</header><!-- /#banner -->
<section id="content" class="body">
<h1 class="entry-title">This is a test hidden page</h1>

1
pelican/tests/output/custom/pages/this-is-a-test-page.html
View file

@ -27,7 +27,6 @@
<li><a href="../category/bar.html">bar</a></li>
</ul></nav>
</header><!-- /#banner -->
<section id="content" class="body">
<h1 class="entry-title">This is a test page</h1>

6
pelican/tests/output/custom/tag/bar.html
View file

@ -28,8 +28,6 @@
</ul></nav>
</header><!-- /#banner -->
<aside id="featured" class="body">
<article>
<h1 class="entry-title"><a href="../second-article.html">Second article</a></h1>
@ -53,8 +51,6 @@
<hr />
<ol id="posts-list" class="hfeed">
<li><article class="hentry">
<header>
<h1><a href="../this-is-a-super-article.html" rel="bookmark"
@ -79,8 +75,6 @@ as well as <strong>inline markup</strong>.</p>
<p>There are <a href="../this-is-a-super-article.html#disqus_thread">comments</a>.</p> </div><!-- /.entry-content -->
</article></li>
<li><article class="hentry">
<header>
<h1><a href="../oh-yeah.html" rel="bookmark"

2
pelican/tests/output/custom/tag/baz.html
View file

@ -28,8 +28,6 @@
</ul></nav>
</header><!-- /#banner -->
<aside id="featured" class="body">
<article>
<h1 class="entry-title"><a href="../second-article.html">Second article</a></h1>

4
pelican/tests/output/custom/tag/foo.html
View file

@ -28,8 +28,6 @@
</ul></nav>
</header><!-- /#banner -->
<aside id="featured" class="body">
<article>
<h1 class="entry-title"><a href="../second-article.html">Second article</a></h1>
@ -53,8 +51,6 @@
<hr />
<ol id="posts-list" class="hfeed">
<li><article class="hentry">
<header>
<h1><a href="../this-is-a-super-article.html" rel="bookmark"

2
pelican/tests/output/custom/tag/foobar.html
View file

@ -28,8 +28,6 @@
</ul></nav>
</header><!-- /#banner -->
<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>

2
pelican/tests/output/custom/tag/oh.html
View file

@ -28,8 +28,6 @@
</ul></nav>
</header><!-- /#banner -->
<aside id="featured" class="body">
<article>
<h1 class="entry-title"><a href="../oh-yeah.html">Oh yeah !</a></h1>

2
pelican/tests/output/custom/tag/yeah.html
View file

@ -28,8 +28,6 @@
</ul></nav>
</header><!-- /#banner -->
<aside id="featured" class="body">
<article>
<h1 class="entry-title"><a href="../oh-yeah.html">Oh yeah !</a></h1>

2
setup.py
View file

@ -1,7 +1,7 @@
#!/usr/bin/env python
from setuptools import setup
requires = ['feedgenerator >= 1.6', 'jinja2 >= 2.6', 'pygments', 'docutils',
requires = ['feedgenerator >= 1.6', 'jinja2 >= 2.7', 'pygments', 'docutils',
'pytz', 'blinker', 'unidecode', 'six']
entry_points = {