From 70566223227550c7a74cd19bf5e3cc8b6b59f607 Mon Sep 17 00:00:00 2001 From: Justin Mayer Date: Tue, 27 Nov 2012 16:01:05 -0800 Subject: [PATCH] Fix missing SITEURL and base home link 1. Following up on bbinet's changes in f12a297, ensure that the notmyidea theme's article.html template includes the SITEURL variable when constructing URL links. 2. Add missing slash to the base.html template so that clicking on the site header at top left refers to "/" instead of "" when SITEURL is not defined. Otherwise, the "" target will cause the browser to load the current page and not the site's root (as one would expect). --- pelican/themes/notmyidea/templates/article.html | 2 +- pelican/themes/notmyidea/templates/base.html | 2 +- tests/output/basic/a-markdown-powered-article.html | 4 ++-- tests/output/basic/archives.html | 2 +- tests/output/basic/article-1.html | 4 ++-- tests/output/basic/article-2.html | 4 ++-- tests/output/basic/article-3.html | 4 ++-- tests/output/basic/author/alexis-metaireau.html | 2 +- tests/output/basic/categories.html | 2 +- tests/output/basic/category/bar.html | 2 +- tests/output/basic/category/cat1.html | 2 +- tests/output/basic/category/misc.html | 2 +- tests/output/basic/category/yeah.html | 2 +- tests/output/basic/index.html | 2 +- tests/output/basic/oh-yeah.html | 4 ++-- tests/output/basic/pages/this-is-a-test-hidden-page.html | 2 +- tests/output/basic/pages/this-is-a-test-page.html | 2 +- tests/output/basic/second-article-fr.html | 4 ++-- tests/output/basic/second-article.html | 4 ++-- tests/output/basic/tag/bar.html | 2 +- tests/output/basic/tag/baz.html | 2 +- tests/output/basic/tag/foo.html | 2 +- tests/output/basic/tag/foobar.html | 2 +- tests/output/basic/tag/oh.html | 2 +- tests/output/basic/tag/yeah.html | 2 +- tests/output/basic/this-is-a-super-article.html | 4 ++-- tests/output/basic/unbelievable.html | 4 ++-- tests/output/custom/a-markdown-powered-article.html | 4 ++-- tests/output/custom/archives.html | 2 +- tests/output/custom/article-1.html | 4 ++-- tests/output/custom/article-2.html | 4 ++-- tests/output/custom/article-3.html | 4 ++-- tests/output/custom/author/alexis-metaireau.html | 2 +- tests/output/custom/author/alexis-metaireau2.html | 2 +- tests/output/custom/categories.html | 2 +- tests/output/custom/category/bar.html | 2 +- tests/output/custom/category/cat1.html | 2 +- tests/output/custom/category/misc.html | 2 +- tests/output/custom/category/yeah.html | 2 +- tests/output/custom/drafts/a-draft-article.html | 4 ++-- tests/output/custom/index.html | 2 +- tests/output/custom/index2.html | 2 +- tests/output/custom/oh-yeah-fr.html | 4 ++-- tests/output/custom/oh-yeah.html | 4 ++-- tests/output/custom/pages/this-is-a-test-hidden-page.html | 2 +- tests/output/custom/pages/this-is-a-test-page.html | 2 +- tests/output/custom/second-article-fr.html | 4 ++-- tests/output/custom/second-article.html | 4 ++-- tests/output/custom/tag/bar.html | 2 +- tests/output/custom/tag/baz.html | 2 +- tests/output/custom/tag/foo.html | 2 +- tests/output/custom/tag/foobar.html | 2 +- tests/output/custom/tag/oh.html | 2 +- tests/output/custom/tag/yeah.html | 2 +- tests/output/custom/this-is-a-super-article.html | 4 ++-- tests/output/custom/unbelievable.html | 4 ++-- 56 files changed, 76 insertions(+), 76 deletions(-) diff --git a/pelican/themes/notmyidea/templates/article.html b/pelican/themes/notmyidea/templates/article.html index fc7e5893..737d3789 100644 --- a/pelican/themes/notmyidea/templates/article.html +++ b/pelican/themes/notmyidea/templates/article.html @@ -5,7 +5,7 @@

- {{ article.title}}

{% include 'twitter.html' %}
diff --git a/pelican/themes/notmyidea/templates/base.html b/pelican/themes/notmyidea/templates/base.html index 45c2c3a2..f8b02662 100644 --- a/pelican/themes/notmyidea/templates/base.html +++ b/pelican/themes/notmyidea/templates/base.html @@ -26,7 +26,7 @@ {% include 'github.html' %}