From b43554a15b70793627785d44a774c12f3afc1df7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Paul=20Nicou=C3=A9?= Date: Fri, 19 Nov 2021 17:14:11 +0100 Subject: [PATCH] Edit blueprints, fake content and hooks --- content/1_galerie-1/gallery.txt | 4 ++ content/_drafts/galerie-2/gallery.txt | 4 ++ content/_drafts/galerie-3/gallery.txt | 18 +++++--- content/_drafts/galerie-4/gallery.txt | 45 ------------------- content/_drafts/galerie-5/gallery.txt | 45 ------------------- content/accueil/home.txt | 14 +++--- content/biographie/biography.txt | 8 +++- content/site.txt | 18 ++++++-- ...asic_meta.yml => generic_seo_metadata.yml} | 28 ++++++++++++ site/blueprints/tabs/biography_seo.yml | 2 +- site/blueprints/tabs/gallery_seo.yml | 2 +- site/blueprints/tabs/home_seo.yml | 2 +- site/config/config.php | 9 ++-- site/templates/default.php | 5 +++ 14 files changed, 91 insertions(+), 113 deletions(-) delete mode 100644 content/_drafts/galerie-4/gallery.txt delete mode 100644 content/_drafts/galerie-5/gallery.txt rename site/blueprints/sections/{generic_seo_basic_meta.yml => generic_seo_metadata.yml} (59%) diff --git a/content/1_galerie-1/gallery.txt b/content/1_galerie-1/gallery.txt index d0746e4..4cde5f0 100644 --- a/content/1_galerie-1/gallery.txt +++ b/content/1_galerie-1/gallery.txt @@ -26,6 +26,10 @@ Twitter-image: ---- +Twitter-card-type: summary_large_image + +---- + Robots-noindex: default ---- diff --git a/content/_drafts/galerie-2/gallery.txt b/content/_drafts/galerie-2/gallery.txt index 734d652..aa1946b 100644 --- a/content/_drafts/galerie-2/gallery.txt +++ b/content/_drafts/galerie-2/gallery.txt @@ -26,6 +26,10 @@ Twitter-image: ---- +Twitter-card-type: summary_large_image + +---- + Robots-noindex: default ---- diff --git a/content/_drafts/galerie-3/gallery.txt b/content/_drafts/galerie-3/gallery.txt index 9f0cced..efc8661 100644 --- a/content/_drafts/galerie-3/gallery.txt +++ b/content/_drafts/galerie-3/gallery.txt @@ -1,20 +1,20 @@ -Title: Galerie 3 +Title: Galerie-3 ---- -Text: +Text: ---- -Meta-description: +Meta-description: ---- -Meta-image: +Meta-image: ---- -Og-image: +Og-image: ---- @@ -22,7 +22,11 @@ Og-type: article ---- -Twitter-image: +Twitter-image: + +---- + +Twitter-card-type: summary_large_image ---- @@ -42,4 +46,4 @@ Robots-noimageindex: default ---- -Robots-nosnippet: default +Robots-nosnippet: default \ No newline at end of file diff --git a/content/_drafts/galerie-4/gallery.txt b/content/_drafts/galerie-4/gallery.txt deleted file mode 100644 index 03ec884..0000000 --- a/content/_drafts/galerie-4/gallery.txt +++ /dev/null @@ -1,45 +0,0 @@ -Title: Galerie 4 - ----- - -Text: - ----- - -Meta-description: - ----- - -Meta-image: - ----- - -Og-image: - ----- - -Og-type: article - ----- - -Twitter-image: - ----- - -Robots-noindex: default - ----- - -Robots-nofollow: default - ----- - -Robots-noarchive: default - ----- - -Robots-noimageindex: default - ----- - -Robots-nosnippet: default diff --git a/content/_drafts/galerie-5/gallery.txt b/content/_drafts/galerie-5/gallery.txt deleted file mode 100644 index 8f9d229..0000000 --- a/content/_drafts/galerie-5/gallery.txt +++ /dev/null @@ -1,45 +0,0 @@ -Title: Galerie 5 - ----- - -Text: - ----- - -Meta-description: - ----- - -Meta-image: - ----- - -Og-image: - ----- - -Og-type: article - ----- - -Twitter-image: - ----- - -Robots-noindex: default - ----- - -Robots-nofollow: default - ----- - -Robots-noarchive: default - ----- - -Robots-noimageindex: default - ----- - -Robots-nosnippet: default diff --git a/content/accueil/home.txt b/content/accueil/home.txt index 48cc8e2..1a2f34d 100644 --- a/content/accueil/home.txt +++ b/content/accueil/home.txt @@ -2,15 +2,15 @@ Title: Accueil ---- -Meta-description: +Meta-description: ---- -Meta-image: +Meta-image: ---- -Og-image: +Og-image: ---- @@ -18,7 +18,11 @@ Og-type: website ---- -Twitter-image: +Twitter-image: + +---- + +Twitter-card-type: summary_large_image ---- @@ -38,4 +42,4 @@ Robots-noimageindex: default ---- -Robots-nosnippet: default \ No newline at end of file +Robots-nosnippet: default diff --git a/content/biographie/biography.txt b/content/biographie/biography.txt index 13b1ae4..1a9f584 100644 --- a/content/biographie/biography.txt +++ b/content/biographie/biography.txt @@ -22,11 +22,15 @@ Og-image: ---- -Og-type: website +Og-type: profile ---- -Twitter-image: +Twitter-image: + +---- + +Twitter-card-type: summary_large_image ---- diff --git a/content/site.txt b/content/site.txt index 259e103..8213450 100644 --- a/content/site.txt +++ b/content/site.txt @@ -2,7 +2,7 @@ Title: Xiao Wang ---- -Favicon: +Favicon: ---- @@ -14,7 +14,19 @@ Instagram: https://www.instagram.com/exemple/ ---- -Meta-description: +Meta-description: + +---- + +Meta-author: Xiao Wang + +---- + +Og-image: + +---- + +Twitter-image: ---- @@ -34,4 +46,4 @@ Robots-noimageindex: disabled ---- -Robots-nosnippet: disabled \ No newline at end of file +Robots-nosnippet: disabled diff --git a/site/blueprints/sections/generic_seo_basic_meta.yml b/site/blueprints/sections/generic_seo_metadata.yml similarity index 59% rename from site/blueprints/sections/generic_seo_basic_meta.yml rename to site/blueprints/sections/generic_seo_metadata.yml index b0d23c1..41ef35e 100644 --- a/site/blueprints/sections/generic_seo_basic_meta.yml +++ b/site/blueprints/sections/generic_seo_metadata.yml @@ -23,3 +23,31 @@ fields: en: "Image displayed by social networks (format: JPEG or PNG)." fr: "Image affichée par les réseaux sociaux (format : JPEG ou PNG)." width: 1/4 + # Hidden fields + og_image: + type: hidden + default: + og_type: + type: hidden + default: article + twitter_image: + type: hidden + default: + twitter_card_type: + type: hidden + default: summary_large_image + robots_noindex: + type: hidden + default: default + robots_nofollow: + type: hidden + default: default + robots_noarchive: + type: hidden + default: default + robots_noimageindex: + type: hidden + default: default + robots_nosnippet: + type: hidden + default: default diff --git a/site/blueprints/tabs/biography_seo.yml b/site/blueprints/tabs/biography_seo.yml index 478bdf5..9b1301b 100644 --- a/site/blueprints/tabs/biography_seo.yml +++ b/site/blueprints/tabs/biography_seo.yml @@ -3,4 +3,4 @@ label: fr: Référencement icon: search sections: - seo_basic_meta: sections/generic_seo_basic_meta + seo_basic_meta: sections/generic_seo_metadata diff --git a/site/blueprints/tabs/gallery_seo.yml b/site/blueprints/tabs/gallery_seo.yml index 478bdf5..9b1301b 100644 --- a/site/blueprints/tabs/gallery_seo.yml +++ b/site/blueprints/tabs/gallery_seo.yml @@ -3,4 +3,4 @@ label: fr: Référencement icon: search sections: - seo_basic_meta: sections/generic_seo_basic_meta + seo_basic_meta: sections/generic_seo_metadata diff --git a/site/blueprints/tabs/home_seo.yml b/site/blueprints/tabs/home_seo.yml index 478bdf5..9b1301b 100644 --- a/site/blueprints/tabs/home_seo.yml +++ b/site/blueprints/tabs/home_seo.yml @@ -3,4 +3,4 @@ label: fr: Référencement icon: search sections: - seo_basic_meta: sections/generic_seo_basic_meta + seo_basic_meta: sections/generic_seo_metadata diff --git a/site/config/config.php b/site/config/config.php index b210944..5dbd45e 100644 --- a/site/config/config.php +++ b/site/config/config.php @@ -10,7 +10,8 @@ return [ 'diesdasdigital.meta-knight' => [ 'siteTitleAfterPageTitle' => false, 'siteTitleAsHomePageTitle' => true, - 'separator' => ' | ' + 'separator' => ' | ', + 'metaAuthor' => false ], // Sitemapper plugin options 'kirbyzone.sitemapper' => [ @@ -35,10 +36,12 @@ return [ 'twitter_image' => $newPage->meta_image()->value() ]); } - // Populate site meta_description field with home page meta_description field value after home page update + // Populate site meta_description, og_image and twitter_image fields with home page meta_description, og_image and twitter_image fields value after home page update if ($newPage->template()->name() === 'home' && $newPage->meta_description()) { $this->site()->update([ - 'meta_description' => $newPage->meta_description()->value() + 'meta_description' => $newPage->meta_description()->value(), + 'og_image' => $newPage->og_image()->value(), + 'twitter_image' => $newPage->twitter_image()->value() ]); } } diff --git a/site/templates/default.php b/site/templates/default.php index 74e38ae..c1a56b6 100644 --- a/site/templates/default.php +++ b/site/templates/default.php @@ -1 +1,6 @@ + + + + +

title() ?>