diff --git a/pelican/tests/output/basic/a-markdown-powered-article.html b/pelican/tests/output/basic/a-markdown-powered-article.html index 94b6e4ca..29c6d0d6 100644 --- a/pelican/tests/output/basic/a-markdown-powered-article.html +++ b/pelican/tests/output/basic/a-markdown-powered-article.html @@ -17,10 +17,10 @@
diff --git a/pelican/tests/output/basic/archives.html b/pelican/tests/output/basic/archives.html index 57f4a57a..9edb3c1b 100644 --- a/pelican/tests/output/basic/archives.html +++ b/pelican/tests/output/basic/archives.html @@ -17,10 +17,10 @@
diff --git a/pelican/tests/output/basic/article-1.html b/pelican/tests/output/basic/article-1.html index cfe91009..eee7adfe 100644 --- a/pelican/tests/output/basic/article-1.html +++ b/pelican/tests/output/basic/article-1.html @@ -17,10 +17,10 @@
diff --git a/pelican/tests/output/basic/article-2.html b/pelican/tests/output/basic/article-2.html index 70f38852..5449a8be 100644 --- a/pelican/tests/output/basic/article-2.html +++ b/pelican/tests/output/basic/article-2.html @@ -17,10 +17,10 @@
diff --git a/pelican/tests/output/basic/article-3.html b/pelican/tests/output/basic/article-3.html index 20e58fcc..55449726 100644 --- a/pelican/tests/output/basic/article-3.html +++ b/pelican/tests/output/basic/article-3.html @@ -17,10 +17,10 @@
diff --git a/pelican/tests/output/basic/author/alexis-metaireau.html b/pelican/tests/output/basic/author/alexis-metaireau.html index 7f7a8c6b..1c67b6fa 100644 --- a/pelican/tests/output/basic/author/alexis-metaireau.html +++ b/pelican/tests/output/basic/author/alexis-metaireau.html @@ -17,10 +17,10 @@ diff --git a/pelican/tests/output/basic/categories.html b/pelican/tests/output/basic/categories.html index a5eb2621..7a85b52a 100644 --- a/pelican/tests/output/basic/categories.html +++ b/pelican/tests/output/basic/categories.html @@ -17,10 +17,10 @@
    diff --git a/pelican/tests/output/basic/category/bar.html b/pelican/tests/output/basic/category/bar.html index 9e3b52f1..78894c94 100644 --- a/pelican/tests/output/basic/category/bar.html +++ b/pelican/tests/output/basic/category/bar.html @@ -18,9 +18,9 @@
  • Override url/save_as
  • This is a test page
  • bar
    • -
  • cat1
    • -
  • misc
    • -
  • yeah
    • +
  • cat1
    • +
  • misc
    • +
  • yeah
diff --git a/pelican/tests/output/basic/category/cat1.html b/pelican/tests/output/basic/category/cat1.html index c8912fc2..43226146 100644 --- a/pelican/tests/output/basic/category/cat1.html +++ b/pelican/tests/output/basic/category/cat1.html @@ -17,10 +17,10 @@ diff --git a/pelican/tests/output/basic/category/misc.html b/pelican/tests/output/basic/category/misc.html index af223812..4aebcdf1 100644 --- a/pelican/tests/output/basic/category/misc.html +++ b/pelican/tests/output/basic/category/misc.html @@ -17,10 +17,10 @@ diff --git a/pelican/tests/output/basic/category/yeah.html b/pelican/tests/output/basic/category/yeah.html index f401e3d2..b6f59771 100644 --- a/pelican/tests/output/basic/category/yeah.html +++ b/pelican/tests/output/basic/category/yeah.html @@ -17,9 +17,9 @@ diff --git a/pelican/tests/output/basic/filename_metadata-example.html b/pelican/tests/output/basic/filename_metadata-example.html index 3092742b..4ceef81f 100644 --- a/pelican/tests/output/basic/filename_metadata-example.html +++ b/pelican/tests/output/basic/filename_metadata-example.html @@ -17,10 +17,10 @@
diff --git a/pelican/tests/output/basic/index.html b/pelican/tests/output/basic/index.html index c5b9fec3..49c1883c 100644 --- a/pelican/tests/output/basic/index.html +++ b/pelican/tests/output/basic/index.html @@ -17,10 +17,10 @@ diff --git a/pelican/tests/output/basic/oh-yeah.html b/pelican/tests/output/basic/oh-yeah.html index 62834917..498e9cac 100644 --- a/pelican/tests/output/basic/oh-yeah.html +++ b/pelican/tests/output/basic/oh-yeah.html @@ -18,9 +18,9 @@
  • Override url/save_as
  • This is a test page
  • bar
    • -
  • cat1
    • -
  • misc
    • -
  • yeah
    • +
  • cat1
    • +
  • misc
    • +
  • yeah
    • diff --git a/pelican/tests/output/basic/override/index.html b/pelican/tests/output/basic/override/index.html index e75c75f7..2cc639d2 100644 --- a/pelican/tests/output/basic/override/index.html +++ b/pelican/tests/output/basic/override/index.html @@ -15,12 +15,12 @@ diff --git a/pelican/tests/output/basic/pages/this-is-a-test-hidden-page.html b/pelican/tests/output/basic/pages/this-is-a-test-hidden-page.html index 6b5ae4c8..cd582b96 100644 --- a/pelican/tests/output/basic/pages/this-is-a-test-hidden-page.html +++ b/pelican/tests/output/basic/pages/this-is-a-test-hidden-page.html @@ -17,10 +17,10 @@ diff --git a/pelican/tests/output/basic/pages/this-is-a-test-page.html b/pelican/tests/output/basic/pages/this-is-a-test-page.html index 9f1572af..8ba85e1d 100644 --- a/pelican/tests/output/basic/pages/this-is-a-test-page.html +++ b/pelican/tests/output/basic/pages/this-is-a-test-page.html @@ -16,11 +16,11 @@

    A Pelican Blog

    diff --git a/pelican/tests/output/basic/second-article-fr.html b/pelican/tests/output/basic/second-article-fr.html index f0c166de..44965a76 100644 --- a/pelican/tests/output/basic/second-article-fr.html +++ b/pelican/tests/output/basic/second-article-fr.html @@ -17,10 +17,10 @@
    diff --git a/pelican/tests/output/basic/second-article.html b/pelican/tests/output/basic/second-article.html index 6cc42c66..780d9b20 100644 --- a/pelican/tests/output/basic/second-article.html +++ b/pelican/tests/output/basic/second-article.html @@ -17,10 +17,10 @@
    diff --git a/pelican/tests/output/basic/tag/bar.html b/pelican/tests/output/basic/tag/bar.html index 20824993..e23071e8 100644 --- a/pelican/tests/output/basic/tag/bar.html +++ b/pelican/tests/output/basic/tag/bar.html @@ -17,10 +17,10 @@ diff --git a/pelican/tests/output/basic/tag/baz.html b/pelican/tests/output/basic/tag/baz.html index 65632313..e429b6d8 100644 --- a/pelican/tests/output/basic/tag/baz.html +++ b/pelican/tests/output/basic/tag/baz.html @@ -17,10 +17,10 @@ diff --git a/pelican/tests/output/basic/tag/foo.html b/pelican/tests/output/basic/tag/foo.html index 05a02a5f..17fac77a 100644 --- a/pelican/tests/output/basic/tag/foo.html +++ b/pelican/tests/output/basic/tag/foo.html @@ -17,10 +17,10 @@ diff --git a/pelican/tests/output/basic/tag/foobar.html b/pelican/tests/output/basic/tag/foobar.html index c683f1a1..cb8dfec2 100644 --- a/pelican/tests/output/basic/tag/foobar.html +++ b/pelican/tests/output/basic/tag/foobar.html @@ -17,10 +17,10 @@ diff --git a/pelican/tests/output/basic/tag/oh.html b/pelican/tests/output/basic/tag/oh.html index 610a7aa3..f79e6e0e 100644 --- a/pelican/tests/output/basic/tag/oh.html +++ b/pelican/tests/output/basic/tag/oh.html @@ -17,10 +17,10 @@ diff --git a/pelican/tests/output/basic/tag/yeah.html b/pelican/tests/output/basic/tag/yeah.html index 2afb8bd3..dc3c1212 100644 --- a/pelican/tests/output/basic/tag/yeah.html +++ b/pelican/tests/output/basic/tag/yeah.html @@ -17,10 +17,10 @@ diff --git a/pelican/tests/output/basic/this-is-a-super-article.html b/pelican/tests/output/basic/this-is-a-super-article.html index 617b8c6d..85ad0ad8 100644 --- a/pelican/tests/output/basic/this-is-a-super-article.html +++ b/pelican/tests/output/basic/this-is-a-super-article.html @@ -17,9 +17,9 @@ diff --git a/pelican/tests/output/basic/unbelievable.html b/pelican/tests/output/basic/unbelievable.html index 73c95423..3cc9a557 100644 --- a/pelican/tests/output/basic/unbelievable.html +++ b/pelican/tests/output/basic/unbelievable.html @@ -17,10 +17,10 @@
    diff --git a/pelican/tests/output/custom/a-markdown-powered-article.html b/pelican/tests/output/custom/a-markdown-powered-article.html index 7b953a61..6a2f1fc5 100644 --- a/pelican/tests/output/custom/a-markdown-powered-article.html +++ b/pelican/tests/output/custom/a-markdown-powered-article.html @@ -21,10 +21,10 @@
    diff --git a/pelican/tests/output/custom/archives.html b/pelican/tests/output/custom/archives.html index 8437e350..b1704bdb 100644 --- a/pelican/tests/output/custom/archives.html +++ b/pelican/tests/output/custom/archives.html @@ -21,10 +21,10 @@
    diff --git a/pelican/tests/output/custom/article-1.html b/pelican/tests/output/custom/article-1.html index c52fdd9a..c77bd4cf 100644 --- a/pelican/tests/output/custom/article-1.html +++ b/pelican/tests/output/custom/article-1.html @@ -21,10 +21,10 @@
    diff --git a/pelican/tests/output/custom/article-2.html b/pelican/tests/output/custom/article-2.html index 7a045bdc..f93b8a85 100644 --- a/pelican/tests/output/custom/article-2.html +++ b/pelican/tests/output/custom/article-2.html @@ -21,10 +21,10 @@
    diff --git a/pelican/tests/output/custom/article-3.html b/pelican/tests/output/custom/article-3.html index f887218c..c87abf66 100644 --- a/pelican/tests/output/custom/article-3.html +++ b/pelican/tests/output/custom/article-3.html @@ -21,10 +21,10 @@
    diff --git a/pelican/tests/output/custom/author/alexis-metaireau.html b/pelican/tests/output/custom/author/alexis-metaireau.html index f18b8ce8..dd699031 100644 --- a/pelican/tests/output/custom/author/alexis-metaireau.html +++ b/pelican/tests/output/custom/author/alexis-metaireau.html @@ -21,10 +21,10 @@ diff --git a/pelican/tests/output/custom/author/alexis-metaireau2.html b/pelican/tests/output/custom/author/alexis-metaireau2.html index 5d92303c..be78ff62 100644 --- a/pelican/tests/output/custom/author/alexis-metaireau2.html +++ b/pelican/tests/output/custom/author/alexis-metaireau2.html @@ -21,10 +21,10 @@ diff --git a/pelican/tests/output/custom/author/alexis-metaireau3.html b/pelican/tests/output/custom/author/alexis-metaireau3.html index 64468725..bc13ee21 100644 --- a/pelican/tests/output/custom/author/alexis-metaireau3.html +++ b/pelican/tests/output/custom/author/alexis-metaireau3.html @@ -21,10 +21,10 @@ diff --git a/pelican/tests/output/custom/categories.html b/pelican/tests/output/custom/categories.html index 146d7f3a..ddbc1832 100644 --- a/pelican/tests/output/custom/categories.html +++ b/pelican/tests/output/custom/categories.html @@ -21,10 +21,10 @@
      diff --git a/pelican/tests/output/custom/category/bar.html b/pelican/tests/output/custom/category/bar.html index f7f1bbf3..4198d868 100644 --- a/pelican/tests/output/custom/category/bar.html +++ b/pelican/tests/output/custom/category/bar.html @@ -21,9 +21,9 @@ diff --git a/pelican/tests/output/custom/category/cat1.html b/pelican/tests/output/custom/category/cat1.html index 10c4ce76..50a7a80b 100644 --- a/pelican/tests/output/custom/category/cat1.html +++ b/pelican/tests/output/custom/category/cat1.html @@ -21,10 +21,10 @@ diff --git a/pelican/tests/output/custom/category/misc.html b/pelican/tests/output/custom/category/misc.html index 121c9451..f2afbaeb 100644 --- a/pelican/tests/output/custom/category/misc.html +++ b/pelican/tests/output/custom/category/misc.html @@ -21,10 +21,10 @@ diff --git a/pelican/tests/output/custom/category/yeah.html b/pelican/tests/output/custom/category/yeah.html index f7cc8d12..fa3e018f 100644 --- a/pelican/tests/output/custom/category/yeah.html +++ b/pelican/tests/output/custom/category/yeah.html @@ -22,9 +22,9 @@
    • Override url/save_as
    • This is a test page
    • yeah
      • -
    • misc
      • -
    • cat1
      • -
    • bar
      • +
    • misc
      • +
    • cat1
      • +
    • bar
    diff --git a/pelican/tests/output/custom/drafts/a-draft-article.html b/pelican/tests/output/custom/drafts/a-draft-article.html index 493eb611..40854732 100644 --- a/pelican/tests/output/custom/drafts/a-draft-article.html +++ b/pelican/tests/output/custom/drafts/a-draft-article.html @@ -21,10 +21,10 @@
    diff --git a/pelican/tests/output/custom/filename_metadata-example.html b/pelican/tests/output/custom/filename_metadata-example.html index 626e8c64..db0e2b19 100644 --- a/pelican/tests/output/custom/filename_metadata-example.html +++ b/pelican/tests/output/custom/filename_metadata-example.html @@ -21,10 +21,10 @@
    diff --git a/pelican/tests/output/custom/index.html b/pelican/tests/output/custom/index.html index 1a1d89e9..68f51f06 100644 --- a/pelican/tests/output/custom/index.html +++ b/pelican/tests/output/custom/index.html @@ -21,10 +21,10 @@ diff --git a/pelican/tests/output/custom/index2.html b/pelican/tests/output/custom/index2.html index 7de87a34..e85dd580 100644 --- a/pelican/tests/output/custom/index2.html +++ b/pelican/tests/output/custom/index2.html @@ -21,10 +21,10 @@ diff --git a/pelican/tests/output/custom/index3.html b/pelican/tests/output/custom/index3.html index 18435df8..af973106 100644 --- a/pelican/tests/output/custom/index3.html +++ b/pelican/tests/output/custom/index3.html @@ -21,10 +21,10 @@ diff --git a/pelican/tests/output/custom/jinja2_template.html b/pelican/tests/output/custom/jinja2_template.html index 95077c2f..fcd60de6 100644 --- a/pelican/tests/output/custom/jinja2_template.html +++ b/pelican/tests/output/custom/jinja2_template.html @@ -21,10 +21,10 @@ diff --git a/pelican/tests/output/custom/oh-yeah-fr.html b/pelican/tests/output/custom/oh-yeah-fr.html index e34e6078..f18d3f07 100644 --- a/pelican/tests/output/custom/oh-yeah-fr.html +++ b/pelican/tests/output/custom/oh-yeah-fr.html @@ -21,10 +21,10 @@
    diff --git a/pelican/tests/output/custom/oh-yeah.html b/pelican/tests/output/custom/oh-yeah.html index 2f6ca309..c0e77d00 100644 --- a/pelican/tests/output/custom/oh-yeah.html +++ b/pelican/tests/output/custom/oh-yeah.html @@ -21,9 +21,9 @@ diff --git a/pelican/tests/output/custom/override/index.html b/pelican/tests/output/custom/override/index.html index ad9fb8b1..ca8490d6 100644 --- a/pelican/tests/output/custom/override/index.html +++ b/pelican/tests/output/custom/override/index.html @@ -19,12 +19,12 @@ diff --git a/pelican/tests/output/custom/pages/this-is-a-test-hidden-page.html b/pelican/tests/output/custom/pages/this-is-a-test-hidden-page.html index b4ac59b0..89275001 100644 --- a/pelican/tests/output/custom/pages/this-is-a-test-hidden-page.html +++ b/pelican/tests/output/custom/pages/this-is-a-test-hidden-page.html @@ -21,10 +21,10 @@ diff --git a/pelican/tests/output/custom/pages/this-is-a-test-page.html b/pelican/tests/output/custom/pages/this-is-a-test-page.html index b4cb678c..d969d152 100644 --- a/pelican/tests/output/custom/pages/this-is-a-test-page.html +++ b/pelican/tests/output/custom/pages/this-is-a-test-page.html @@ -20,11 +20,11 @@

    Alexis' log

    diff --git a/pelican/tests/output/custom/second-article-fr.html b/pelican/tests/output/custom/second-article-fr.html index 3d5fbd29..16ca3cc9 100644 --- a/pelican/tests/output/custom/second-article-fr.html +++ b/pelican/tests/output/custom/second-article-fr.html @@ -21,10 +21,10 @@
    diff --git a/pelican/tests/output/custom/second-article.html b/pelican/tests/output/custom/second-article.html index be83983e..4740eded 100644 --- a/pelican/tests/output/custom/second-article.html +++ b/pelican/tests/output/custom/second-article.html @@ -21,10 +21,10 @@
    diff --git a/pelican/tests/output/custom/tag/bar.html b/pelican/tests/output/custom/tag/bar.html index d1805e50..5f26883b 100644 --- a/pelican/tests/output/custom/tag/bar.html +++ b/pelican/tests/output/custom/tag/bar.html @@ -21,10 +21,10 @@ diff --git a/pelican/tests/output/custom/tag/baz.html b/pelican/tests/output/custom/tag/baz.html index a6d23907..46aa6095 100644 --- a/pelican/tests/output/custom/tag/baz.html +++ b/pelican/tests/output/custom/tag/baz.html @@ -21,10 +21,10 @@ diff --git a/pelican/tests/output/custom/tag/foo.html b/pelican/tests/output/custom/tag/foo.html index 04cb7529..04d37f1b 100644 --- a/pelican/tests/output/custom/tag/foo.html +++ b/pelican/tests/output/custom/tag/foo.html @@ -21,10 +21,10 @@ diff --git a/pelican/tests/output/custom/tag/foobar.html b/pelican/tests/output/custom/tag/foobar.html index 2c50c8ae..961e381a 100644 --- a/pelican/tests/output/custom/tag/foobar.html +++ b/pelican/tests/output/custom/tag/foobar.html @@ -21,10 +21,10 @@ diff --git a/pelican/tests/output/custom/tag/oh.html b/pelican/tests/output/custom/tag/oh.html index b798964e..5452f4d3 100644 --- a/pelican/tests/output/custom/tag/oh.html +++ b/pelican/tests/output/custom/tag/oh.html @@ -21,10 +21,10 @@ diff --git a/pelican/tests/output/custom/tag/yeah.html b/pelican/tests/output/custom/tag/yeah.html index 54ad93c6..d71c8a37 100644 --- a/pelican/tests/output/custom/tag/yeah.html +++ b/pelican/tests/output/custom/tag/yeah.html @@ -21,10 +21,10 @@ diff --git a/pelican/tests/output/custom/this-is-a-super-article.html b/pelican/tests/output/custom/this-is-a-super-article.html index 1fdd8897..8d9df71b 100644 --- a/pelican/tests/output/custom/this-is-a-super-article.html +++ b/pelican/tests/output/custom/this-is-a-super-article.html @@ -22,9 +22,9 @@
  • Override url/save_as
  • This is a test page
  • yeah
    • -
  • misc
    • -
  • cat1
    • -
  • bar
    • +
  • misc
    • +
  • cat1
    • +
  • bar
    • diff --git a/pelican/tests/output/custom/unbelievable.html b/pelican/tests/output/custom/unbelievable.html index e7253497..ee743526 100644 --- a/pelican/tests/output/custom/unbelievable.html +++ b/pelican/tests/output/custom/unbelievable.html @@ -21,10 +21,10 @@
    diff --git a/pelican/themes/notmyidea/templates/base.html b/pelican/themes/notmyidea/templates/base.html index a9edad6d..7418e7df 100644 --- a/pelican/themes/notmyidea/templates/base.html +++ b/pelican/themes/notmyidea/templates/base.html @@ -25,13 +25,13 @@
  • {{ title }}
    • {% endfor %} {% if DISPLAY_PAGES_ON_MENU -%} - {% for page in PAGES %} -
  • {{ page.title }}
    • + {% for pg in PAGES %} + {{ pg.title }} {% endfor %} {% endif %} {% if DISPLAY_CATEGORIES_ON_MENU -%} {% for cat, null in categories %} -
  • {{ cat }}
    • + {{ cat }} {% endfor %} {% endif %}