add canonical link to all pages for which page.canonicalUrl is set

mojavelinux · mojavelinux · commit e774df64926b · 2020-10-02T14:02:24.000-06:00
diff --git a/src/layouts/default.hbs b/src/layouts/default.hbs
@@ -3,9 +3,6 @@
 <head>
 {{> head-first}}
 <title>{{{detag (or page.title 'Untitled')}}}{{#with site.title}} | {{this}}{{/with}}</title>
-{{#with page.canonicalUrl}}
-<link rel="canonical" href="{{this}}">
-{{/with}}
 {{> head-last}}
 </head>
 <body class="article">
diff --git a/src/layouts/home.hbs b/src/layouts/home.hbs
@@ -3,9 +3,6 @@
 <head>
 {{> head-first}}
 <title>Couchbase Documentation</title>
-{{#with page.canonicalUrl}}
-<link rel="canonical" href="{{this}}">
-{{/with}}
 {{> head-last}}
 </head>
 <body class="home">
diff --git a/src/layouts/tutorials.hbs b/src/layouts/tutorials.hbs
@@ -3,9 +3,6 @@
 <head>
 {{> head-first}}
 <title>Tutorials{{#with site.title}} | {{this}}{{/with}}</title>
-{{#with page.canonicalUrl}}
-<link rel="canonical" href="{{this}}">
-{{/with}}
 {{> head-last}}
 </head>
 <body class="tutorials body tiles">
diff --git a/src/partials/head-last.hbs b/src/partials/head-last.hbs
@@ -1,3 +1,6 @@
+{{#with page.canonicalUrl}}
+<link rel="canonical" href="{{this}}">
+{{/with}}
 <link rel="stylesheet" href="{{{uiRootPath}}}/css/site.css">
 <script src="{{{uiRootPath}}}/js/vendor/jquery.js"></script>
 {{#if env.OPTANON_SCRIPT_URL}}
