From: Vladimír Vondruš Date: Sat, 16 Dec 2017 01:37:42 +0000 (+0100) Subject: theme: provide social meta tags for the index/archive page. X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~cjwatson/git?a=commitdiff_plain;h=2e76437f4b111ea96753b6579a2163815f2b7950;p=blog.git theme: provide social meta tags for the index/archive page. --- diff --git a/pelican-theme/templates/archives.html b/pelican-theme/templates/archives.html index 29422b4c..08fe337a 100644 --- a/pelican-theme/templates/archives.html +++ b/pelican-theme/templates/archives.html @@ -11,6 +11,18 @@ {% endif %} {% endblock %} +{% block social %} + {{- super() -}} + {# this has to be here otherwise the spacing is all wrong. fuck. #} + + + {% block social_url %} + + {% endblock %} + + +{% endblock %} + {% block content %}

{% if articles_page %} diff --git a/pelican-theme/templates/index.html b/pelican-theme/templates/index.html index 34d21519..266946b1 100644 --- a/pelican-theme/templates/index.html +++ b/pelican-theme/templates/index.html @@ -1 +1,5 @@ {% extends "archives.html" %} + +{% block social_url %} + +{% endblock %} diff --git a/pelican-theme/test/blog/archives.html b/pelican-theme/test/blog/archives.html new file mode 100644 index 00000000..b98e809e --- /dev/null +++ b/pelican-theme/test/blog/archives.html @@ -0,0 +1,84 @@ + + + + + A Pelican Blog + + + + + + + + + + + +

+ + Dec 09 2017 + + An article +

The summary. + On multiple + lines.

+ +

The content, expanded fully on the page.

+ + +

+ + Dec 08 2017 + + An article â a jumbo one +

A summary. + On multiple + lines.

+ +

+ + diff --git a/pelican-theme/test/blog/index.html b/pelican-theme/test/blog/index.html index b763cbd3..39e32393 100644 --- a/pelican-theme/test/blog/index.html +++ b/pelican-theme/test/blog/index.html @@ -7,6 +7,11 @@ + + + + +

diff --git a/pelican-theme/test/blog_author_list/index.html b/pelican-theme/test/blog_author_list/index.html index 32ad87a2..e2dcecf7 100644 --- a/pelican-theme/test/blog_author_list/index.html +++ b/pelican-theme/test/blog_author_list/index.html @@ -7,6 +7,11 @@ + + + + +

diff --git a/pelican-theme/test/blog_collapse_first_both/index.html b/pelican-theme/test/blog_collapse_first_both/index.html index 2d8a0e55..d005ea13 100644 --- a/pelican-theme/test/blog_collapse_first_both/index.html +++ b/pelican-theme/test/blog_collapse_first_both/index.html @@ -7,6 +7,11 @@ + + + + +

diff --git a/pelican-theme/test/blog_collapse_first_both_hide_summary_both/index.html b/pelican-theme/test/blog_collapse_first_both_hide_summary_both/index.html index 9f8c3c0d..93d015e7 100644 --- a/pelican-theme/test/blog_collapse_first_both_hide_summary_both/index.html +++ b/pelican-theme/test/blog_collapse_first_both_hide_summary_both/index.html @@ -7,6 +7,11 @@ + + + + +

diff --git a/pelican-theme/test/blog_collapse_first_both_hide_summary_global/index.html b/pelican-theme/test/blog_collapse_first_both_hide_summary_global/index.html index 42375798..1a4375cb 100644 --- a/pelican-theme/test/blog_collapse_first_both_hide_summary_global/index.html +++ b/pelican-theme/test/blog_collapse_first_both_hide_summary_global/index.html @@ -7,6 +7,11 @@ + + + + +

diff --git a/pelican-theme/test/blog_collapse_first_global/index.html b/pelican-theme/test/blog_collapse_first_global/index.html index da5e351e..a0ac0d75 100644 --- a/pelican-theme/test/blog_collapse_first_global/index.html +++ b/pelican-theme/test/blog_collapse_first_global/index.html @@ -7,6 +7,11 @@ + + + + +

diff --git a/pelican-theme/test/blog_collapse_first_global_hide_summary_both/index.html b/pelican-theme/test/blog_collapse_first_global_hide_summary_both/index.html index 8ade8d6b..580ea5d9 100644 --- a/pelican-theme/test/blog_collapse_first_global_hide_summary_both/index.html +++ b/pelican-theme/test/blog_collapse_first_global_hide_summary_both/index.html @@ -7,6 +7,11 @@ + + + + +

diff --git a/pelican-theme/test/blog_collapse_first_global_hide_summary_global/index.html b/pelican-theme/test/blog_collapse_first_global_hide_summary_global/index.html index a28302c7..cc38c6bc 100644 --- a/pelican-theme/test/blog_collapse_first_global_hide_summary_global/index.html +++ b/pelican-theme/test/blog_collapse_first_global_hide_summary_global/index.html @@ -7,6 +7,11 @@ + + + + +

diff --git a/pelican-theme/test/blog_footer_links/index.html b/pelican-theme/test/blog_footer_links/index.html index 2598fae0..3111b5cd 100644 --- a/pelican-theme/test/blog_footer_links/index.html +++ b/pelican-theme/test/blog_footer_links/index.html @@ -7,6 +7,11 @@ + + + + +

diff --git a/pelican-theme/test/blog_hide_summary_both/index.html b/pelican-theme/test/blog_hide_summary_both/index.html index fa0b81df..ad6d781b 100644 --- a/pelican-theme/test/blog_hide_summary_both/index.html +++ b/pelican-theme/test/blog_hide_summary_both/index.html @@ -7,6 +7,11 @@ + + + + +

diff --git a/pelican-theme/test/blog_hide_summary_global/index.html b/pelican-theme/test/blog_hide_summary_global/index.html index 87e3477f..5753759b 100644 --- a/pelican-theme/test/blog_hide_summary_global/index.html +++ b/pelican-theme/test/blog_hide_summary_global/index.html @@ -7,6 +7,11 @@ + + + + +

diff --git a/pelican-theme/test/blog_html_escape/archives.html b/pelican-theme/test/blog_html_escape/archives.html new file mode 100644 index 00000000..69fad2a3 --- /dev/null +++ b/pelican-theme/test/blog_html_escape/archives.html @@ -0,0 +1,89 @@ + + + + + <&> in blog name + + + + + + + + + + + + +

+ + Dec 10 2017 + + Article with <&> â a <&> jumbo one +

And <&> in summary.

+ +

And <&> in content.

+ + +

page 1 | older articles »

+ +

+ + + diff --git a/pelican-theme/test/blog_html_escape/archives2.html b/pelican-theme/test/blog_html_escape/archives2.html new file mode 100644 index 00000000..dd653495 --- /dev/null +++ b/pelican-theme/test/blog_html_escape/archives2.html @@ -0,0 +1,86 @@ + + + + + <&> in blog name + + + + + + + + + + + + +

+ + Dec 09 2017 + + Article with <&> in title +

And <&> in summary.

+ +

« newer articles | page 2

+ +

+ + + diff --git a/pelican-theme/test/blog_html_escape/index.html b/pelican-theme/test/blog_html_escape/index.html index c90614af..deee85d1 100644 --- a/pelican-theme/test/blog_html_escape/index.html +++ b/pelican-theme/test/blog_html_escape/index.html @@ -8,6 +8,11 @@ + + + + +

diff --git a/pelican-theme/test/blog_html_escape/index2.html b/pelican-theme/test/blog_html_escape/index2.html index fe020627..1b357750 100644 --- a/pelican-theme/test/blog_html_escape/index2.html +++ b/pelican-theme/test/blog_html_escape/index2.html @@ -8,6 +8,11 @@ + + + + +

diff --git a/pelican-theme/test/blog_minimal/index.html b/pelican-theme/test/blog_minimal/index.html index c4898ca9..7a0cd47f 100644 --- a/pelican-theme/test/blog_minimal/index.html +++ b/pelican-theme/test/blog_minimal/index.html @@ -7,6 +7,11 @@ + + + + +

diff --git a/pelican-theme/test/blog_modified_date/index.html b/pelican-theme/test/blog_modified_date/index.html index 808494a6..a271f66f 100644 --- a/pelican-theme/test/blog_modified_date/index.html +++ b/pelican-theme/test/blog_modified_date/index.html @@ -7,6 +7,11 @@ + + + + +

diff --git a/pelican-theme/test/blog_pagination/index.html b/pelican-theme/test/blog_pagination/index.html index 5282081d..8db4e79b 100644 --- a/pelican-theme/test/blog_pagination/index.html +++ b/pelican-theme/test/blog_pagination/index.html @@ -8,6 +8,11 @@ + + + + +

diff --git a/pelican-theme/test/blog_pagination/index2.html b/pelican-theme/test/blog_pagination/index2.html index ae1941e7..1e790f82 100644 --- a/pelican-theme/test/blog_pagination/index2.html +++ b/pelican-theme/test/blog_pagination/index2.html @@ -9,6 +9,11 @@ + + + + +

diff --git a/pelican-theme/test/blog_pagination/index3.html b/pelican-theme/test/blog_pagination/index3.html index 00a4c679..0aad9257 100644 --- a/pelican-theme/test/blog_pagination/index3.html +++ b/pelican-theme/test/blog_pagination/index3.html @@ -8,6 +8,11 @@ + + + + +

diff --git a/pelican-theme/test/blog_pagination_disabled/index.html b/pelican-theme/test/blog_pagination_disabled/index.html index 8400b73c..9a80bd31 100644 --- a/pelican-theme/test/blog_pagination_disabled/index.html +++ b/pelican-theme/test/blog_pagination_disabled/index.html @@ -7,6 +7,11 @@ + + + + +

diff --git a/pelican-theme/test/layout/index.html b/pelican-theme/test/layout/index.html index 9fbb797c..f1b4fa0a 100644 --- a/pelican-theme/test/layout/index.html +++ b/pelican-theme/test/layout/index.html @@ -7,6 +7,11 @@ + + + + +

diff --git a/pelican-theme/test/layout_disable_blog_links/index.html b/pelican-theme/test/layout_disable_blog_links/index.html index 3ab50ae4..707e4a37 100644 --- a/pelican-theme/test/layout_disable_blog_links/index.html +++ b/pelican-theme/test/layout_disable_blog_links/index.html @@ -7,6 +7,11 @@ + + + + +

diff --git a/pelican-theme/test/layout_disable_fine_print/index.html b/pelican-theme/test/layout_disable_fine_print/index.html index 145015bb..37f36c8e 100644 --- a/pelican-theme/test/layout_disable_fine_print/index.html +++ b/pelican-theme/test/layout_disable_fine_print/index.html @@ -7,6 +7,11 @@ + + + + +

diff --git a/pelican-theme/test/layout_html_escape/index.html b/pelican-theme/test/layout_html_escape/index.html index 1ba0a3be..c274aede 100644 --- a/pelican-theme/test/layout_html_escape/index.html +++ b/pelican-theme/test/layout_html_escape/index.html @@ -7,6 +7,11 @@ + + + + +

diff --git a/pelican-theme/test/layout_minimal/index.html b/pelican-theme/test/layout_minimal/index.html index 4292d425..20e852c3 100644 --- a/pelican-theme/test/layout_minimal/index.html +++ b/pelican-theme/test/layout_minimal/index.html @@ -8,6 +8,11 @@ + + + + +

diff --git a/pelican-theme/test/layout_no_footer/index.html b/pelican-theme/test/layout_no_footer/index.html index d23029f5..0eacc7ee 100644 --- a/pelican-theme/test/layout_no_footer/index.html +++ b/pelican-theme/test/layout_no_footer/index.html @@ -7,6 +7,11 @@ + + + + +

diff --git a/pelican-theme/test/layout_one_column_navbar/index.html b/pelican-theme/test/layout_one_column_navbar/index.html index 8d8bc7aa..ba89d73f 100644 --- a/pelican-theme/test/layout_one_column_navbar/index.html +++ b/pelican-theme/test/layout_one_column_navbar/index.html @@ -7,6 +7,11 @@ + + + + +

diff --git a/pelican-theme/test/test_blog.py b/pelican-theme/test/test_blog.py index b254dbab..e56d6d2b 100644 --- a/pelican-theme/test/test_blog.py +++ b/pelican-theme/test/test_blog.py @@ -36,9 +36,10 @@ class Blog(BlogTestCase): 'FORMATTED_FIELDS': ['summary', 'description'] }) - # The archives and index page should be exactly the same + # The archives and index page should be exactly the same, except for + # og:url that points to the file itself self.assertEqual(*self.actual_expected_contents('index.html')) - self.assertEqual(*self.actual_expected_contents('archives.html', 'index.html')) + self.assertEqual(*self.actual_expected_contents('archives.html')) # Default and jumbo article rendering self.assertEqual(*self.actual_expected_contents('article.html')) @@ -448,7 +449,11 @@ class HtmlEscape(BlogTestCase): # Verify that everything is properly escaped everywhere self.assertEqual(*self.actual_expected_contents('index.html')) self.assertEqual(*self.actual_expected_contents('index2.html')) - self.assertEqual(*self.actual_expected_contents('archives.html', 'index.html')) - self.assertEqual(*self.actual_expected_contents('archives2.html', 'index2.html')) + + # Archives are almost the same as index, except for og:url pointing to + # M_BLOG_URL instead of SITEURL + self.assertEqual(*self.actual_expected_contents('archives.html')) + self.assertEqual(*self.actual_expected_contents('archives2.html')) + self.assertEqual(*self.actual_expected_contents('article.html')) self.assertEqual(*self.actual_expected_contents('article-jumbo.html')) diff --git a/pelican-theme/test/test_layout.py b/pelican-theme/test/test_layout.py index 13818fc8..fdd8e48f 100644 --- a/pelican-theme/test/test_layout.py +++ b/pelican-theme/test/test_layout.py @@ -184,7 +184,6 @@ class HtmlEscape(BaseTestCase): self.run_pelican({ 'SITENAME': 'A <&> site', 'M_BLOG_NAME': 'A <&> blog', - 'M_BLOG_URL': 'archives.html?and&in&url=""', 'M_SITE_LOGO': 'image.png?and&in&url=""', 'M_SITE_LOGO_TEXT': '<&>', 'M_LINKS_NAVBAR1': [