1
0
Fork 0
forked from github/pelican

Merge pull request #578 from davidjb/display-categories-option

Add option to control displaying categories on menu
This commit is contained in:
Justin Mayer 2013-04-01 07:32:45 -07:00
commit 6726e5f139
66 changed files with 136 additions and 126 deletions

View file

@ -7,6 +7,8 @@ Release history
* Support for Python 3!
* Ensure exceptions are raised if they take place during processing
with autoreload enabled with debug enabled.
* Provide ability to show or hide categories from menu using
``DISPLAY_CATEGORIES_ON_MENU`` option.
3.1 (2012-12-04)
================

View file

@ -42,6 +42,9 @@ Setting name (default value) What doe
`DISPLAY_PAGES_ON_MENU` (``True``) Whether to display pages on the menu of the
template. Templates may or may not honor this
setting.
`DISPLAY_CATEGORIES_ON_MENU` (``True``) Whether to display categories on the menu of the
template. Templates may or not honor this
setting.
`DEFAULT_DATE` (``None``) The default date you want to use.
If ``fs``, Pelican will use the file system
timestamp information (mtime) if it can't get

View file

@ -35,6 +35,7 @@ _DEFAULT_CONFIG = {'PATH': os.curdir,
'SITEURL': '',
'SITENAME': 'A Pelican Blog',
'DISPLAY_PAGES_ON_MENU': True,
'DISPLAY_CATEGORIES_ON_MENU': True,
'PDF_GENERATOR': False,
'OUTPUT_SOURCES': False,
'OUTPUT_SOURCES_EXTENSION': '.text',

View file

@ -22,13 +22,13 @@
<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="./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>
</ul></nav>
</header><!-- /#banner -->
<section id="content" class="body">
<article>

View file

@ -22,13 +22,13 @@
<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="./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 ><a href="./category/yeah.html">yeah</a></li>
</ul></nav>
</ul></nav>
</header><!-- /#banner -->
<section id="content" class="body">
<h1>Archives for A Pelican Blog</h1>

View file

@ -22,13 +22,13 @@
<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="./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>
</ul></nav>
</header><!-- /#banner -->
<section id="content" class="body">
<article>

View file

@ -22,13 +22,13 @@
<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="./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>
</ul></nav>
</header><!-- /#banner -->
<section id="content" class="body">
<article>

View file

@ -22,13 +22,13 @@
<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="./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>
</ul></nav>
</header><!-- /#banner -->
<section id="content" class="body">
<article>

View file

@ -22,13 +22,13 @@
<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="../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 ><a href="../category/yeah.html">yeah</a></li>
</ul></nav>
</ul></nav>
</header><!-- /#banner -->

View file

@ -22,13 +22,13 @@
<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="./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 ><a href="./category/yeah.html">yeah</a></li>
</ul></nav>
</ul></nav>
</header><!-- /#banner -->
<ul>
<li><a href="./category/bar.html">bar</a></li>

View file

@ -22,13 +22,13 @@
<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="../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>
</ul></nav>
</header><!-- /#banner -->

View file

@ -22,13 +22,13 @@
<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="../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>
</ul></nav>
</header><!-- /#banner -->

View file

@ -22,13 +22,13 @@
<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="../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>
</ul></nav>
</header><!-- /#banner -->

View file

@ -22,13 +22,13 @@
<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="../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>
</ul></nav>
</header><!-- /#banner -->

View file

@ -22,13 +22,13 @@
<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="./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>
</ul></nav>
</header><!-- /#banner -->
<section id="content" class="body">
<article>

View file

@ -22,13 +22,13 @@
<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="./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 ><a href="./category/yeah.html">yeah</a></li>
</ul></nav>
</ul></nav>
</header><!-- /#banner -->

View file

@ -22,13 +22,13 @@
<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="./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>
</ul></nav>
</header><!-- /#banner -->
<section id="content" class="body">
<article>

View file

@ -22,13 +22,13 @@
<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="../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 ><a href="../category/yeah.html">yeah</a></li>
</ul></nav>
</ul></nav>
</header><!-- /#banner -->
<section id="content" class="body">

View file

@ -22,13 +22,13 @@
<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="../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 ><a href="../category/yeah.html">yeah</a></li>
</ul></nav>
</ul></nav>
</header><!-- /#banner -->
<section id="content" class="body">

View file

@ -22,13 +22,13 @@
<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="../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 ><a href="../category/yeah.html">yeah</a></li>
</ul></nav>
</ul></nav>
</header><!-- /#banner -->
<section id="content" class="body">

View file

@ -22,13 +22,13 @@
<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="./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>
</ul></nav>
</header><!-- /#banner -->
<section id="content" class="body">
<article>

View file

@ -22,13 +22,13 @@
<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="./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>
</ul></nav>
</header><!-- /#banner -->
<section id="content" class="body">
<article>

View file

@ -22,13 +22,13 @@
<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="../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 ><a href="../category/yeah.html">yeah</a></li>
</ul></nav>
</ul></nav>
</header><!-- /#banner -->

View file

@ -22,13 +22,13 @@
<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="../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 ><a href="../category/yeah.html">yeah</a></li>
</ul></nav>
</ul></nav>
</header><!-- /#banner -->

View file

@ -22,13 +22,13 @@
<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="../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 ><a href="../category/yeah.html">yeah</a></li>
</ul></nav>
</ul></nav>
</header><!-- /#banner -->

View file

@ -22,13 +22,13 @@
<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="../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 ><a href="../category/yeah.html">yeah</a></li>
</ul></nav>
</ul></nav>
</header><!-- /#banner -->

View file

@ -22,13 +22,13 @@
<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="../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 ><a href="../category/yeah.html">yeah</a></li>
</ul></nav>
</ul></nav>
</header><!-- /#banner -->

View file

@ -22,13 +22,13 @@
<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="../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 ><a href="../category/yeah.html">yeah</a></li>
</ul></nav>
</ul></nav>
</header><!-- /#banner -->

View file

@ -22,13 +22,13 @@
<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="./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>
</ul></nav>
</header><!-- /#banner -->
<section id="content" class="body">
<article>

View file

@ -22,13 +22,13 @@
<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="./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>
</ul></nav>
</header><!-- /#banner -->
<section id="content" class="body">
<article>

View file

@ -26,13 +26,13 @@
<header id="banner" class="body">
<h1><a href="./">Alexis' log </a></h1>
<nav><ul>
<li><a href="./override/">Override url/save_as</a></li>
<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/yeah.html">yeah</a></li>
<li ><a href="./category/misc.html">misc</a></li>
<li class="active"><a href="./category/cat1.html">cat1</a></li>
<li ><a href="./category/bar.html">bar</a></li>
</ul></nav>
</ul></nav>
</header><!-- /#banner -->
<section id="content" class="body">
<article>

View file

@ -26,13 +26,13 @@
<header id="banner" class="body">
<h1><a href="./">Alexis' log </a></h1>
<nav><ul>
<li><a href="./override/">Override url/save_as</a></li>
<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/yeah.html">yeah</a></li>
<li ><a href="./category/misc.html">misc</a></li>
<li ><a href="./category/cat1.html">cat1</a></li>
<li ><a href="./category/bar.html">bar</a></li>
</ul></nav>
</ul></nav>
</header><!-- /#banner -->
<section id="content" class="body">
<h1>Archives for Alexis' log</h1>

View file

@ -26,13 +26,13 @@
<header id="banner" class="body">
<h1><a href="./">Alexis' log </a></h1>
<nav><ul>
<li><a href="./override/">Override url/save_as</a></li>
<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/yeah.html">yeah</a></li>
<li ><a href="./category/misc.html">misc</a></li>
<li class="active"><a href="./category/cat1.html">cat1</a></li>
<li ><a href="./category/bar.html">bar</a></li>
</ul></nav>
</ul></nav>
</header><!-- /#banner -->
<section id="content" class="body">
<article>

View file

@ -26,13 +26,13 @@
<header id="banner" class="body">
<h1><a href="./">Alexis' log </a></h1>
<nav><ul>
<li><a href="./override/">Override url/save_as</a></li>
<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/yeah.html">yeah</a></li>
<li ><a href="./category/misc.html">misc</a></li>
<li class="active"><a href="./category/cat1.html">cat1</a></li>
<li ><a href="./category/bar.html">bar</a></li>
</ul></nav>
</ul></nav>
</header><!-- /#banner -->
<section id="content" class="body">
<article>

View file

@ -26,13 +26,13 @@
<header id="banner" class="body">
<h1><a href="./">Alexis' log </a></h1>
<nav><ul>
<li><a href="./override/">Override url/save_as</a></li>
<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/yeah.html">yeah</a></li>
<li ><a href="./category/misc.html">misc</a></li>
<li class="active"><a href="./category/cat1.html">cat1</a></li>
<li ><a href="./category/bar.html">bar</a></li>
</ul></nav>
</ul></nav>
</header><!-- /#banner -->
<section id="content" class="body">
<article>

View file

@ -26,13 +26,13 @@
<header id="banner" class="body">
<h1><a href="../">Alexis' log </a></h1>
<nav><ul>
<li><a href="../override/">Override url/save_as</a></li>
<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/yeah.html">yeah</a></li>
<li ><a href="../category/misc.html">misc</a></li>
<li ><a href="../category/cat1.html">cat1</a></li>
<li ><a href="../category/bar.html">bar</a></li>
</ul></nav>
</ul></nav>
</header><!-- /#banner -->

View file

@ -26,13 +26,13 @@
<header id="banner" class="body">
<h1><a href="../">Alexis' log </a></h1>
<nav><ul>
<li><a href="../override/">Override url/save_as</a></li>
<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/yeah.html">yeah</a></li>
<li ><a href="../category/misc.html">misc</a></li>
<li ><a href="../category/cat1.html">cat1</a></li>
<li ><a href="../category/bar.html">bar</a></li>
</ul></nav>
</ul></nav>
</header><!-- /#banner -->

View file

@ -26,13 +26,13 @@
<header id="banner" class="body">
<h1><a href="../">Alexis' log </a></h1>
<nav><ul>
<li><a href="../override/">Override url/save_as</a></li>
<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/yeah.html">yeah</a></li>
<li ><a href="../category/misc.html">misc</a></li>
<li ><a href="../category/cat1.html">cat1</a></li>
<li ><a href="../category/bar.html">bar</a></li>
</ul></nav>
</ul></nav>
</header><!-- /#banner -->

View file

@ -26,13 +26,13 @@
<header id="banner" class="body">
<h1><a href="./">Alexis' log </a></h1>
<nav><ul>
<li><a href="./override/">Override url/save_as</a></li>
<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/yeah.html">yeah</a></li>
<li ><a href="./category/misc.html">misc</a></li>
<li ><a href="./category/cat1.html">cat1</a></li>
<li ><a href="./category/bar.html">bar</a></li>
</ul></nav>
</ul></nav>
</header><!-- /#banner -->
<ul>
<li><a href="./category/yeah.html">yeah</a></li>

View file

@ -26,13 +26,13 @@
<header id="banner" class="body">
<h1><a href="../">Alexis' log </a></h1>
<nav><ul>
<li><a href="../override/">Override url/save_as</a></li>
<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/yeah.html">yeah</a></li>
<li ><a href="../category/misc.html">misc</a></li>
<li ><a href="../category/cat1.html">cat1</a></li>
<li class="active"><a href="../category/bar.html">bar</a></li>
</ul></nav>
</ul></nav>
</header><!-- /#banner -->

View file

@ -26,13 +26,13 @@
<header id="banner" class="body">
<h1><a href="../">Alexis' log </a></h1>
<nav><ul>
<li><a href="../override/">Override url/save_as</a></li>
<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/yeah.html">yeah</a></li>
<li ><a href="../category/misc.html">misc</a></li>
<li class="active"><a href="../category/cat1.html">cat1</a></li>
<li ><a href="../category/bar.html">bar</a></li>
</ul></nav>
</ul></nav>
</header><!-- /#banner -->

View file

@ -26,13 +26,13 @@
<header id="banner" class="body">
<h1><a href="../">Alexis' log </a></h1>
<nav><ul>
<li><a href="../override/">Override url/save_as</a></li>
<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/yeah.html">yeah</a></li>
<li class="active"><a href="../category/misc.html">misc</a></li>
<li ><a href="../category/cat1.html">cat1</a></li>
<li ><a href="../category/bar.html">bar</a></li>
</ul></nav>
</ul></nav>
</header><!-- /#banner -->

View file

@ -26,13 +26,13 @@
<header id="banner" class="body">
<h1><a href="../">Alexis' log </a></h1>
<nav><ul>
<li><a href="../override/">Override url/save_as</a></li>
<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/yeah.html">yeah</a></li>
<li ><a href="../category/misc.html">misc</a></li>
<li ><a href="../category/cat1.html">cat1</a></li>
<li ><a href="../category/bar.html">bar</a></li>
</ul></nav>
</ul></nav>
</header><!-- /#banner -->

View file

@ -26,13 +26,13 @@
<header id="banner" class="body">
<h1><a href="../">Alexis' log </a></h1>
<nav><ul>
<li><a href="../override/">Override url/save_as</a></li>
<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/yeah.html">yeah</a></li>
<li class="active"><a href="../category/misc.html">misc</a></li>
<li ><a href="../category/cat1.html">cat1</a></li>
<li ><a href="../category/bar.html">bar</a></li>
</ul></nav>
</ul></nav>
</header><!-- /#banner -->
<section id="content" class="body">
<article>

View file

@ -26,13 +26,13 @@
<header id="banner" class="body">
<h1><a href="./">Alexis' log </a></h1>
<nav><ul>
<li><a href="./override/">Override url/save_as</a></li>
<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/yeah.html">yeah</a></li>
<li class="active"><a href="./category/misc.html">misc</a></li>
<li ><a href="./category/cat1.html">cat1</a></li>
<li ><a href="./category/bar.html">bar</a></li>
</ul></nav>
</ul></nav>
</header><!-- /#banner -->
<section id="content" class="body">
<article>

View file

@ -26,13 +26,13 @@
<header id="banner" class="body">
<h1><a href="./">Alexis' log </a></h1>
<nav><ul>
<li><a href="./override/">Override url/save_as</a></li>
<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/yeah.html">yeah</a></li>
<li ><a href="./category/misc.html">misc</a></li>
<li ><a href="./category/cat1.html">cat1</a></li>
<li ><a href="./category/bar.html">bar</a></li>
</ul></nav>
</ul></nav>
</header><!-- /#banner -->

View file

@ -26,13 +26,13 @@
<header id="banner" class="body">
<h1><a href="./">Alexis' log </a></h1>
<nav><ul>
<li><a href="./override/">Override url/save_as</a></li>
<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/yeah.html">yeah</a></li>
<li ><a href="./category/misc.html">misc</a></li>
<li ><a href="./category/cat1.html">cat1</a></li>
<li ><a href="./category/bar.html">bar</a></li>
</ul></nav>
</ul></nav>
</header><!-- /#banner -->

View file

@ -26,13 +26,13 @@
<header id="banner" class="body">
<h1><a href="./">Alexis' log </a></h1>
<nav><ul>
<li><a href="./override/">Override url/save_as</a></li>
<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/yeah.html">yeah</a></li>
<li ><a href="./category/misc.html">misc</a></li>
<li ><a href="./category/cat1.html">cat1</a></li>
<li ><a href="./category/bar.html">bar</a></li>
</ul></nav>
</ul></nav>
</header><!-- /#banner -->

View file

@ -26,13 +26,13 @@
<header id="banner" class="body">
<h1><a href="./">Alexis' log </a></h1>
<nav><ul>
<li><a href="./override/">Override url/save_as</a></li>
<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/yeah.html">yeah</a></li>
<li ><a href="./category/misc.html">misc</a></li>
<li ><a href="./category/cat1.html">cat1</a></li>
<li ><a href="./category/bar.html">bar</a></li>
</ul></nav>
</ul></nav>
</header><!-- /#banner -->
Some text

View file

@ -26,13 +26,13 @@
<header id="banner" class="body">
<h1><a href="./">Alexis' log </a></h1>
<nav><ul>
<li><a href="./override/">Override url/save_as</a></li>
<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/yeah.html">yeah</a></li>
<li class="active"><a href="./category/misc.html">misc</a></li>
<li ><a href="./category/cat1.html">cat1</a></li>
<li ><a href="./category/bar.html">bar</a></li>
</ul></nav>
</ul></nav>
</header><!-- /#banner -->
<section id="content" class="body">
<article>

View file

@ -26,13 +26,13 @@
<header id="banner" class="body">
<h1><a href="./">Alexis' log </a></h1>
<nav><ul>
<li><a href="./override/">Override url/save_as</a></li>
<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/yeah.html">yeah</a></li>
<li ><a href="./category/misc.html">misc</a></li>
<li ><a href="./category/cat1.html">cat1</a></li>
<li class="active"><a href="./category/bar.html">bar</a></li>
</ul></nav>
</ul></nav>
</header><!-- /#banner -->
<section id="content" class="body">
<article>

View file

@ -26,13 +26,13 @@
<header id="banner" class="body">
<h1><a href="../">Alexis' log </a></h1>
<nav><ul>
<li><a href="../override/">Override url/save_as</a></li>
<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/yeah.html">yeah</a></li>
<li ><a href="../category/misc.html">misc</a></li>
<li ><a href="../category/cat1.html">cat1</a></li>
<li ><a href="../category/bar.html">bar</a></li>
</ul></nav>
</ul></nav>
</header><!-- /#banner -->
<section id="content" class="body">

View file

@ -26,13 +26,13 @@
<header id="banner" class="body">
<h1><a href="../">Alexis' log </a></h1>
<nav><ul>
<li><a href="../override/">Override url/save_as</a></li>
<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/yeah.html">yeah</a></li>
<li ><a href="../category/misc.html">misc</a></li>
<li ><a href="../category/cat1.html">cat1</a></li>
<li ><a href="../category/bar.html">bar</a></li>
</ul></nav>
</ul></nav>
</header><!-- /#banner -->
<section id="content" class="body">

View file

@ -26,13 +26,13 @@
<header id="banner" class="body">
<h1><a href="../">Alexis' log </a></h1>
<nav><ul>
<li><a href="../override/">Override url/save_as</a></li>
<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/yeah.html">yeah</a></li>
<li ><a href="../category/misc.html">misc</a></li>
<li ><a href="../category/cat1.html">cat1</a></li>
<li ><a href="../category/bar.html">bar</a></li>
</ul></nav>
</ul></nav>
</header><!-- /#banner -->
<section id="content" class="body">

View file

@ -26,13 +26,13 @@
<header id="banner" class="body">
<h1><a href="./">Alexis' log </a></h1>
<nav><ul>
<li><a href="./override/">Override url/save_as</a></li>
<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/yeah.html">yeah</a></li>
<li class="active"><a href="./category/misc.html">misc</a></li>
<li ><a href="./category/cat1.html">cat1</a></li>
<li ><a href="./category/bar.html">bar</a></li>
</ul></nav>
</ul></nav>
</header><!-- /#banner -->
<section id="content" class="body">
<article>

View file

@ -26,13 +26,13 @@
<header id="banner" class="body">
<h1><a href="./">Alexis' log </a></h1>
<nav><ul>
<li><a href="./override/">Override url/save_as</a></li>
<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/yeah.html">yeah</a></li>
<li class="active"><a href="./category/misc.html">misc</a></li>
<li ><a href="./category/cat1.html">cat1</a></li>
<li ><a href="./category/bar.html">bar</a></li>
</ul></nav>
</ul></nav>
</header><!-- /#banner -->
<section id="content" class="body">
<article>

View file

@ -26,13 +26,13 @@
<header id="banner" class="body">
<h1><a href="../">Alexis' log </a></h1>
<nav><ul>
<li><a href="../override/">Override url/save_as</a></li>
<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/yeah.html">yeah</a></li>
<li ><a href="../category/misc.html">misc</a></li>
<li ><a href="../category/cat1.html">cat1</a></li>
<li ><a href="../category/bar.html">bar</a></li>
</ul></nav>
</ul></nav>
</header><!-- /#banner -->

View file

@ -26,13 +26,13 @@
<header id="banner" class="body">
<h1><a href="../">Alexis' log </a></h1>
<nav><ul>
<li><a href="../override/">Override url/save_as</a></li>
<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/yeah.html">yeah</a></li>
<li ><a href="../category/misc.html">misc</a></li>
<li ><a href="../category/cat1.html">cat1</a></li>
<li ><a href="../category/bar.html">bar</a></li>
</ul></nav>
</ul></nav>
</header><!-- /#banner -->

View file

@ -26,13 +26,13 @@
<header id="banner" class="body">
<h1><a href="../">Alexis' log </a></h1>
<nav><ul>
<li><a href="../override/">Override url/save_as</a></li>
<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/yeah.html">yeah</a></li>
<li ><a href="../category/misc.html">misc</a></li>
<li ><a href="../category/cat1.html">cat1</a></li>
<li ><a href="../category/bar.html">bar</a></li>
</ul></nav>
</ul></nav>
</header><!-- /#banner -->

View file

@ -26,13 +26,13 @@
<header id="banner" class="body">
<h1><a href="../">Alexis' log </a></h1>
<nav><ul>
<li><a href="../override/">Override url/save_as</a></li>
<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/yeah.html">yeah</a></li>
<li ><a href="../category/misc.html">misc</a></li>
<li ><a href="../category/cat1.html">cat1</a></li>
<li ><a href="../category/bar.html">bar</a></li>
</ul></nav>
</ul></nav>
</header><!-- /#banner -->

View file

@ -26,13 +26,13 @@
<header id="banner" class="body">
<h1><a href="../">Alexis' log </a></h1>
<nav><ul>
<li><a href="../override/">Override url/save_as</a></li>
<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/yeah.html">yeah</a></li>
<li ><a href="../category/misc.html">misc</a></li>
<li ><a href="../category/cat1.html">cat1</a></li>
<li ><a href="../category/bar.html">bar</a></li>
</ul></nav>
</ul></nav>
</header><!-- /#banner -->

View file

@ -26,13 +26,13 @@
<header id="banner" class="body">
<h1><a href="../">Alexis' log </a></h1>
<nav><ul>
<li><a href="../override/">Override url/save_as</a></li>
<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/yeah.html">yeah</a></li>
<li ><a href="../category/misc.html">misc</a></li>
<li ><a href="../category/cat1.html">cat1</a></li>
<li ><a href="../category/bar.html">bar</a></li>
</ul></nav>
</ul></nav>
</header><!-- /#banner -->

View file

@ -26,13 +26,13 @@
<header id="banner" class="body">
<h1><a href="./">Alexis' log </a></h1>
<nav><ul>
<li><a href="./override/">Override url/save_as</a></li>
<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/yeah.html">yeah</a></li>
<li ><a href="./category/misc.html">misc</a></li>
<li ><a href="./category/cat1.html">cat1</a></li>
<li ><a href="./category/bar.html">bar</a></li>
</ul></nav>
</ul></nav>
</header><!-- /#banner -->
<section id="content" class="body">
<article>

View file

@ -26,13 +26,13 @@
<header id="banner" class="body">
<h1><a href="./">Alexis' log </a></h1>
<nav><ul>
<li><a href="./override/">Override url/save_as</a></li>
<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/yeah.html">yeah</a></li>
<li class="active"><a href="./category/misc.html">misc</a></li>
<li ><a href="./category/cat1.html">cat1</a></li>
<li ><a href="./category/bar.html">bar</a></li>
</ul></nav>
</ul></nav>
</header><!-- /#banner -->
<section id="content" class="body">
<article>

View file

@ -31,14 +31,16 @@
{% for title, link in MENUITEMS %}
<li><a href="{{ link }}">{{ title }}</a></li>
{% endfor %}
{% if DISPLAY_PAGES_ON_MENU %}
{% if DISPLAY_PAGES_ON_MENU -%}
{% for page in PAGES %}
<li><a href="{{ SITEURL }}/{{ page.url }}">{{ page.title }}</a></li>
{% endfor %}
{% endif %}
{% if DISPLAY_CATEGORIES_ON_MENU -%}
{% for cat, null in categories %}
<li {% if cat == category %}class="active"{% endif %}><a href="{{ SITEURL }}/{{ cat.url }}">{{ cat }}</a></li>
{% endfor %}
{% endif %}
</ul></nav>
</header><!-- /#banner -->
{% block content %}

View file

@ -44,9 +44,11 @@
<li{% if p == page %} class="active"{% endif %}><a href="{{ SITEURL }}/{{ p.url }}">{{ p.title }}</a></li>
{% endfor %}
{% else %}
{% for cat, null in categories %}
<li{% if cat == category %} class="active"{% endif %}><a href="{{ SITEURL }}/{{ cat.url }}">{{ cat }}</a></li>
{% endfor %}
{% if DISPLAY_CATEGORIES_ON_MENU %}
{% for cat, null in categories %}
<li{% if cat == category %} class="active"{% endif %}><a href="{{ SITEURL }}/{{ cat.url }}">{{ cat }}</a></li>
{% endfor %}
{% endif %}
{% endif %}
</ul></nav><!-- /#menu -->
{% block content %}