theme: put article/page URLs into <link rel="canonical">.

diff --git a/pelican-theme/templates/article.html b/pelican-theme/templates/article.html
index 7658929966c744edd1216570da1d51e80753ddf9..d5c7f8eb59390b2b381f9e6d8000eb102dca2c9d 100644 (file)
--- 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 %}
+  <link rel="canonical" href="{{ article.url|format_siteurl|e }}" />
+{% endblock %}
+
 {% block head %}
   {{- super() -}}
   {% if article.description %}

diff --git a/pelican-theme/templates/page.html b/pelican-theme/templates/page.html
index 33a5a0460d79286d0654aca28749466a45b18b90..61f1670c6e51ae3921d80c01df0eefd9190a6592 100644 (file)
--- 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 %}
   <link rel="stylesheet" href="{{ style|expand_link(page)|e }}" />
   {% endfor %}
   {% endif %}
+  <link rel="canonical" href="{{ page.url|format_siteurl|e }}" />
 {% endblock %}
 
 {% block head %}

diff --git a/pelican-theme/test/blog/article-jumbo.html b/pelican-theme/test/blog/article-jumbo.html
index 4043405ee0a6e6cf1ab7e510c4f14147318d5a7b..52415666d0037611e79f3fb8d1bd078104fa0d91 100644 (file)
--- a/pelican-theme/test/blog/article-jumbo.html
+++ b/pelican-theme/test/blog/article-jumbo.html
@@ -5,6 +5,7 @@
   <title>An article — a jumbo one | A Pelican Blog</title>
   <link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Source+Code+Pro:400,400i,600%7CSource+Sans+Pro:400,400i,600,600i" />
   <link rel="stylesheet" href="static/m-dark.css" />
+  <link rel="canonical" href="article-jumbo.html" />
   <meta name="viewport" content="width=device-width, initial-scale=1.0" />
   <meta property="og:title" content="An article — a jumbo one" />
   <meta name="twitter:title" content="An article — a jumbo one" />

diff --git a/pelican-theme/test/blog/article.html b/pelican-theme/test/blog/article.html
index f41ea2e3931baa7fb562ad6c22feae0cc3199652..34a66f477c41bd5cccbf2ef784c7d2e0d448b55f 100644 (file)
--- a/pelican-theme/test/blog/article.html
+++ b/pelican-theme/test/blog/article.html
@@ -5,6 +5,7 @@
   <title>An article | A Pelican Blog</title>
   <link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Source+Code+Pro:400,400i,600%7CSource+Sans+Pro:400,400i,600,600i" />
   <link rel="stylesheet" href="static/m-dark.css" />
+  <link rel="canonical" href="article.html" />
   <meta name="viewport" content="width=device-width, initial-scale=1.0" />
   <meta name="description" content="Article description for the fake SEO believers." />
   <meta property="og:title" content="An article" />

diff --git a/pelican-theme/test/blog_author_list/article-jumbo.html b/pelican-theme/test/blog_author_list/article-jumbo.html
index 4d433b169030803a6a9336fe71d054006be910c5..7b6da4eb9255de9fb436936ffdf708d5f1e4b45c 100644 (file)
--- a/pelican-theme/test/blog_author_list/article-jumbo.html
+++ b/pelican-theme/test/blog_author_list/article-jumbo.html
@@ -5,6 +5,7 @@
   <title>A jumbo article | A Pelican Blog</title>
   <link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Source+Code+Pro:400,400i,600%7CSource+Sans+Pro:400,400i,600,600i" />
   <link rel="stylesheet" href="static/m-dark.css" />
+  <link rel="canonical" href="article-jumbo.html" />
   <meta name="viewport" content="width=device-width, initial-scale=1.0" />
   <meta property="og:title" content="A jumbo article" />
   <meta name="twitter:title" content="A jumbo article" />

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 335fdbec9c64604bb3f30343e64882f9e43029b2..25f0fbcf4ddcb0eccbd1a5ab272920032f4097e1 100644 (file)
--- 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 @@
   <title>A jumbo article | A Pelican Blog</title>
   <link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Source+Code+Pro:400,400i,600%7CSource+Sans+Pro:400,400i,600,600i" />
   <link rel="stylesheet" href="static/m-dark.css" />
+  <link rel="canonical" href="article-jumbo.html" />
   <meta name="viewport" content="width=device-width, initial-scale=1.0" />
   <meta property="og:title" content="A jumbo article" />
   <meta name="twitter:title" content="A jumbo article" />

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 857562df6ee16f33b90bdee93041cd0e89921671..ba2d51ef51cfd4a61961f6082f8d7dd4a88c10c0 100644 (file)
--- 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 @@
   <title>An article | A Pelican Blog</title>
   <link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Source+Code+Pro:400,400i,600%7CSource+Sans+Pro:400,400i,600,600i" />
   <link rel="stylesheet" href="static/m-dark.css" />
+  <link rel="canonical" href="article.html" />
   <meta name="viewport" content="width=device-width, initial-scale=1.0" />
   <meta property="og:title" content="An article" />
   <meta name="twitter:title" content="An article" />

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 d44febc8069e8a4dc211ef8932b84e5bdf4769e9..91bb4fe3dc99bfa08f2448f83ff74e596020b213 100644 (file)
--- 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 @@
   <title>A jumbo article | A Pelican Blog</title>
   <link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Source+Code+Pro:400,400i,600%7CSource+Sans+Pro:400,400i,600,600i" />
   <link rel="stylesheet" href="static/m-dark.css" />
+  <link rel="canonical" href="article-jumbo.html" />
   <meta name="viewport" content="width=device-width, initial-scale=1.0" />
   <meta property="og:title" content="A jumbo article" />
   <meta name="twitter:title" content="A jumbo article" />

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 18c2dd3e978d78d11b846189499393a91b4ca7ee..506d23e9f1b537884b3236b404e8ceaaf0acfb9c 100644 (file)
--- 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 @@
   <title>An article | A Pelican Blog</title>
   <link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Source+Code+Pro:400,400i,600%7CSource+Sans+Pro:400,400i,600,600i" />
   <link rel="stylesheet" href="static/m-dark.css" />
+  <link rel="canonical" href="article.html" />
   <meta name="viewport" content="width=device-width, initial-scale=1.0" />
   <meta property="og:title" content="An article" />
   <meta name="twitter:title" content="An article" />

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 0dbb90c17f4e1bd165048599a21b0a27bf414a0e..e756cc357d09a7f448e89bce6ccac4ea276176cd 100644 (file)
--- 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 @@
   <title>A jumbo article | A Pelican Blog</title>
   <link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Source+Code+Pro:400,400i,600%7CSource+Sans+Pro:400,400i,600,600i" />
   <link rel="stylesheet" href="static/m-dark.css" />
+  <link rel="canonical" href="article-jumbo.html" />
   <meta name="viewport" content="width=device-width, initial-scale=1.0" />
   <meta property="og:title" content="A jumbo article" />
   <meta name="twitter:title" content="A jumbo article" />

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 e4289e6d9c96c14cfce642faa5f812b0aeecf298..62da93e32eaf3726f96233d2fa3d5173a55e06ab 100644 (file)
--- 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 @@
   <title>An article | A Pelican Blog</title>
   <link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Source+Code+Pro:400,400i,600%7CSource+Sans+Pro:400,400i,600,600i" />
   <link rel="stylesheet" href="static/m-dark.css" />
+  <link rel="canonical" href="article.html" />
   <meta name="viewport" content="width=device-width, initial-scale=1.0" />
   <meta property="og:title" content="An article" />
   <meta name="twitter:title" content="An article" />

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 d44febc8069e8a4dc211ef8932b84e5bdf4769e9..91bb4fe3dc99bfa08f2448f83ff74e596020b213 100644 (file)
--- 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 @@
   <title>A jumbo article | A Pelican Blog</title>
   <link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Source+Code+Pro:400,400i,600%7CSource+Sans+Pro:400,400i,600,600i" />
   <link rel="stylesheet" href="static/m-dark.css" />
+  <link rel="canonical" href="article-jumbo.html" />
   <meta name="viewport" content="width=device-width, initial-scale=1.0" />
   <meta property="og:title" content="A jumbo article" />
   <meta name="twitter:title" content="A jumbo article" />

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 8bf43dc047f92350d5627108a07dc553d2a0715f..6622d62de66dbcaf1b85ea71f3ce04a728ad091e 100644 (file)
--- 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 @@
   <title>An article | A Pelican Blog</title>
   <link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Source+Code+Pro:400,400i,600%7CSource+Sans+Pro:400,400i,600,600i" />
   <link rel="stylesheet" href="static/m-dark.css" />
+  <link rel="canonical" href="article.html" />
   <meta name="viewport" content="width=device-width, initial-scale=1.0" />
   <meta property="og:title" content="An article" />
   <meta name="twitter:title" content="An article" />

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 fd9b65b3a51cc3feaf228e896a3f133782a00fe0..5d550a402b3a24f68b56569fc2579b5973dfd912 100644 (file)
--- 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 @@
   <title>A jumbo article | A Pelican Blog</title>
   <link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Source+Code+Pro:400,400i,600%7CSource+Sans+Pro:400,400i,600,600i" />
   <link rel="stylesheet" href="static/m-dark.css" />
+  <link rel="canonical" href="article-jumbo.html" />
   <meta name="viewport" content="width=device-width, initial-scale=1.0" />
   <meta property="og:title" content="A jumbo article" />
   <meta name="twitter:title" content="A jumbo article" />

diff --git a/pelican-theme/test/blog_hide_summary_both/article.html b/pelican-theme/test/blog_hide_summary_both/article.html
index 84711eed9e99ac79552427794a04870769616a72..d0f5dddb71a1c3a06883302af40f7e28e7a2d845 100644 (file)
--- a/pelican-theme/test/blog_hide_summary_both/article.html
+++ b/pelican-theme/test/blog_hide_summary_both/article.html
@@ -5,6 +5,7 @@
   <title>An article | A Pelican Blog</title>
   <link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Source+Code+Pro:400,400i,600%7CSource+Sans+Pro:400,400i,600,600i" />
   <link rel="stylesheet" href="static/m-dark.css" />
+  <link rel="canonical" href="article.html" />
   <meta name="viewport" content="width=device-width, initial-scale=1.0" />
   <meta property="og:title" content="An article" />
   <meta name="twitter:title" content="An article" />

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 bb4a99704dfa784c0e197cae41f46577576fc227..03c1bd8ec82be8d98c6723c8ac592389254b8af1 100644 (file)
--- 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 @@
   <title>A jumbo article | A Pelican Blog</title>
   <link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Source+Code+Pro:400,400i,600%7CSource+Sans+Pro:400,400i,600,600i" />
   <link rel="stylesheet" href="static/m-dark.css" />
+  <link rel="canonical" href="article-jumbo.html" />
   <meta name="viewport" content="width=device-width, initial-scale=1.0" />
   <meta property="og:title" content="A jumbo article" />
   <meta name="twitter:title" content="A jumbo article" />

diff --git a/pelican-theme/test/blog_hide_summary_global/article.html b/pelican-theme/test/blog_hide_summary_global/article.html
index 668d5c7c8282b00dfb95e0d23fe9804e4b184255..eaebbfb80ab1388a604cd414254ca8182de23d08 100644 (file)
--- a/pelican-theme/test/blog_hide_summary_global/article.html
+++ b/pelican-theme/test/blog_hide_summary_global/article.html
@@ -5,6 +5,7 @@
   <title>An article | A Pelican Blog</title>
   <link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Source+Code+Pro:400,400i,600%7CSource+Sans+Pro:400,400i,600,600i" />
   <link rel="stylesheet" href="static/m-dark.css" />
+  <link rel="canonical" href="article.html" />
   <meta name="viewport" content="width=device-width, initial-scale=1.0" />
   <meta property="og:title" content="An article" />
   <meta name="twitter:title" content="An article" />

diff --git a/pelican-theme/test/blog_html_escape/article-jumbo.html b/pelican-theme/test/blog_html_escape/article-jumbo.html
index df9f0aa0229af0a6c157a206586a8a5bec85b40e..f7bf746a95252f20626cabf36b27169cff341249 100644 (file)
--- a/pelican-theme/test/blog_html_escape/article-jumbo.html
+++ b/pelican-theme/test/blog_html_escape/article-jumbo.html
@@ -5,6 +5,7 @@
   <title>Article with &lt;&amp;&gt; — a &lt;&amp;&gt; jumbo one | &lt;&amp;&gt; in blog name</title>
   <link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Source+Code+Pro:400,400i,600%7CSource+Sans+Pro:400,400i,600,600i" />
   <link rel="stylesheet" href="static/m-dark.css" />
+  <link rel="canonical" href="article-jumbo.html?and&amp;in&amp;url=&#34;&#34;" />
   <meta name="viewport" content="width=device-width, initial-scale=1.0" />
   <meta name="description" content="And &lt;&amp;&gt; in description." />
   <meta property="og:title" content="Article with &lt;&amp;&gt; — a &lt;&amp;&gt; jumbo one" />

diff --git a/pelican-theme/test/blog_html_escape/article.html b/pelican-theme/test/blog_html_escape/article.html
index 0ce1c8908be1d7f97fe9b5072eebe45e26c11584..295362bd89e98b3886ed662ccde7afbd4b4d2bdb 100644 (file)
--- a/pelican-theme/test/blog_html_escape/article.html
+++ b/pelican-theme/test/blog_html_escape/article.html
@@ -5,6 +5,7 @@
   <title>Article with &lt;&amp;&gt; in title | &lt;&amp;&gt; in blog name</title>
   <link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Source+Code+Pro:400,400i,600%7CSource+Sans+Pro:400,400i,600,600i" />
   <link rel="stylesheet" href="static/m-dark.css" />
+  <link rel="canonical" href="article.html?and&amp;in&amp;url=&#34;&#34;" />
   <meta name="viewport" content="width=device-width, initial-scale=1.0" />
   <meta name="description" content="And &lt;&amp;&gt; in description." />
   <meta property="og:title" content="Article with &lt;&amp;&gt; in title" />

diff --git a/pelican-theme/test/blog_jumbo_inverted/article-jumbo.html b/pelican-theme/test/blog_jumbo_inverted/article-jumbo.html
index 2fb619ab6243dfbee4f829cb7a05f009387f9d39..408c54468bd1f16934d3d440d9cf892d568de4ae 100644 (file)
--- a/pelican-theme/test/blog_jumbo_inverted/article-jumbo.html
+++ b/pelican-theme/test/blog_jumbo_inverted/article-jumbo.html
@@ -5,6 +5,7 @@
   <title>A jumbo article | A Pelican Blog</title>
   <link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Source+Code+Pro:400,400i,600%7CSource+Sans+Pro:400,400i,600,600i" />
   <link rel="stylesheet" href="static/m-dark.css" />
+  <link rel="canonical" href="article-jumbo.html" />
   <meta name="viewport" content="width=device-width, initial-scale=1.0" />
   <meta property="og:title" content="A jumbo article" />
   <meta name="twitter:title" content="A jumbo article" />

diff --git a/pelican-theme/test/blog_minimal/article-jumbo.html b/pelican-theme/test/blog_minimal/article-jumbo.html
index 42c08071971b8475949a95180f467d7228459039..1e16ec70768a31a865fd23866aeeb8f5b1cb9edc 100644 (file)
--- a/pelican-theme/test/blog_minimal/article-jumbo.html
+++ b/pelican-theme/test/blog_minimal/article-jumbo.html
@@ -5,6 +5,7 @@
   <title>A jumbo article | A Pelican Blog</title>
   <link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Source+Code+Pro:400,400i,600%7CSource+Sans+Pro:400,400i,600,600i" />
   <link rel="stylesheet" href="static/m-dark.css" />
+  <link rel="canonical" href="article-jumbo.html" />
   <meta name="viewport" content="width=device-width, initial-scale=1.0" />
   <meta property="og:title" content="A jumbo article" />
   <meta name="twitter:title" content="A jumbo article" />

diff --git a/pelican-theme/test/blog_minimal/article.html b/pelican-theme/test/blog_minimal/article.html
index 9f8cabc5cee7728f2f97924b79f3f2f385d2d521..a436127f452a92a633ef2964e6d4d8a1259a8ad9 100644 (file)
--- a/pelican-theme/test/blog_minimal/article.html
+++ b/pelican-theme/test/blog_minimal/article.html
@@ -5,6 +5,7 @@
   <title>An article | A Pelican Blog</title>
   <link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Source+Code+Pro:400,400i,600%7CSource+Sans+Pro:400,400i,600,600i" />
   <link rel="stylesheet" href="static/m-dark.css" />
+  <link rel="canonical" href="article.html" />
   <meta name="viewport" content="width=device-width, initial-scale=1.0" />
   <meta property="og:title" content="An article" />
   <meta name="twitter:title" content="An article" />

diff --git a/pelican-theme/test/layout/features.html b/pelican-theme/test/layout/features.html
index eff9f85cce20300591b0b7ed47c5783db193ca2e..a3564c902995fa2374fb1b9c080504e7af9c597b 100644 (file)
--- a/pelican-theme/test/layout/features.html
+++ b/pelican-theme/test/layout/features.html
@@ -5,6 +5,7 @@
   <title>Features | Your Brand</title>
   <link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Source+Code+Pro:400,400i,600%7CSource+Sans+Pro:400,400i,600,600i" />
   <link rel="stylesheet" href="static/m-dark.css" />
+  <link rel="canonical" href="features.html" />
   <meta name="viewport" content="width=device-width, initial-scale=1.0" />
   <meta property="og:title" content="Features" />
   <meta name="twitter:title" content="Features" />

diff --git a/pelican-theme/test/layout/guest-post-howto.html b/pelican-theme/test/layout/guest-post-howto.html
index b48202d39a5e17dbf18b0775c4a57d5e40a53b14..d2f5145d2a00c8e26d915fde2520e9bb64b87788 100644 (file)
--- a/pelican-theme/test/layout/guest-post-howto.html
+++ b/pelican-theme/test/layout/guest-post-howto.html
@@ -5,6 +5,7 @@
   <title>Guest post howto | Your Brand</title>
   <link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Source+Code+Pro:400,400i,600%7CSource+Sans+Pro:400,400i,600,600i" />
   <link rel="stylesheet" href="static/m-dark.css" />
+  <link rel="canonical" href="guest-post-howto.html" />
   <meta name="viewport" content="width=device-width, initial-scale=1.0" />
   <meta property="og:title" content="Guest post howto" />
   <meta name="twitter:title" content="Guest post howto" />

diff --git a/pelican-theme/test/layout/showcase-requirements.html b/pelican-theme/test/layout/showcase-requirements.html
index b4a8496adee554d4e7287ebf6f9922674da2a2c2..b409cc04bf1d65880290aacd9e849ac239e34e43 100644 (file)
--- a/pelican-theme/test/layout/showcase-requirements.html
+++ b/pelican-theme/test/layout/showcase-requirements.html
@@ -5,6 +5,7 @@
   <title>Showcase requirements | Your Brand</title>
   <link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Source+Code+Pro:400,400i,600%7CSource+Sans+Pro:400,400i,600,600i" />
   <link rel="stylesheet" href="static/m-dark.css" />
+  <link rel="canonical" href="showcase-requirements.html" />
   <meta name="viewport" content="width=device-width, initial-scale=1.0" />
   <meta property="og:title" content="Showcase requirements" />
   <meta name="twitter:title" content="Showcase requirements" />

diff --git a/pelican-theme/test/page/page.html b/pelican-theme/test/page/page.html
index e7e4db772bcd67f95a4e6a1037d26d63003a133a..0339348b0a9f1560731e4dc548be58a9c4770e0e 100644 (file)
--- a/pelican-theme/test/page/page.html
+++ b/pelican-theme/test/page/page.html
@@ -5,6 +5,7 @@
   <title>A page | A Pelican Blog</title>
   <link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Source+Code+Pro:400,400i,600%7CSource+Sans+Pro:400,400i,600,600i" />
   <link rel="stylesheet" href="static/m-dark.css" />
+  <link rel="canonical" href="page.html" />
   <meta name="viewport" content="width=device-width, initial-scale=1.0" />
   <meta name="description" content="Page description for the fake SEO believers." />
   <meta property="og:title" content="A page" />

diff --git a/pelican-theme/test/page_breadcrumb/page.html b/pelican-theme/test/page_breadcrumb/page.html
index f2162458e91abdfaa008558d6e26dcee1f0f7dbb..70d0ef9aace9443abd26d37088fe1867974f02c7 100644 (file)
--- a/pelican-theme/test/page_breadcrumb/page.html
+++ b/pelican-theme/test/page_breadcrumb/page.html
@@ -5,6 +5,7 @@
   <title>Index page &raquo; A page | A Pelican Blog</title>
   <link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Source+Code+Pro:400,400i,600%7CSource+Sans+Pro:400,400i,600,600i" />
   <link rel="stylesheet" href="static/m-dark.css" />
+  <link rel="canonical" href="page.html" />
   <meta name="viewport" content="width=device-width, initial-scale=1.0" />
   <meta property="og:title" content="A page" />
   <meta name="twitter:title" content="A page" />

diff --git a/pelican-theme/test/page_breadcrumb/subpage.html b/pelican-theme/test/page_breadcrumb/subpage.html
index b647e55f241cae9478e13289cf327ec28e3aef40..fa292dc93f570817514398f09a5f0fd5eec0f976 100644 (file)
--- a/pelican-theme/test/page_breadcrumb/subpage.html
+++ b/pelican-theme/test/page_breadcrumb/subpage.html
@@ -5,6 +5,7 @@
   <title>Index page &raquo; A page &raquo; Subpage | A Pelican Blog</title>
   <link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Source+Code+Pro:400,400i,600%7CSource+Sans+Pro:400,400i,600,600i" />
   <link rel="stylesheet" href="static/m-dark.css" />
+  <link rel="canonical" href="subpage.html" />
   <meta name="viewport" content="width=device-width, initial-scale=1.0" />
   <meta property="og:title" content="Subpage" />
   <meta name="twitter:title" content="Subpage" />

diff --git a/pelican-theme/test/page_extra_css/page.html b/pelican-theme/test/page_extra_css/page.html
index 398e05f555f569d3111197fe3944ba8417885808..1f7fec8f1fd1131db4621ed35933af3b9fc51999 100644 (file)
--- a/pelican-theme/test/page_extra_css/page.html
+++ b/pelican-theme/test/page_extra_css/page.html
@@ -7,6 +7,7 @@
   <link rel="stylesheet" href="static/m-dark.css" />
   <link rel="stylesheet" href="static/m-debug.css" />
   <link rel="stylesheet" href="static/m-grid.css" />
+  <link rel="canonical" href="page.html" />
   <meta name="viewport" content="width=device-width, initial-scale=1.0" />
   <meta property="og:title" content="A page" />
   <meta name="twitter:title" content="A page" />

diff --git a/pelican-theme/test/page_header_footer/page.html b/pelican-theme/test/page_header_footer/page.html
index 2d660f62127384587a69d362361eb4ce23433866..0d72816e578164a9259ff7ff870f83e67f9c3b00 100644 (file)
--- a/pelican-theme/test/page_header_footer/page.html
+++ b/pelican-theme/test/page_header_footer/page.html
@@ -5,6 +5,7 @@
   <title>A page | A Pelican Blog</title>
   <link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Source+Code+Pro:400,400i,600%7CSource+Sans+Pro:400,400i,600,600i" />
   <link rel="stylesheet" href="static/m-dark.css" />
+  <link rel="canonical" href="page.html" />
   <meta name="viewport" content="width=device-width, initial-scale=1.0" />
   <meta property="og:title" content="A page" />
   <meta name="twitter:title" content="A page" />

diff --git a/pelican-theme/test/page_html_escape/breadcrumb.html b/pelican-theme/test/page_html_escape/breadcrumb.html
index 4c8a9ace8986affc3cd81f0a88ab2509c4b3e23e..63e8cbe23e2f01d0109e20e58e1326c2630a1917 100644 (file)
--- a/pelican-theme/test/page_html_escape/breadcrumb.html
+++ b/pelican-theme/test/page_html_escape/breadcrumb.html
@@ -5,6 +5,7 @@
   <title>And &lt;&amp;&gt; in breadcrumb &raquo; Page with &lt;&amp;&gt; in title | &lt;&amp;&gt; in site name</title>
   <link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Source+Code+Pro:400,400i,600%7CSource+Sans+Pro:400,400i,600,600i" />
   <link rel="stylesheet" href="static/m-dark.css" />
+  <link rel="canonical" href="breadcrumb.html?and&amp;in&amp;url=&#34;&#34;" />
   <meta name="viewport" content="width=device-width, initial-scale=1.0" />
   <meta property="og:title" content="Page with &lt;&amp;&gt; in title" />
   <meta name="twitter:title" content="Page with &lt;&amp;&gt; in title" />

diff --git a/pelican-theme/test/page_html_escape/content.html b/pelican-theme/test/page_html_escape/content.html
index 0c696d9460249c92b9d564f1b4ff6cac57600fbe..f2076c079f370724c4216e89101476801f05d76e 100644 (file)
--- a/pelican-theme/test/page_html_escape/content.html
+++ b/pelican-theme/test/page_html_escape/content.html
@@ -5,6 +5,7 @@
   <title>Escaping in content | &lt;&amp;&gt; in site name</title>
   <link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Source+Code+Pro:400,400i,600%7CSource+Sans+Pro:400,400i,600,600i" />
   <link rel="stylesheet" href="static/m-dark.css" />
+  <link rel="canonical" href="content.html?and&amp;in&amp;url=&#34;&#34;" />
   <meta name="viewport" content="width=device-width, initial-scale=1.0" />
   <meta property="og:title" content="Escaping in content" />
   <meta name="twitter:title" content="Escaping in content" />

diff --git a/pelican-theme/test/page_html_escape/landing.html b/pelican-theme/test/page_html_escape/landing.html
index b8732833a4021cd39e68b477063822a576624b86..bfe5f80efc1f4b5f70f6bd793627a92b90fe54f1 100644 (file)
--- a/pelican-theme/test/page_html_escape/landing.html
+++ b/pelican-theme/test/page_html_escape/landing.html
@@ -5,6 +5,7 @@
   <title>&lt;&amp;&gt; in site name</title>
   <link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Source+Code+Pro:400,400i,600%7CSource+Sans+Pro:400,400i,600,600i" />
   <link rel="stylesheet" href="static/m-dark.css" />
+  <link rel="canonical" href="landing.html?and&amp;in&amp;url=&#34;&#34;" />
   <meta name="viewport" content="width=device-width, initial-scale=1.0" />
   <meta property="og:title" content="&lt;&amp;&gt; in site name" />
   <meta name="twitter:title" content="&lt;&amp;&gt; in site name" />

diff --git a/pelican-theme/test/page_html_escape/page.html b/pelican-theme/test/page_html_escape/page.html
index 40d3b844a8f658480e63c87419e2546a59ac7f6a..eb507ea5d3ef8891cd4c1ed913024bb05a8b383b 100644 (file)
--- a/pelican-theme/test/page_html_escape/page.html
+++ b/pelican-theme/test/page_html_escape/page.html
@@ -5,6 +5,7 @@
   <title>Page with &lt;&amp;&gt; in title | &lt;&amp;&gt; in site name</title>
   <link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Source+Code+Pro:400,400i,600%7CSource+Sans+Pro:400,400i,600,600i" />
   <link rel="stylesheet" href="static/m-dark.css" />
+  <link rel="canonical" href="page.html?and&amp;overriden&amp;url=&#34;&#34;" />
   <meta name="viewport" content="width=device-width, initial-scale=1.0" />
   <meta name="description" content="And &lt;&amp;&gt; in description." />
   <meta property="og:title" content="Page with &lt;&amp;&gt; in title" />

diff --git a/pelican-theme/test/page_landing/hide-navbar-brand.html b/pelican-theme/test/page_landing/hide-navbar-brand.html
index ff187502fb8c5a02da7a6ad963bad856f71d713e..de4a4cf8a207bb4296215c2714ee1f34a851248f 100644 (file)
--- a/pelican-theme/test/page_landing/hide-navbar-brand.html
+++ b/pelican-theme/test/page_landing/hide-navbar-brand.html
@@ -5,6 +5,7 @@
   <title>A page | A Pelican Blog</title>
   <link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Source+Code+Pro:400,400i,600%7CSource+Sans+Pro:400,400i,600,600i" />
   <link rel="stylesheet" href="static/m-dark.css" />
+  <link rel="canonical" href="hide-navbar-brand.html" />
   <meta name="viewport" content="width=device-width, initial-scale=1.0" />
   <meta property="og:title" content="A page" />
   <meta name="twitter:title" content="A page" />

diff --git a/pelican-theme/test/page_landing/page.html b/pelican-theme/test/page_landing/page.html
index b31f961af6f6136d7bf9f19cb6511577b3e5f43a..a6ef08d03b5446d3eac53e56098058e216d0dc48 100644 (file)
--- a/pelican-theme/test/page_landing/page.html
+++ b/pelican-theme/test/page_landing/page.html
@@ -5,6 +5,7 @@
   <title>A page title that displays only in title | A Pelican Blog</title>
   <link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Source+Code+Pro:400,400i,600%7CSource+Sans+Pro:400,400i,600,600i" />
   <link rel="stylesheet" href="static/m-dark.css" />
+  <link rel="canonical" href="page.html" />
   <meta name="viewport" content="width=device-width, initial-scale=1.0" />
   <meta property="og:title" content="A page title that displays only in title" />
   <meta name="twitter:title" content="A page title that displays only in title" />

diff --git a/pelican-theme/test/page_minimal/page.html b/pelican-theme/test/page_minimal/page.html
index d0259ec9403fc738cfc0775b2dba4705a85fce38..b8d75ff756a2c529a2ee738b3f53f7b436ee97b8 100644 (file)
--- a/pelican-theme/test/page_minimal/page.html
+++ b/pelican-theme/test/page_minimal/page.html
@@ -5,6 +5,7 @@
   <title>A page | A Pelican Blog</title>
   <link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Source+Code+Pro:400,400i,600%7CSource+Sans+Pro:400,400i,600,600i" />
   <link rel="stylesheet" href="static/m-dark.css" />
+  <link rel="canonical" href="page.html" />
   <meta name="viewport" content="width=device-width, initial-scale=1.0" />
   <meta property="og:title" content="A page" />
   <meta name="twitter:title" content="A page" />

diff --git a/pelican-theme/test/page_title_sitename_alias/page.html b/pelican-theme/test/page_title_sitename_alias/page.html
index d480d74a5b29cdc0a1873e4265b69b7c5144bb3f..945d4d37794ff854b148cc8fe0badc671d1d28b6 100644 (file)
--- a/pelican-theme/test/page_title_sitename_alias/page.html
+++ b/pelican-theme/test/page_title_sitename_alias/page.html
@@ -5,6 +5,7 @@
   <title>Site name</title>
   <link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Source+Code+Pro:400,400i,600%7CSource+Sans+Pro:400,400i,600,600i" />
   <link rel="stylesheet" href="static/m-dark.css" />
+  <link rel="canonical" href="page.html" />
   <meta name="viewport" content="width=device-width, initial-scale=1.0" />
   <meta property="og:title" content="Site name" />
   <meta name="twitter:title" content="Site name" />