From fc0fe945b7fe3080c131fa645e08d010ccd0da34 Mon Sep 17 00:00:00 2001 From: Brianna Laugher Date: Fri, 24 Jun 2016 11:35:45 +0200 Subject: [PATCH 1/7] Make devserver command work properly --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 44e101f..1fca162 100644 --- a/Makefile +++ b/Makefile @@ -45,7 +45,7 @@ else cd $(OUTPUTDIR) && $(PY) -m pelican.server 8000 endif -devserver: +devserver: html ifdef PORT $(BASEDIR)/develop_server.sh restart $(PORT) else From 988633939cb00240160365a99a1fc8d8f3d1331f Mon Sep 17 00:00:00 2001 From: Brianna Laugher Date: Fri, 24 Jun 2016 11:55:48 +0200 Subject: [PATCH 2/7] Make posts subdir under content. Fix image embedding --- content/{ => posts}/2015/images/legion.jpg | Bin content/{ => posts}/2015/we-have-a-blog.md | 4 ++-- pelicanconf.py | 6 ++++-- theme/templates/base.html | 5 ++++- 4 files changed, 10 insertions(+), 5 deletions(-) rename content/{ => posts}/2015/images/legion.jpg (100%) rename content/{ => posts}/2015/we-have-a-blog.md (62%) diff --git a/content/2015/images/legion.jpg b/content/posts/2015/images/legion.jpg similarity index 100% rename from content/2015/images/legion.jpg rename to content/posts/2015/images/legion.jpg diff --git a/content/2015/we-have-a-blog.md b/content/posts/2015/we-have-a-blog.md similarity index 62% rename from content/2015/we-have-a-blog.md rename to content/posts/2015/we-have-a-blog.md index f8d9856..1fd3b52 100644 --- a/content/2015/we-have-a-blog.md +++ b/content/posts/2015/we-have-a-blog.md @@ -7,6 +7,6 @@ Summary: Short version for index and feeds And we have a blog. -This was a nice hacking day. +This was a nice hacking day!. -![We're legion]({filename}/2015/images/legion.jpg){.img-rounded} +![We're legion]({attach}images/legion.jpg){.img-rounded} diff --git a/pelicanconf.py b/pelicanconf.py index 82168b5..8a8c993 100644 --- a/pelicanconf.py +++ b/pelicanconf.py @@ -9,7 +9,7 @@ EMAIL = 'pytest-dev@python.org' PATH = 'content' -STATIC_PATHS = ('extra/favicon.ico', 'CNAME') +STATIC_PATHS = ('extra/favicon.ico', 'CNAME', 'posts') EXTRA_PATH_METADATA = { 'extra/favicon.ico': {'path': 'favicon.ico'}, 'CNAME': {'path': 'CNAME'}, @@ -35,6 +35,7 @@ PLUGIN_PATHS = ['pelican-plugins'] PLUGINS = ['assets', 'sitemap'] +ARTICLE_PATHS = ['posts'] ARTICLE_URL = '{date:%Y}/{slug}/' ARTICLE_SAVE_AS = '{date:%Y}/{slug}/index.html' PAGE_URL = '{slug}/' @@ -45,5 +46,6 @@ RESOURCE_LINKS = [ - ('http://pytest.org/latest/', 'Documentation'), + ('http://planet.pytest.org', 'Planet Pytest'), + ('http://pytest.org/latest/', 'pytest.org'), ] diff --git a/theme/templates/base.html b/theme/templates/base.html index 848c76d..a1f985a 100644 --- a/theme/templates/base.html +++ b/theme/templates/base.html @@ -34,10 +34,13 @@

Categories

{% endfor %} -

Resources

+

Blog Resources

+

Pytest Resources

+