Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add option to control displaying categories on menu #578

Merged
merged 1 commit into from Apr 1, 2013
Merged

Add option to control displaying categories on menu #578

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 2 additions & 0 deletions docs/changelog.rst
View file
Open in desktop
Expand Up @@ -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)
================
Expand Down
3 changes: 3 additions & 0 deletions docs/settings.rst
View file
Open in desktop
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions pelican/settings.py
View file
Open in desktop
Expand Up @@ -35,6 +35,7 @@
'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',
Expand Down
4 changes: 2 additions & 2 deletions pelican/tests/output/basic/a-markdown-powered-article.html
View file
Open in desktop
Expand Up @@ -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>
Expand Down
4 changes: 2 additions & 2 deletions pelican/tests/output/basic/archives.html
View file
Open in desktop
Expand Up @@ -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>
Expand Down
4 changes: 2 additions & 2 deletions pelican/tests/output/basic/article-1.html
View file
Open in desktop
Expand Up @@ -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>
Expand Down
4 changes: 2 additions & 2 deletions pelican/tests/output/basic/article-2.html
View file
Open in desktop
Expand Up @@ -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>
Expand Down
4 changes: 2 additions & 2 deletions pelican/tests/output/basic/article-3.html
View file
Open in desktop
Expand Up @@ -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>
Expand Down
4 changes: 2 additions & 2 deletions pelican/tests/output/basic/author/alexis-metaireau.html
View file
Open in desktop
Expand Up @@ -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 -->


Expand Down
4 changes: 2 additions & 2 deletions pelican/tests/output/basic/categories.html
View file
Open in desktop
Expand Up @@ -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>
Expand Down
4 changes: 2 additions & 2 deletions pelican/tests/output/basic/category/bar.html
View file
Open in desktop
Expand Up @@ -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 -->


Expand Down
4 changes: 2 additions & 2 deletions pelican/tests/output/basic/category/cat1.html
View file
Open in desktop
Expand Up @@ -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 -->


Expand Down
4 changes: 2 additions & 2 deletions pelican/tests/output/basic/category/misc.html
View file
Open in desktop
Expand Up @@ -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 -->


Expand Down
4 changes: 2 additions & 2 deletions pelican/tests/output/basic/category/yeah.html
View file
Open in desktop
Expand Up @@ -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 -->


Expand Down
4 changes: 2 additions & 2 deletions pelican/tests/output/basic/filename_metadata-example.html
View file
Open in desktop
Expand Up @@ -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>
Expand Down
4 changes: 2 additions & 2 deletions pelican/tests/output/basic/index.html
View file
Open in desktop
Expand Up @@ -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 -->


Expand Down
4 changes: 2 additions & 2 deletions pelican/tests/output/basic/oh-yeah.html
View file
Open in desktop
Expand Up @@ -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>
Expand Down
4 changes: 2 additions & 2 deletions pelican/tests/output/basic/override/index.html
View file
Open in desktop
Expand Up @@ -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">
Expand Down
4 changes: 2 additions & 2 deletions pelican/tests/output/basic/pages/this-is-a-test-hidden-page.html
View file
Open in desktop
Expand Up @@ -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">
Expand Down
4 changes: 2 additions & 2 deletions pelican/tests/output/basic/pages/this-is-a-test-page.html
View file
Open in desktop
Expand Up @@ -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">
Expand Down