From: Vladimír Vondruš Date: Sat, 16 Dec 2017 01:17:22 +0000 (+0100) Subject: theme: put article/page URLs into . X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~cjwatson/git?a=commitdiff_plain;h=4339f98426d9f1e95cdc824f676fc3f3b7f2717f;p=blog.git theme: put article/page URLs into . --- diff --git a/pelican-theme/templates/article.html b/pelican-theme/templates/article.html index 76589299..d5c7f8eb 100644 --- a/pelican-theme/templates/article.html +++ b/pelican-theme/templates/article.html @@ -2,6 +2,10 @@ {% block title %}{{ article.title }} | {{ M_BLOG_NAME|e }}{% endblock %} +{% block head_links %} + +{% endblock %} + {% block head %} {{- super() -}} {% if article.description %} diff --git a/pelican-theme/templates/page.html b/pelican-theme/templates/page.html index 33a5a046..61f1670c 100644 --- a/pelican-theme/templates/page.html +++ b/pelican-theme/templates/page.html @@ -14,13 +14,13 @@ {% endblock %} {% block head_links %} - {{- super() -}} {% if page.css %} {% set styles = page.css.strip().split('\n') %} {% for style in styles %} {% endfor %} {% endif %} + {% endblock %} {% block head %} diff --git a/pelican-theme/test/blog/article-jumbo.html b/pelican-theme/test/blog/article-jumbo.html index 4043405e..52415666 100644 --- a/pelican-theme/test/blog/article-jumbo.html +++ b/pelican-theme/test/blog/article-jumbo.html @@ -5,6 +5,7 @@ An article — a jumbo one | A Pelican Blog + diff --git a/pelican-theme/test/blog/article.html b/pelican-theme/test/blog/article.html index f41ea2e3..34a66f47 100644 --- a/pelican-theme/test/blog/article.html +++ b/pelican-theme/test/blog/article.html @@ -5,6 +5,7 @@ An article | A Pelican Blog + diff --git a/pelican-theme/test/blog_author_list/article-jumbo.html b/pelican-theme/test/blog_author_list/article-jumbo.html index 4d433b16..7b6da4eb 100644 --- a/pelican-theme/test/blog_author_list/article-jumbo.html +++ b/pelican-theme/test/blog_author_list/article-jumbo.html @@ -5,6 +5,7 @@ A jumbo article | A Pelican Blog + diff --git a/pelican-theme/test/blog_collapse_first_both_hide_summary_both/article-jumbo.html b/pelican-theme/test/blog_collapse_first_both_hide_summary_both/article-jumbo.html index 335fdbec..25f0fbcf 100644 --- a/pelican-theme/test/blog_collapse_first_both_hide_summary_both/article-jumbo.html +++ b/pelican-theme/test/blog_collapse_first_both_hide_summary_both/article-jumbo.html @@ -5,6 +5,7 @@ A jumbo article | A Pelican Blog + diff --git a/pelican-theme/test/blog_collapse_first_both_hide_summary_both/article.html b/pelican-theme/test/blog_collapse_first_both_hide_summary_both/article.html index 857562df..ba2d51ef 100644 --- a/pelican-theme/test/blog_collapse_first_both_hide_summary_both/article.html +++ b/pelican-theme/test/blog_collapse_first_both_hide_summary_both/article.html @@ -5,6 +5,7 @@ An article | A Pelican Blog + diff --git a/pelican-theme/test/blog_collapse_first_both_hide_summary_global/article-jumbo.html b/pelican-theme/test/blog_collapse_first_both_hide_summary_global/article-jumbo.html index d44febc8..91bb4fe3 100644 --- a/pelican-theme/test/blog_collapse_first_both_hide_summary_global/article-jumbo.html +++ b/pelican-theme/test/blog_collapse_first_both_hide_summary_global/article-jumbo.html @@ -5,6 +5,7 @@ A jumbo article | A Pelican Blog + diff --git a/pelican-theme/test/blog_collapse_first_both_hide_summary_global/article.html b/pelican-theme/test/blog_collapse_first_both_hide_summary_global/article.html index 18c2dd3e..506d23e9 100644 --- a/pelican-theme/test/blog_collapse_first_both_hide_summary_global/article.html +++ b/pelican-theme/test/blog_collapse_first_both_hide_summary_global/article.html @@ -5,6 +5,7 @@ An article | A Pelican Blog + diff --git a/pelican-theme/test/blog_collapse_first_global_hide_summary_both/article-jumbo.html b/pelican-theme/test/blog_collapse_first_global_hide_summary_both/article-jumbo.html index 0dbb90c1..e756cc35 100644 --- a/pelican-theme/test/blog_collapse_first_global_hide_summary_both/article-jumbo.html +++ b/pelican-theme/test/blog_collapse_first_global_hide_summary_both/article-jumbo.html @@ -5,6 +5,7 @@ A jumbo article | A Pelican Blog + diff --git a/pelican-theme/test/blog_collapse_first_global_hide_summary_both/article.html b/pelican-theme/test/blog_collapse_first_global_hide_summary_both/article.html index e4289e6d..62da93e3 100644 --- a/pelican-theme/test/blog_collapse_first_global_hide_summary_both/article.html +++ b/pelican-theme/test/blog_collapse_first_global_hide_summary_both/article.html @@ -5,6 +5,7 @@ An article | A Pelican Blog + diff --git a/pelican-theme/test/blog_collapse_first_global_hide_summary_global/article-jumbo.html b/pelican-theme/test/blog_collapse_first_global_hide_summary_global/article-jumbo.html index d44febc8..91bb4fe3 100644 --- a/pelican-theme/test/blog_collapse_first_global_hide_summary_global/article-jumbo.html +++ b/pelican-theme/test/blog_collapse_first_global_hide_summary_global/article-jumbo.html @@ -5,6 +5,7 @@ A jumbo article | A Pelican Blog + diff --git a/pelican-theme/test/blog_collapse_first_global_hide_summary_global/article.html b/pelican-theme/test/blog_collapse_first_global_hide_summary_global/article.html index 8bf43dc0..6622d62d 100644 --- a/pelican-theme/test/blog_collapse_first_global_hide_summary_global/article.html +++ b/pelican-theme/test/blog_collapse_first_global_hide_summary_global/article.html @@ -5,6 +5,7 @@ An article | A Pelican Blog + diff --git a/pelican-theme/test/blog_hide_summary_both/article-jumbo.html b/pelican-theme/test/blog_hide_summary_both/article-jumbo.html index fd9b65b3..5d550a40 100644 --- a/pelican-theme/test/blog_hide_summary_both/article-jumbo.html +++ b/pelican-theme/test/blog_hide_summary_both/article-jumbo.html @@ -5,6 +5,7 @@ A jumbo article | A Pelican Blog + diff --git a/pelican-theme/test/blog_hide_summary_both/article.html b/pelican-theme/test/blog_hide_summary_both/article.html index 84711eed..d0f5dddb 100644 --- a/pelican-theme/test/blog_hide_summary_both/article.html +++ b/pelican-theme/test/blog_hide_summary_both/article.html @@ -5,6 +5,7 @@ An article | A Pelican Blog + diff --git a/pelican-theme/test/blog_hide_summary_global/article-jumbo.html b/pelican-theme/test/blog_hide_summary_global/article-jumbo.html index bb4a9970..03c1bd8e 100644 --- a/pelican-theme/test/blog_hide_summary_global/article-jumbo.html +++ b/pelican-theme/test/blog_hide_summary_global/article-jumbo.html @@ -5,6 +5,7 @@ A jumbo article | A Pelican Blog + diff --git a/pelican-theme/test/blog_hide_summary_global/article.html b/pelican-theme/test/blog_hide_summary_global/article.html index 668d5c7c..eaebbfb8 100644 --- a/pelican-theme/test/blog_hide_summary_global/article.html +++ b/pelican-theme/test/blog_hide_summary_global/article.html @@ -5,6 +5,7 @@ An article | A Pelican Blog + diff --git a/pelican-theme/test/blog_html_escape/article-jumbo.html b/pelican-theme/test/blog_html_escape/article-jumbo.html index df9f0aa0..f7bf746a 100644 --- a/pelican-theme/test/blog_html_escape/article-jumbo.html +++ b/pelican-theme/test/blog_html_escape/article-jumbo.html @@ -5,6 +5,7 @@ Article with <&> — a <&> jumbo one | <&> in blog name + diff --git a/pelican-theme/test/blog_html_escape/article.html b/pelican-theme/test/blog_html_escape/article.html index 0ce1c890..295362bd 100644 --- a/pelican-theme/test/blog_html_escape/article.html +++ b/pelican-theme/test/blog_html_escape/article.html @@ -5,6 +5,7 @@ Article with <&> in title | <&> in blog name + diff --git a/pelican-theme/test/blog_jumbo_inverted/article-jumbo.html b/pelican-theme/test/blog_jumbo_inverted/article-jumbo.html index 2fb619ab..408c5446 100644 --- a/pelican-theme/test/blog_jumbo_inverted/article-jumbo.html +++ b/pelican-theme/test/blog_jumbo_inverted/article-jumbo.html @@ -5,6 +5,7 @@ A jumbo article | A Pelican Blog + diff --git a/pelican-theme/test/blog_minimal/article-jumbo.html b/pelican-theme/test/blog_minimal/article-jumbo.html index 42c08071..1e16ec70 100644 --- a/pelican-theme/test/blog_minimal/article-jumbo.html +++ b/pelican-theme/test/blog_minimal/article-jumbo.html @@ -5,6 +5,7 @@ A jumbo article | A Pelican Blog + diff --git a/pelican-theme/test/blog_minimal/article.html b/pelican-theme/test/blog_minimal/article.html index 9f8cabc5..a436127f 100644 --- a/pelican-theme/test/blog_minimal/article.html +++ b/pelican-theme/test/blog_minimal/article.html @@ -5,6 +5,7 @@ An article | A Pelican Blog + diff --git a/pelican-theme/test/layout/features.html b/pelican-theme/test/layout/features.html index eff9f85c..a3564c90 100644 --- a/pelican-theme/test/layout/features.html +++ b/pelican-theme/test/layout/features.html @@ -5,6 +5,7 @@ Features | Your Brand + diff --git a/pelican-theme/test/layout/guest-post-howto.html b/pelican-theme/test/layout/guest-post-howto.html index b48202d3..d2f5145d 100644 --- a/pelican-theme/test/layout/guest-post-howto.html +++ b/pelican-theme/test/layout/guest-post-howto.html @@ -5,6 +5,7 @@ Guest post howto | Your Brand + diff --git a/pelican-theme/test/layout/showcase-requirements.html b/pelican-theme/test/layout/showcase-requirements.html index b4a8496a..b409cc04 100644 --- a/pelican-theme/test/layout/showcase-requirements.html +++ b/pelican-theme/test/layout/showcase-requirements.html @@ -5,6 +5,7 @@ Showcase requirements | Your Brand + diff --git a/pelican-theme/test/page/page.html b/pelican-theme/test/page/page.html index e7e4db77..0339348b 100644 --- a/pelican-theme/test/page/page.html +++ b/pelican-theme/test/page/page.html @@ -5,6 +5,7 @@ A page | A Pelican Blog + diff --git a/pelican-theme/test/page_breadcrumb/page.html b/pelican-theme/test/page_breadcrumb/page.html index f2162458..70d0ef9a 100644 --- a/pelican-theme/test/page_breadcrumb/page.html +++ b/pelican-theme/test/page_breadcrumb/page.html @@ -5,6 +5,7 @@ Index page » A page | A Pelican Blog + diff --git a/pelican-theme/test/page_breadcrumb/subpage.html b/pelican-theme/test/page_breadcrumb/subpage.html index b647e55f..fa292dc9 100644 --- a/pelican-theme/test/page_breadcrumb/subpage.html +++ b/pelican-theme/test/page_breadcrumb/subpage.html @@ -5,6 +5,7 @@ Index page » A page » Subpage | A Pelican Blog + diff --git a/pelican-theme/test/page_extra_css/page.html b/pelican-theme/test/page_extra_css/page.html index 398e05f5..1f7fec8f 100644 --- a/pelican-theme/test/page_extra_css/page.html +++ b/pelican-theme/test/page_extra_css/page.html @@ -7,6 +7,7 @@ + diff --git a/pelican-theme/test/page_header_footer/page.html b/pelican-theme/test/page_header_footer/page.html index 2d660f62..0d72816e 100644 --- a/pelican-theme/test/page_header_footer/page.html +++ b/pelican-theme/test/page_header_footer/page.html @@ -5,6 +5,7 @@ A page | A Pelican Blog + diff --git a/pelican-theme/test/page_html_escape/breadcrumb.html b/pelican-theme/test/page_html_escape/breadcrumb.html index 4c8a9ace..63e8cbe2 100644 --- a/pelican-theme/test/page_html_escape/breadcrumb.html +++ b/pelican-theme/test/page_html_escape/breadcrumb.html @@ -5,6 +5,7 @@ And <&> in breadcrumb » Page with <&> in title | <&> in site name + diff --git a/pelican-theme/test/page_html_escape/content.html b/pelican-theme/test/page_html_escape/content.html index 0c696d94..f2076c07 100644 --- a/pelican-theme/test/page_html_escape/content.html +++ b/pelican-theme/test/page_html_escape/content.html @@ -5,6 +5,7 @@ Escaping in content | <&> in site name + diff --git a/pelican-theme/test/page_html_escape/landing.html b/pelican-theme/test/page_html_escape/landing.html index b8732833..bfe5f80e 100644 --- a/pelican-theme/test/page_html_escape/landing.html +++ b/pelican-theme/test/page_html_escape/landing.html @@ -5,6 +5,7 @@ <&> in site name + diff --git a/pelican-theme/test/page_html_escape/page.html b/pelican-theme/test/page_html_escape/page.html index 40d3b844..eb507ea5 100644 --- a/pelican-theme/test/page_html_escape/page.html +++ b/pelican-theme/test/page_html_escape/page.html @@ -5,6 +5,7 @@ Page with <&> in title | <&> in site name + diff --git a/pelican-theme/test/page_landing/hide-navbar-brand.html b/pelican-theme/test/page_landing/hide-navbar-brand.html index ff187502..de4a4cf8 100644 --- a/pelican-theme/test/page_landing/hide-navbar-brand.html +++ b/pelican-theme/test/page_landing/hide-navbar-brand.html @@ -5,6 +5,7 @@ A page | A Pelican Blog + diff --git a/pelican-theme/test/page_landing/page.html b/pelican-theme/test/page_landing/page.html index b31f961a..a6ef08d0 100644 --- a/pelican-theme/test/page_landing/page.html +++ b/pelican-theme/test/page_landing/page.html @@ -5,6 +5,7 @@ A page title that displays only in title | A Pelican Blog + diff --git a/pelican-theme/test/page_minimal/page.html b/pelican-theme/test/page_minimal/page.html index d0259ec9..b8d75ff7 100644 --- a/pelican-theme/test/page_minimal/page.html +++ b/pelican-theme/test/page_minimal/page.html @@ -5,6 +5,7 @@ A page | A Pelican Blog + diff --git a/pelican-theme/test/page_title_sitename_alias/page.html b/pelican-theme/test/page_title_sitename_alias/page.html index d480d74a..945d4d37 100644 --- a/pelican-theme/test/page_title_sitename_alias/page.html +++ b/pelican-theme/test/page_title_sitename_alias/page.html @@ -5,6 +5,7 @@ Site name +