Made name of blogroll/social widgets configurable.

The BLOGROLL_WIDGET_NAME and SOCIAL_WIDGET_NAME settings are now
respected by notmyidea if they are specified in your config file.
They override the default names of "blogroll" and "links" in the
notmyidea theme.

Used default() in template to simplify template code.

Renaming BLOGROLL setting to LINKS, changed default also.

Updated tests to check 'links' instead of 'blogroll'.

Whoops; links, not link.
This commit is contained in:
Ben Rosser 2015-09-21 00:15:29 -04:00
commit a670a3e040
75 changed files with 79 additions and 74 deletions

View file

@ -71,7 +71,7 @@
</section>
<section id="extras" class="body">
<div class="blogroll">
<h2>blogroll</h2>
<h2>links</h2>
<ul>
<li><a href="http://biologeek.org">Biologeek</a></li>
<li><a href="http://filyb.info/">Filyb</a></li>

View file

@ -56,7 +56,7 @@
</section>
<section id="extras" class="body">
<div class="blogroll">
<h2>blogroll</h2>
<h2>links</h2>
<ul>
<li><a href="http://biologeek.org">Biologeek</a></li>
<li><a href="http://filyb.info/">Filyb</a></li>

View file

@ -70,7 +70,7 @@
</section>
<section id="extras" class="body">
<div class="blogroll">
<h2>blogroll</h2>
<h2>links</h2>
<ul>
<li><a href="http://biologeek.org">Biologeek</a></li>
<li><a href="http://filyb.info/">Filyb</a></li>

View file

@ -70,7 +70,7 @@
</section>
<section id="extras" class="body">
<div class="blogroll">
<h2>blogroll</h2>
<h2>links</h2>
<ul>
<li><a href="http://biologeek.org">Biologeek</a></li>
<li><a href="http://filyb.info/">Filyb</a></li>

View file

@ -70,7 +70,7 @@
</section>
<section id="extras" class="body">
<div class="blogroll">
<h2>blogroll</h2>
<h2>links</h2>
<ul>
<li><a href="http://biologeek.org">Biologeek</a></li>
<li><a href="http://filyb.info/">Filyb</a></li>

View file

@ -129,7 +129,7 @@
</section><!-- /#content -->
<section id="extras" class="body">
<div class="blogroll">
<h2>blogroll</h2>
<h2>links</h2>
<ul>
<li><a href="http://biologeek.org">Biologeek</a></li>
<li><a href="http://filyb.info/">Filyb</a></li>

View file

@ -143,7 +143,7 @@ YEAH !</p>
</section><!-- /#content -->
<section id="extras" class="body">
<div class="blogroll">
<h2>blogroll</h2>
<h2>links</h2>
<ul>
<li><a href="http://biologeek.org">Biologeek</a></li>
<li><a href="http://filyb.info/">Filyb</a></li>

View file

@ -94,7 +94,7 @@ pelican.conf, it will ...</p></div>
</section><!-- /#content -->
<section id="extras" class="body">
<div class="blogroll">
<h2>blogroll</h2>
<h2>links</h2>
<ul>
<li><a href="http://biologeek.org">Biologeek</a></li>
<li><a href="http://filyb.info/">Filyb</a></li>

View file

@ -38,7 +38,7 @@
<section id="extras" class="body">
<div class="blogroll">
<h2>blogroll</h2>
<h2>links</h2>
<ul>
<li><a href="http://biologeek.org">Biologeek</a></li>
<li><a href="http://filyb.info/">Filyb</a></li>

View file

@ -36,7 +36,7 @@
</ul>
<section id="extras" class="body">
<div class="blogroll">
<h2>blogroll</h2>
<h2>links</h2>
<ul>
<li><a href="http://biologeek.org">Biologeek</a></li>
<li><a href="http://filyb.info/">Filyb</a></li>

View file

@ -54,7 +54,7 @@ YEAH !</p>
</aside><!-- /#featured -->
<section id="extras" class="body">
<div class="blogroll">
<h2>blogroll</h2>
<h2>links</h2>
<ul>
<li><a href="http://biologeek.org">Biologeek</a></li>
<li><a href="http://filyb.info/">Filyb</a></li>

View file

@ -123,7 +123,7 @@
</section><!-- /#content -->
<section id="extras" class="body">
<div class="blogroll">
<h2>blogroll</h2>
<h2>links</h2>
<ul>
<li><a href="http://biologeek.org">Biologeek</a></li>
<li><a href="http://filyb.info/">Filyb</a></li>

View file

@ -134,7 +134,7 @@ pelican.conf, it will ...</p></div>
</section><!-- /#content -->
<section id="extras" class="body">
<div class="blogroll">
<h2>blogroll</h2>
<h2>links</h2>
<ul>
<li><a href="http://biologeek.org">Biologeek</a></li>
<li><a href="http://filyb.info/">Filyb</a></li>

View file

@ -62,7 +62,7 @@
</aside><!-- /#featured -->
<section id="extras" class="body">
<div class="blogroll">
<h2>blogroll</h2>
<h2>links</h2>
<ul>
<li><a href="http://biologeek.org">Biologeek</a></li>
<li><a href="http://filyb.info/">Filyb</a></li>

View file

@ -56,7 +56,7 @@ listed anywhere else.</p>
</section>
<section id="extras" class="body">
<div class="blogroll">
<h2>blogroll</h2>
<h2>links</h2>
<ul>
<li><a href="http://biologeek.org">Biologeek</a></li>
<li><a href="http://filyb.info/">Filyb</a></li>

View file

@ -70,7 +70,7 @@
</section>
<section id="extras" class="body">
<div class="blogroll">
<h2>blogroll</h2>
<h2>links</h2>
<ul>
<li><a href="http://biologeek.org">Biologeek</a></li>
<li><a href="http://filyb.info/">Filyb</a></li>

View file

@ -129,7 +129,7 @@
</section><!-- /#content -->
<section id="extras" class="body">
<div class="blogroll">
<h2>blogroll</h2>
<h2>links</h2>
<ul>
<li><a href="http://biologeek.org">Biologeek</a></li>
<li><a href="http://filyb.info/">Filyb</a></li>

View file

@ -143,7 +143,7 @@ YEAH !</p>
</section><!-- /#content -->
<section id="extras" class="body">
<div class="blogroll">
<h2>blogroll</h2>
<h2>links</h2>
<ul>
<li><a href="http://biologeek.org">Biologeek</a></li>
<li><a href="http://filyb.info/">Filyb</a></li>

View file

@ -94,7 +94,7 @@ pelican.conf, it will ...</p></div>
</section><!-- /#content -->
<section id="extras" class="body">
<div class="blogroll">
<h2>blogroll</h2>
<h2>links</h2>
<ul>
<li><a href="http://biologeek.org">Biologeek</a></li>
<li><a href="http://filyb.info/">Filyb</a></li>

View file

@ -33,7 +33,7 @@ Some text
<section id="extras" class="body">
<div class="blogroll">
<h2>blogroll</h2>
<h2>links</h2>
<ul>
<li><a href="http://biologeek.org">Biologeek</a></li>
<li><a href="http://filyb.info/">Filyb</a></li>

View file

@ -72,7 +72,7 @@ Translations:
</section>
<section id="extras" class="body">
<div class="blogroll">
<h2>blogroll</h2>
<h2>links</h2>
<ul>
<li><a href="http://biologeek.org">Biologeek</a></li>
<li><a href="http://filyb.info/">Filyb</a></li>

View file

@ -77,7 +77,7 @@ YEAH !</p>
</section>
<section id="extras" class="body">
<div class="blogroll">
<h2>blogroll</h2>
<h2>links</h2>
<ul>
<li><a href="http://biologeek.org">Biologeek</a></li>
<li><a href="http://filyb.info/">Filyb</a></li>

View file

@ -37,7 +37,7 @@ at a custom location.</p>
</section>
<section id="extras" class="body">
<div class="blogroll">
<h2>blogroll</h2>
<h2>links</h2>
<ul>
<li><a href="http://biologeek.org">Biologeek</a></li>
<li><a href="http://filyb.info/">Filyb</a></li>

View file

@ -37,7 +37,7 @@ Anyone can see this page but it's not linked to anywhere!</p>
</section>
<section id="extras" class="body">
<div class="blogroll">
<h2>blogroll</h2>
<h2>links</h2>
<ul>
<li><a href="http://biologeek.org">Biologeek</a></li>
<li><a href="http://filyb.info/">Filyb</a></li>

View file

@ -37,7 +37,7 @@
</section>
<section id="extras" class="body">
<div class="blogroll">
<h2>blogroll</h2>
<h2>links</h2>
<ul>
<li><a href="http://biologeek.org">Biologeek</a></li>
<li><a href="http://filyb.info/">Filyb</a></li>

View file

@ -72,7 +72,7 @@
</section>
<section id="extras" class="body">
<div class="blogroll">
<h2>blogroll</h2>
<h2>links</h2>
<ul>
<li><a href="http://biologeek.org">Biologeek</a></li>
<li><a href="http://filyb.info/">Filyb</a></li>

View file

@ -72,7 +72,7 @@
</section>
<section id="extras" class="body">
<div class="blogroll">
<h2>blogroll</h2>
<h2>links</h2>
<ul>
<li><a href="http://biologeek.org">Biologeek</a></li>
<li><a href="http://filyb.info/">Filyb</a></li>

View file

@ -113,7 +113,7 @@ YEAH !</p>
</section><!-- /#content -->
<section id="extras" class="body">
<div class="blogroll">
<h2>blogroll</h2>
<h2>links</h2>
<ul>
<li><a href="http://biologeek.org">Biologeek</a></li>
<li><a href="http://filyb.info/">Filyb</a></li>

View file

@ -70,7 +70,7 @@
</section>
<section id="extras" class="body">
<div class="blogroll">
<h2>blogroll</h2>
<h2>links</h2>
<ul>
<li><a href="http://biologeek.org">Biologeek</a></li>
<li><a href="http://filyb.info/">Filyb</a></li>

View file

@ -83,7 +83,7 @@ as well as <strong>inline markup</strong>.</p>
</section><!-- /#content -->
<section id="extras" class="body">
<div class="blogroll">
<h2>blogroll</h2>
<h2>links</h2>
<ul>
<li><a href="http://biologeek.org">Biologeek</a></li>
<li><a href="http://filyb.info/">Filyb</a></li>

View file

@ -62,7 +62,7 @@
</aside><!-- /#featured -->
<section id="extras" class="body">
<div class="blogroll">
<h2>blogroll</h2>
<h2>links</h2>
<ul>
<li><a href="http://biologeek.org">Biologeek</a></li>
<li><a href="http://filyb.info/">Filyb</a></li>

View file

@ -36,7 +36,7 @@
</section>
<section id="extras" class="body">
<div class="blogroll">
<h2>blogroll</h2>
<h2>links</h2>
<ul>
<li><a href="http://biologeek.org">Biologeek</a></li>
<li><a href="http://filyb.info/">Filyb</a></li>

View file

@ -54,7 +54,7 @@ YEAH !</p>
</aside><!-- /#featured -->
<section id="extras" class="body">
<div class="blogroll">
<h2>blogroll</h2>
<h2>links</h2>
<ul>
<li><a href="http://biologeek.org">Biologeek</a></li>
<li><a href="http://filyb.info/">Filyb</a></li>

View file

@ -43,7 +43,7 @@
<section id="extras" class="body">
<div class="blogroll">
<h2>blogroll</h2>
<h2>links</h2>
<ul>
<li><a href="http://biologeek.org">Biologeek</a></li>
<li><a href="http://filyb.info/">Filyb</a></li>

View file

@ -85,7 +85,7 @@
</section>
<section id="extras" class="body">
<div class="blogroll">
<h2>blogroll</h2>
<h2>links</h2>
<ul>
<li><a href="http://biologeek.org">Biologeek</a></li>
<li><a href="http://filyb.info/">Filyb</a></li>

View file

@ -102,7 +102,7 @@ pelican.conf, it will have nothing in default.</p>
</section>
<section id="extras" class="body">
<div class="blogroll">
<h2>blogroll</h2>
<h2>links</h2>
<ul>
<li><a href="http://biologeek.org">Biologeek</a></li>
<li><a href="http://filyb.info/">Filyb</a></li>

View file

@ -56,7 +56,7 @@
</section>
<section id="extras" class="body">
<div class="blogroll">
<h2>blogroll</h2>
<h2>links</h2>
<ul>
<li><a href="http://biologeek.org">Biologeek</a></li>
<li><a href="http://filyb.info/">Filyb</a></li>

View file

@ -129,7 +129,7 @@
</section><!-- /#content -->
<section id="extras" class="body">
<div class="blogroll">
<h2>blogroll</h2>
<h2>links</h2>
<ul>
<li><a href="http://biologeek.org">Biologeek</a></li>
<li><a href="http://filyb.info/">Filyb</a></li>

View file

@ -143,7 +143,7 @@ YEAH !</p>
</section><!-- /#content -->
<section id="extras" class="body">
<div class="blogroll">
<h2>blogroll</h2>
<h2>links</h2>
<ul>
<li><a href="http://biologeek.org">Biologeek</a></li>
<li><a href="http://filyb.info/">Filyb</a></li>

View file

@ -94,7 +94,7 @@ pelican.conf, it will ...</p></div>
</section><!-- /#content -->
<section id="extras" class="body">
<div class="blogroll">
<h2>blogroll</h2>
<h2>links</h2>
<ul>
<li><a href="http://biologeek.org">Biologeek</a></li>
<li><a href="http://filyb.info/">Filyb</a></li>

View file

@ -38,7 +38,7 @@
<section id="extras" class="body">
<div class="blogroll">
<h2>blogroll</h2>
<h2>links</h2>
<ul>
<li><a href="http://biologeek.org">Biologeek</a></li>
<li><a href="http://filyb.info/">Filyb</a></li>

View file

@ -36,7 +36,7 @@
</ul>
<section id="extras" class="body">
<div class="blogroll">
<h2>blogroll</h2>
<h2>links</h2>
<ul>
<li><a href="http://biologeek.org">Biologeek</a></li>
<li><a href="http://filyb.info/">Filyb</a></li>

View file

@ -54,7 +54,7 @@ YEAH !</p>
</aside><!-- /#featured -->
<section id="extras" class="body">
<div class="blogroll">
<h2>blogroll</h2>
<h2>links</h2>
<ul>
<li><a href="http://biologeek.org">Biologeek</a></li>
<li><a href="http://filyb.info/">Filyb</a></li>

View file

@ -123,7 +123,7 @@
</section><!-- /#content -->
<section id="extras" class="body">
<div class="blogroll">
<h2>blogroll</h2>
<h2>links</h2>
<ul>
<li><a href="http://biologeek.org">Biologeek</a></li>
<li><a href="http://filyb.info/">Filyb</a></li>

View file

@ -134,7 +134,7 @@ pelican.conf, it will ...</p></div>
</section><!-- /#content -->
<section id="extras" class="body">
<div class="blogroll">
<h2>blogroll</h2>
<h2>links</h2>
<ul>
<li><a href="http://biologeek.org">Biologeek</a></li>
<li><a href="http://filyb.info/">Filyb</a></li>

View file

@ -62,7 +62,7 @@
</aside><!-- /#featured -->
<section id="extras" class="body">
<div class="blogroll">
<h2>blogroll</h2>
<h2>links</h2>
<ul>
<li><a href="http://biologeek.org">Biologeek</a></li>
<li><a href="http://filyb.info/">Filyb</a></li>

View file

@ -56,7 +56,7 @@ listed anywhere else.</p>
</section>
<section id="extras" class="body">
<div class="blogroll">
<h2>blogroll</h2>
<h2>links</h2>
<ul>
<li><a href="http://biologeek.org">Biologeek</a></li>
<li><a href="http://filyb.info/">Filyb</a></li>

View file

@ -129,7 +129,7 @@
</section><!-- /#content -->
<section id="extras" class="body">
<div class="blogroll">
<h2>blogroll</h2>
<h2>links</h2>
<ul>
<li><a href="http://biologeek.org">Biologeek</a></li>
<li><a href="http://filyb.info/">Filyb</a></li>

View file

@ -143,7 +143,7 @@ YEAH !</p>
</section><!-- /#content -->
<section id="extras" class="body">
<div class="blogroll">
<h2>blogroll</h2>
<h2>links</h2>
<ul>
<li><a href="http://biologeek.org">Biologeek</a></li>
<li><a href="http://filyb.info/">Filyb</a></li>

View file

@ -94,7 +94,7 @@ pelican.conf, it will ...</p></div>
</section><!-- /#content -->
<section id="extras" class="body">
<div class="blogroll">
<h2>blogroll</h2>
<h2>links</h2>
<ul>
<li><a href="http://biologeek.org">Biologeek</a></li>
<li><a href="http://filyb.info/">Filyb</a></li>

View file

@ -33,7 +33,7 @@ Some text
<section id="extras" class="body">
<div class="blogroll">
<h2>blogroll</h2>
<h2>links</h2>
<ul>
<li><a href="http://biologeek.org">Biologeek</a></li>
<li><a href="http://filyb.info/">Filyb</a></li>

View file

@ -72,7 +72,7 @@ Translations:
</section>
<section id="extras" class="body">
<div class="blogroll">
<h2>blogroll</h2>
<h2>links</h2>
<ul>
<li><a href="http://biologeek.org">Biologeek</a></li>
<li><a href="http://filyb.info/">Filyb</a></li>

View file

@ -37,7 +37,7 @@ at a custom location.</p>
</section>
<section id="extras" class="body">
<div class="blogroll">
<h2>blogroll</h2>
<h2>links</h2>
<ul>
<li><a href="http://biologeek.org">Biologeek</a></li>
<li><a href="http://filyb.info/">Filyb</a></li>

View file

@ -37,7 +37,7 @@ Anyone can see this page but it's not linked to anywhere!</p>
</section>
<section id="extras" class="body">
<div class="blogroll">
<h2>blogroll</h2>
<h2>links</h2>
<ul>
<li><a href="http://biologeek.org">Biologeek</a></li>
<li><a href="http://filyb.info/">Filyb</a></li>

View file

@ -37,7 +37,7 @@
</section>
<section id="extras" class="body">
<div class="blogroll">
<h2>blogroll</h2>
<h2>links</h2>
<ul>
<li><a href="http://biologeek.org">Biologeek</a></li>
<li><a href="http://filyb.info/">Filyb</a></li>

View file

@ -85,7 +85,7 @@
</section>
<section id="extras" class="body">
<div class="blogroll">
<h2>blogroll</h2>
<h2>links</h2>
<ul>
<li><a href="http://biologeek.org">Biologeek</a></li>
<li><a href="http://filyb.info/">Filyb</a></li>

View file

@ -102,7 +102,7 @@ pelican.conf, it will have nothing in default.</p>
</section>
<section id="extras" class="body">
<div class="blogroll">
<h2>blogroll</h2>
<h2>links</h2>
<ul>
<li><a href="http://biologeek.org">Biologeek</a></li>
<li><a href="http://filyb.info/">Filyb</a></li>

View file

@ -77,7 +77,7 @@ YEAH !</p>
</section>
<section id="extras" class="body">
<div class="blogroll">
<h2>blogroll</h2>
<h2>links</h2>
<ul>
<li><a href="http://biologeek.org">Biologeek</a></li>
<li><a href="http://filyb.info/">Filyb</a></li>

View file

@ -71,7 +71,7 @@
</section>
<section id="extras" class="body">
<div class="blogroll">
<h2>blogroll</h2>
<h2>links</h2>
<ul>
<li><a href="http://biologeek.org">Biologeek</a></li>
<li><a href="http://filyb.info/">Filyb</a></li>

View file

@ -70,7 +70,7 @@
</section>
<section id="extras" class="body">
<div class="blogroll">
<h2>blogroll</h2>
<h2>links</h2>
<ul>
<li><a href="http://biologeek.org">Biologeek</a></li>
<li><a href="http://filyb.info/">Filyb</a></li>

View file

@ -70,7 +70,7 @@
</section>
<section id="extras" class="body">
<div class="blogroll">
<h2>blogroll</h2>
<h2>links</h2>
<ul>
<li><a href="http://biologeek.org">Biologeek</a></li>
<li><a href="http://filyb.info/">Filyb</a></li>

View file

@ -70,7 +70,7 @@
</section>
<section id="extras" class="body">
<div class="blogroll">
<h2>blogroll</h2>
<h2>links</h2>
<ul>
<li><a href="http://biologeek.org">Biologeek</a></li>
<li><a href="http://filyb.info/">Filyb</a></li>

View file

@ -72,7 +72,7 @@
</section>
<section id="extras" class="body">
<div class="blogroll">
<h2>blogroll</h2>
<h2>links</h2>
<ul>
<li><a href="http://biologeek.org">Biologeek</a></li>
<li><a href="http://filyb.info/">Filyb</a></li>

View file

@ -70,7 +70,7 @@
</section>
<section id="extras" class="body">
<div class="blogroll">
<h2>blogroll</h2>
<h2>links</h2>
<ul>
<li><a href="http://biologeek.org">Biologeek</a></li>
<li><a href="http://filyb.info/">Filyb</a></li>

View file

@ -72,7 +72,7 @@
</section>
<section id="extras" class="body">
<div class="blogroll">
<h2>blogroll</h2>
<h2>links</h2>
<ul>
<li><a href="http://biologeek.org">Biologeek</a></li>
<li><a href="http://filyb.info/">Filyb</a></li>

View file

@ -113,7 +113,7 @@ YEAH !</p>
</section><!-- /#content -->
<section id="extras" class="body">
<div class="blogroll">
<h2>blogroll</h2>
<h2>links</h2>
<ul>
<li><a href="http://biologeek.org">Biologeek</a></li>
<li><a href="http://filyb.info/">Filyb</a></li>

View file

@ -70,7 +70,7 @@
</section>
<section id="extras" class="body">
<div class="blogroll">
<h2>blogroll</h2>
<h2>links</h2>
<ul>
<li><a href="http://biologeek.org">Biologeek</a></li>
<li><a href="http://filyb.info/">Filyb</a></li>

View file

@ -83,7 +83,7 @@ as well as <strong>inline markup</strong>.</p>
</section><!-- /#content -->
<section id="extras" class="body">
<div class="blogroll">
<h2>blogroll</h2>
<h2>links</h2>
<ul>
<li><a href="http://biologeek.org">Biologeek</a></li>
<li><a href="http://filyb.info/">Filyb</a></li>

View file

@ -62,7 +62,7 @@
</aside><!-- /#featured -->
<section id="extras" class="body">
<div class="blogroll">
<h2>blogroll</h2>
<h2>links</h2>
<ul>
<li><a href="http://biologeek.org">Biologeek</a></li>
<li><a href="http://filyb.info/">Filyb</a></li>

View file

@ -36,7 +36,7 @@
</section>
<section id="extras" class="body">
<div class="blogroll">
<h2>blogroll</h2>
<h2>links</h2>
<ul>
<li><a href="http://biologeek.org">Biologeek</a></li>
<li><a href="http://filyb.info/">Filyb</a></li>

View file

@ -54,7 +54,7 @@ YEAH !</p>
</aside><!-- /#featured -->
<section id="extras" class="body">
<div class="blogroll">
<h2>blogroll</h2>
<h2>links</h2>
<ul>
<li><a href="http://biologeek.org">Biologeek</a></li>
<li><a href="http://filyb.info/">Filyb</a></li>

View file

@ -43,7 +43,7 @@
<section id="extras" class="body">
<div class="blogroll">
<h2>blogroll</h2>
<h2>links</h2>
<ul>
<li><a href="http://biologeek.org">Biologeek</a></li>
<li><a href="http://filyb.info/">Filyb</a></li>

View file

@ -41,7 +41,7 @@
<section id="extras" class="body">
{% if LINKS %}
<div class="blogroll">
<h2>blogroll</h2>
<h2>{{ LINKS_WIDGET_NAME | default('links') }}</h2>
<ul>
{% for name, link in LINKS %}
<li><a href="{{ link }}">{{ name }}</a></li>
@ -51,7 +51,7 @@
{% endif %}
{% if SOCIAL or FEED_ALL_ATOM or FEED_ALL_RSS %}
<div class="social">
<h2>social</h2>
<h2>{{ SOCIAL_WIDGET_NAME | default('social') }}</h2>
<ul>
{% if FEED_ALL_ATOM %}
<li><a href="{{ FEED_DOMAIN }}/{{ FEED_ALL_ATOM }}" type="application/atom+xml" rel="alternate">atom feed</a></li>