fixes #104

artistro08 · Oct 11, 2023 · 32ec559 · 32ec559
1 parent e1c03b0
commit 32ec559
Show file tree

Hide file tree

Showing 2 changed files with 44 additions and 16 deletions.
diff --git a/partials/head.htm b/partials/head.htm
@@ -1,6 +1,9 @@
 [global settings]
 handle = "Content\Settings"
+
+[sitePicker]
 ==
+{% set sites = sitePicker.sites %}
 <meta charset="utf-8">
 <meta name="viewport" content="width=device-width, initial-scale=1.0, shrink-to-fit=no">
 <meta name="turbo-visit-control" content="disable" />
@@ -19,6 +22,14 @@
         {% if section.meta_keywords|length %}
             <meta name="keywords" content="{{ section.meta_keywords }}">
         {% endif %}
+        {% if section.canonical_url|length %}
+            <link rel="canonical" href="{{ section.canonical_url }}">
+        {% endif %}
+        {% for site in sites %}
+            {% if this.site.id != site.id %}
+                <link rel="alternate" href="{{ site.url }}" hreflang="{{ site.route_prefix|replace({'/' : ''}) }}">
+            {% endif %}
+        {% endfor %}
 
         {# Robot Info #}
         {% if section.robots|length %}
@@ -48,6 +59,13 @@
         <title>{{ this.page.meta_title ~ ' - ' ~ settings.website_name }}</title>
         <meta name="title" content="{{ this.page.meta_title ~ ' - ' ~ settings.website_name }}">
         <meta name="description" content="{{ this.page.meta_description }}">
+        {% if section.canonical_url|length %}
+            <link rel="canonical" href="{{ section.canonical_url }}">
+        {% endif %}
+
+        {% for site in sites %}
+            <link rel="alternate" href="{{ site }}" hreflang="{{ site.code }}">
+        {% endfor %}
 
 
         {# Open Graph / Facebook #}

diff --git a/seeds/blueprints/content/mixins/builder/general_options/seo_fields.yaml b/seeds/blueprints/content/mixins/builder/general_options/seo_fields.yaml
@@ -76,18 +76,29 @@ fields:
     spanClass: col-12 col-lg-6
     maxItems: 1
     column: false
-  exclude_in_sitemap:
-    label: Remove from Sitemap
-    type: switch
+  canonical_url:
+    label: Canonical URL
     tab: Manage
+    type: text
+    commentAbove: The canonical URL of this page. Used for SEO
     span: row
     spanClass: col-12 col-lg-6
-    cssClass: mt-4
-    comment: Remove this item from the <a target="_blank" href="/sitemap.xml">sitemap.xml</a> file. Useful if you don't want search engines to index this page.
-    commentHtml: true
-    default: unchecked
     column: false
     scope: false
+    validation: url
+  robots:
+    label: Robots Info
+    commentAbove: Use this section to determine what search engine robots should do when they reach your page.
+    tab: Manage
+    type: checkboxlist
+    span: row
+    spanClass: col-12 col-lg-6
+    quickselect: true
+    column: false
+    scope: false
+    options:
+      noindex: [No Index, Disallow search engine robots to index this page.]
+      nofollow: [No Follow, Disallow disallow search engines from crawling the links on this page.]
   meta_description:
     label: Meta Description
     tab: Manage
@@ -97,16 +108,15 @@ fields:
     commentAbove: Meta Description. Used for SEO. Limited to 300 characters.
     attributes:
       maxlength: 300
-  robots:
-    label: Robots Info
-    commentAbove: Use this section to determine what search engine robots should do when they reach your page.
+  exclude_in_sitemap:
+    label: Remove from Sitemap
+    type: switch
     tab: Manage
-    type: checkboxlist
     span: row
     spanClass: col-12 col-lg-6
-    quickselect: true
+    cssClass: mt-4
+    comment: Remove this item from the <a target="_blank" href="/sitemap.xml">sitemap.xml</a> file. Useful if you don't want search engines to index this page.
+    commentHtml: true
+    default: unchecked
     column: false
-    scope: false
-    options:
-      noindex: [No Index, Disallow search engine robots to index this page.]
-      nofollow: [No Follow, Disallow disallow search engines from crawling the links on this page.]
+    scope: false