diff --git a/assets/css/panel.min.css b/assets/css/panel.min.css index a27e70a..636ffe1 100644 --- a/assets/css/panel.min.css +++ b/assets/css/panel.min.css @@ -1 +1 @@ -.k-textarea-field .k-toolbar .k-dropdown .k-button:nth-of-type(2),.k-textarea-field .k-toolbar .k-dropdown .k-button:nth-of-type(3){display:none}/*# sourceMappingURL=panel.min.css.map */ +.k-textarea-field .k-toolbar .k-dropdown .k-button:nth-of-type(2),.k-textarea-field .k-toolbar .k-dropdown .k-button:nth-of-type(3){display:none}.kirby-imagecrop-field .k-column:nth-of-type(2){display:none}/*# sourceMappingURL=panel.min.css.map */ diff --git a/assets/css/panel.min.css.map b/assets/css/panel.min.css.map index 81cede3..5081926 100644 --- a/assets/css/panel.min.css.map +++ b/assets/css/panel.min.css.map @@ -1 +1 @@ -{"version":3,"sourceRoot":"","sources":["panel.scss"],"names":[],"mappings":"AAYY,oIAEI","file":"panel.min.css"} \ No newline at end of file +{"version":3,"sourceRoot":"","sources":["panel.scss"],"names":[],"mappings":"AAYY,oIAEI,aAUZ,gDACI","file":"panel.min.css"} \ No newline at end of file diff --git a/assets/css/panel.scss b/assets/css/panel.scss index b3039a2..093f3c7 100644 --- a/assets/css/panel.scss +++ b/assets/css/panel.scss @@ -17,3 +17,12 @@ } } } + +// Visual image crop field properties + +.kirby-imagecrop-field { + + .k-column:nth-of-type(2) { + display: none; + } +} diff --git a/assets/css/partials/_variables.scss b/assets/css/partials/_variables.scss index 001db9c..f8439d8 100644 --- a/assets/css/partials/_variables.scss +++ b/assets/css/partials/_variables.scss @@ -46,11 +46,6 @@ --black: #000; --jet: #333333; --white: #fff; - // --lava: #c81d25; - - // Plyr (audio player) - - // --plyr-color-main: var(--lava); } // Media queries diff --git a/assets/css/style.min.css.map b/assets/css/style.min.css.map index 20bbc99..a395290 100644 --- a/assets/css/style.min.css.map +++ b/assets/css/style.min.css.map @@ -1 +1 @@ -{"version":3,"sourceRoot":"","sources":["partials/_minireset.css","partials/_fonts.scss","partials/_variables.scss","partials/_animations.scss","style.scss"],"names":[],"mappings":"AAIA,yGAuBI,SACA,UAGJ,kBAMI,eACA,mBAGJ,GACI,gBAGJ,oBAGI,SAGJ,KACI,sBAGJ,qBACI,mBAGJ,UAEI,YACA,eAGJ,OACI,SAGJ,MACI,yBACA,iBAGJ,MAEI,UCtEJ,WACI,qBACA,+DACA,gBACA,kBAGJ,WACC,qBACA,8DACA,gBACA,kBAGD,WACC,qBACA,8DACA,gBACA,kBAGD,WACC,qBACA,oEACA,gBACA,kBAGD,WACC,qBACA,gEACA,gBACA,kBAGD,WACC,qBACA,sEACA,gBACA,kBAGD,WACC,qBACA,4DACA,gBACA,kBAGD,WACC,qBACA,kEACA,gBACA,kBAKD,WACC,gCACA,oFACA,gBACA,kBChED,MAII,kDACA,6DACA,2BACA,0BACA,6BACA,wBACA,uBACA,4BACA,6BACA,2BACA,uBACA,uBACA,uBAIA,4BACA,wBACA,oBACA,oCACA,sCACA,0FACA,oCACA,sCACA,sHACA,yCACA,2CACA,sCACA,wCACA,6FACA,qBACA,2BACA,+BACA,mMAIA,cACA,eACA,cAaJ,qCAEI,MAII,yBACA,4BACA,2BACA,qBACA,uBACA,uBAIA,kBACA,sCACA,oCACA,sCACA,uFACA,2CACA,yCC7ER,2BACI,GACF,MAEE,IACF,YAED,KACC,OAIF,mBACC,GACC,MAEE,IACF,YAED,KACC,OAIF,6BACI,GACF,SAEE,IACF,eAED,KACC,UAIF,qBACI,GACF,SAEE,IACF,eAED,KACC,UCrCF,KACI,oCACA,gCACA,kCACA,iBACA,8BAGJ,SAGI,mBAGJ,GACI,oCACA,8BACA,gCAGJ,GACI,oCACA,8BACA,gCACA,kBAGJ,GACI,oCACA,8BACA,gCACA,qBAGJ,EACI,mBACA,oCAGJ,OACI,oCAGJ,GACI,kBAKJ,EACI,iBACA,0BACA,2CACA,sCACA,mCAEA,yBAGI,mBAOR,KACI,iBACA,kBACA,iBACA,aACA,KACI,2CAMR,OACI,iBAGJ,KACI,eAGJ,OACI,iBASJ,YACI,mCACA,gCACA,YACA,gFACA,oBACA,oBACA,aACA,yBACA,sBACA,8BACA,yBACA,sBACA,mBAGJ,kBACI,kBAGJ,uBACI,qBAGJ,iBACC,kBACA,UAGD,wBACC,8BACA,WACA,YACA,cACA,YACA,eACA,oBACA,oBACA,aACA,4BACA,6BACG,0BACH,sBACA,yBACA,sBACA,8BAEA,qKAGC,WACA,WACA,mBACA,4BAUF,cACI,mCACA,0CACA,YACA,oFACA,oBACA,oBACA,aACA,wBACA,qBACA,uBACA,yBACA,sBACA,mBAGJ,WACI,YACA,iBACA,aACA,KACI,iMAIJ,4BACA,wBACA,cAGJ,iBACI,iBAEA,qBACI,gBACA,2BACA,iBACA,4CAMJ,sCACI,mBACA,mBACA,kBACI,4DAEJ,cACI,4DAEJ,UACI,4DAIR,sCACI,oBACA,qBACA,kBACI,2DAEJ,cACI,2DAEJ,UACI,2DAOR,sCACI,mBACA,mBACA,kBACI,4DAEJ,cACI,4DAEJ,UACI,4DAIR,sCACI,oBACA,qBACA,kBACI,2DAEJ,cACI,2DAEJ,UACI,2DAIR,sCACI,iBACA,wBAMJ,sCACI,mBACA,mBACA,kBACI,4DAEJ,cACI,4DAEJ,UACI,4DAIR,sCACI,oBACA,qBACA,kBACI,2DAEJ,cACI,2DAEJ,UACI,2DAIR,sCACI,sBACA,qBACA,kBACI,sEAEJ,cACI,sEAEJ,UACI,sEAIR,sCACI,uBACA,uBACA,kBACI,uEAEJ,cACI,uEAEJ,UACI,uEAKZ,gBACI,mBACA,8BACA,qBACA,UACA,6CACA,wCACA,qCAEA,oBACI,UACA,6CACA,wCACA,qCAIR,yBACI,UAEA,6BACI,UAIR,2BACI,yCACA,oCAGJ,6BACI,2CACA,sCAKJ,gCAEI,mCACA,YACA,0FAGJ,8BAEI,kBAGJ,4CAEI,gCACA,YAEA,4EACI,kBAKA,0GAEI,kBAIR,kDACI,uBAEA,8GAEI,kBAGJ,8DACI,mBAKZ,kBACI,cACA,YAEA,oCACI,wBAGJ,oEAEI,cACA,gBACA,YAGJ,kCACI,2BAGJ,kCACI,8EAEA,+CACI,cACA,mBAKR,6BACI,sBACA,oBACA,wBACA,mCACA,kBAIR,qCAIQ,oCACI,yBAOZ,eACI,mCACA,YACA,0FAGJ,cACI,kBAGJ,gBACI,gCACA,YACA,kBAGJ,eACI,kBACA,kBAEA,iBACI,qBACA,aACA,mBACA,mBACA,4BACA,qBACA,yCACA,sDACA,iDACA,8CAEA,sEAGI,8BAWZ,YACI,mCACA,gCACA,YACA,gFACA,oBACA,oBACA,aACA,4BACA,6BACA,0BACA,sBACA,yBACA,sBACA,mBAGJ,oBACI,oBACA,oBACA,aACA,yBACA,sBACA,mBAEA,sBACI,oBACA,oBACA,aACA,wBACA,qBACA,uBACA,yBACA,sBACA,mBACA,uBACA,wBAEA,wBACI,kBAGJ,0BACI,gBACA,WACA,YACA,0CACA,qCACA,kCAOA,iGACA,kBAMZ,uBACI,oCACA,kBAGJ,qCAEI,YACI,8BACA,6BACA,uBACA,mBACA,yBACA,sBACA,8BACA,sBACA,mBACA,qBAGJ,oBACI,QAGJ,uBACI,QACA","file":"style.min.css"} \ No newline at end of file +{"version":3,"sourceRoot":"","sources":["partials/_minireset.css","partials/_fonts.scss","partials/_variables.scss","partials/_animations.scss","style.scss"],"names":[],"mappings":"AAIA,yGAuBI,SACA,UAGJ,kBAMI,eACA,mBAGJ,GACI,gBAGJ,oBAGI,SAGJ,KACI,sBAGJ,qBACI,mBAGJ,UAEI,YACA,eAGJ,OACI,SAGJ,MACI,yBACA,iBAGJ,MAEI,UCtEJ,WACI,qBACA,+DACA,gBACA,kBAGJ,WACC,qBACA,8DACA,gBACA,kBAGD,WACC,qBACA,8DACA,gBACA,kBAGD,WACC,qBACA,oEACA,gBACA,kBAGD,WACC,qBACA,gEACA,gBACA,kBAGD,WACC,qBACA,sEACA,gBACA,kBAGD,WACC,qBACA,4DACA,gBACA,kBAGD,WACC,qBACA,kEACA,gBACA,kBAKD,WACC,gCACA,oFACA,gBACA,kBChED,MAII,kDACA,6DACA,2BACA,0BACA,6BACA,wBACA,uBACA,4BACA,6BACA,2BACA,uBACA,uBACA,uBAIA,4BACA,wBACA,oBACA,oCACA,sCACA,0FACA,oCACA,sCACA,sHACA,yCACA,2CACA,sCACA,wCACA,6FACA,qBACA,2BACA,+BACA,mMAIA,cACA,eACA,cAQJ,qCAEI,MAII,yBACA,4BACA,2BACA,qBACA,uBACA,uBAIA,kBACA,sCACA,oCACA,sCACA,uFACA,2CACA,yCCxER,2BACI,GACF,MAEE,IACF,YAED,KACC,OAIF,mBACC,GACC,MAEE,IACF,YAED,KACC,OAIF,6BACI,GACF,SAEE,IACF,eAED,KACC,UAIF,qBACI,GACF,SAEE,IACF,eAED,KACC,UCrCF,KACI,oCACA,gCACA,kCACA,iBACA,8BAGJ,SAGI,mBAGJ,GACI,oCACA,8BACA,gCAGJ,GACI,oCACA,8BACA,gCACA,kBAGJ,GACI,oCACA,8BACA,gCACA,qBAGJ,EACI,mBACA,oCAGJ,OACI,oCAGJ,GACI,kBAKJ,EACI,iBACA,0BACA,2CACA,sCACA,mCAEA,yBAGI,mBAOR,KACI,iBACA,kBACA,iBACA,aACA,KACI,2CAMR,OACI,iBAGJ,KACI,eAGJ,OACI,iBASJ,YACI,mCACA,gCACA,YACA,gFACA,oBACA,oBACA,aACA,yBACA,sBACA,8BACA,yBACA,sBACA,mBAGJ,kBACI,kBAGJ,uBACI,qBAGJ,iBACC,kBACA,UAGD,wBACC,8BACA,WACA,YACA,cACA,YACA,eACA,oBACA,oBACA,aACA,4BACA,6BACG,0BACH,sBACA,yBACA,sBACA,8BAEA,qKAGC,WACA,WACA,mBACA,4BAUF,cACI,mCACA,0CACA,YACA,oFACA,oBACA,oBACA,aACA,wBACA,qBACA,uBACA,yBACA,sBACA,mBAGJ,WACI,YACA,iBACA,aACA,KACI,iMAIJ,4BACA,wBACA,cAGJ,iBACI,iBAEA,qBACI,gBACA,2BACA,iBACA,4CAMJ,sCACI,mBACA,mBACA,kBACI,4DAEJ,cACI,4DAEJ,UACI,4DAIR,sCACI,oBACA,qBACA,kBACI,2DAEJ,cACI,2DAEJ,UACI,2DAOR,sCACI,mBACA,mBACA,kBACI,4DAEJ,cACI,4DAEJ,UACI,4DAIR,sCACI,oBACA,qBACA,kBACI,2DAEJ,cACI,2DAEJ,UACI,2DAIR,sCACI,iBACA,wBAMJ,sCACI,mBACA,mBACA,kBACI,4DAEJ,cACI,4DAEJ,UACI,4DAIR,sCACI,oBACA,qBACA,kBACI,2DAEJ,cACI,2DAEJ,UACI,2DAIR,sCACI,sBACA,qBACA,kBACI,sEAEJ,cACI,sEAEJ,UACI,sEAIR,sCACI,uBACA,uBACA,kBACI,uEAEJ,cACI,uEAEJ,UACI,uEAKZ,gBACI,mBACA,8BACA,qBACA,UACA,6CACA,wCACA,qCAEA,oBACI,UACA,6CACA,wCACA,qCAIR,yBACI,UAEA,6BACI,UAIR,2BACI,yCACA,oCAGJ,6BACI,2CACA,sCAKJ,gCAEI,mCACA,YACA,0FAGJ,8BAEI,kBAGJ,4CAEI,gCACA,YAEA,4EACI,kBAKA,0GAEI,kBAIR,kDACI,uBAEA,8GAEI,kBAGJ,8DACI,mBAKZ,kBACI,cACA,YAEA,oCACI,wBAGJ,oEAEI,cACA,gBACA,YAGJ,kCACI,2BAGJ,kCACI,8EAEA,+CACI,cACA,mBAKR,6BACI,sBACA,oBACA,wBACA,mCACA,kBAIR,qCAIQ,oCACI,yBAOZ,eACI,mCACA,YACA,0FAGJ,cACI,kBAGJ,gBACI,gCACA,YACA,kBAGJ,eACI,kBACA,kBAEA,iBACI,qBACA,aACA,mBACA,mBACA,4BACA,qBACA,yCACA,sDACA,iDACA,8CAEA,sEAGI,8BAWZ,YACI,mCACA,gCACA,YACA,gFACA,oBACA,oBACA,aACA,4BACA,6BACA,0BACA,sBACA,yBACA,sBACA,mBAGJ,oBACI,oBACA,oBACA,aACA,yBACA,sBACA,mBAEA,sBACI,oBACA,oBACA,aACA,wBACA,qBACA,uBACA,yBACA,sBACA,mBACA,uBACA,wBAEA,wBACI,kBAGJ,0BACI,gBACA,WACA,YACA,0CACA,qCACA,kCAOA,iGACA,kBAMZ,uBACI,oCACA,kBAGJ,qCAEI,YACI,8BACA,6BACA,uBACA,mBACA,yBACA,sBACA,8BACA,sBACA,mBACA,qBAGJ,oBACI,QAGJ,uBACI,QACA","file":"style.min.css"} \ No newline at end of file diff --git a/composer.json b/composer.json index 476f119..f95e4e9 100644 --- a/composer.json +++ b/composer.json @@ -15,8 +15,8 @@ "getkirby/cms": "^3.5", "amteich/kirby-twig": "^4.1", "sylvainjule/matomo": "^1.0", - "diesdasdigital/kirby-meta-knight": "^1.2", - "kirbyzone/sitemapper": "^1.2" + "kirbyzone/sitemapper": "^1.2", + "steirico/kirby-plugin-image-crop-field": "^2.0" }, "scripts": { "start": [ diff --git a/composer.lock b/composer.lock index 4c24276..37f3898 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "2b5816560ec69490f1f1ef0c8ae052f5", + "content-hash": "c5992525649c1061a4453492d2f429de", "packages": [ { "name": "amteich/kirby-twig", @@ -100,48 +100,6 @@ ], "time": "2021-12-01T12:42:55+00:00" }, - { - "name": "diesdasdigital/kirby-meta-knight", - "version": "1.2.2", - "source": { - "type": "git", - "url": "https://github.com/diesdasdigital/kirby-meta-knight.git", - "reference": "9c3da53a3abee5ffdd95c1363d679e9395794715" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/diesdasdigital/kirby-meta-knight/zipball/9c3da53a3abee5ffdd95c1363d679e9395794715", - "reference": "9c3da53a3abee5ffdd95c1363d679e9395794715", - "shasum": "" - }, - "require": { - "getkirby/composer-installer": "^1.1" - }, - "type": "kirby-plugin", - "autoload": { - "psr-4": { - "diesdasdigital\\kirby-meta-knight\\": "src/models/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "authors": [ - { - "name": "Jonathan Muth", - "email": "jonathan@diesdas.digital", - "homepage": "https://diesdas.digital", - "role": "Developer" - } - ], - "description": "Meta Knight – SEO for Kirby", - "support": { - "issues": "https://github.com/diesdasdigital/kirby-meta-knight/issues", - "source": "https://github.com/diesdasdigital/kirby-meta-knight/tree/1.2.2" - }, - "time": "2021-11-16T12:41:33+00:00" - }, { "name": "filp/whoops", "version": "2.14.5", @@ -341,6 +299,65 @@ ], "time": "2020-12-28T12:54:39+00:00" }, + { + "name": "gumlet/php-image-resize", + "version": "2.0.2", + "source": { + "type": "git", + "url": "https://github.com/gumlet/php-image-resize.git", + "reference": "39066a32de8476a32c9ac6322f9658021cee8638" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/gumlet/php-image-resize/zipball/39066a32de8476a32c9ac6322f9658021cee8638", + "reference": "39066a32de8476a32c9ac6322f9658021cee8638", + "shasum": "" + }, + "require": { + "ext-fileinfo": "*", + "ext-gd": "*", + "php": ">=5.6.0" + }, + "require-dev": { + "apigen/apigen": "^4.1", + "ext-exif": "*", + "ext-gd": "*", + "php-coveralls/php-coveralls": "^2.1", + "phpunit/phpunit": "^8.5" + }, + "suggest": { + "ext-exif": "Auto-rotate jpeg files" + }, + "type": "library", + "autoload": { + "psr-4": { + "Gumlet\\": "lib/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Aditya Patadia", + "homepage": "http://aditya.patadia.org/" + } + ], + "description": "PHP class to re-size and scale images", + "homepage": "https://github.com/gumlet/php-image-resize", + "keywords": [ + "image", + "php", + "resize", + "scale" + ], + "support": { + "issues": "https://github.com/gumlet/php-image-resize/issues", + "source": "https://github.com/gumlet/php-image-resize/tree/2.0.2" + }, + "time": "2022-05-12T11:03:20+00:00" + }, { "name": "kirbyzone/sitemapper", "version": "1.2.1", @@ -680,6 +697,58 @@ }, "time": "2021-05-03T11:20:27+00:00" }, + { + "name": "steirico/kirby-plugin-image-crop-field", + "version": "2.0.5", + "source": { + "type": "git", + "url": "https://github.com/steirico/kirby-plugin-image-crop-field.git", + "reference": "f4f637112e28296070665885654415bb307e328a" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/steirico/kirby-plugin-image-crop-field/zipball/f4f637112e28296070665885654415bb307e328a", + "reference": "f4f637112e28296070665885654415bb307e328a", + "shasum": "" + }, + "require": { + "getkirby/composer-installer": "^1.1", + "gumlet/php-image-resize": "2.0.*" + }, + "type": "kirby-plugin", + "autoload": { + "files": [ + "config.php" + ], + "classmap": [ + "fields/", + "lib/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Rico Steiner", + "email": "rico@vweb.ch" + } + ], + "description": "A image cropping field for kirby.", + "keywords": [ + "crop", + "field", + "image", + "kirby3", + "plugin" + ], + "support": { + "issues": "https://github.com/steirico/kirby-plugin-image-crop-field/issues", + "source": "https://github.com/steirico/kirby-plugin-image-crop-field/tree/v2.0.5" + }, + "time": "2021-11-01T15:57:43+00:00" + }, { "name": "sylvainjule/matomo", "version": "1.0.7", diff --git a/robots.txt b/robots.txt new file mode 100644 index 0000000..1ababdb --- /dev/null +++ b/robots.txt @@ -0,0 +1,4 @@ +User-agent: * +Disallow: /panel* + +Sitemap: https://xiaowang.fr/sitemap.xml diff --git a/site/blueprints/files/meta_image.yml b/site/blueprints/files/meta_image.yml new file mode 100644 index 0000000..34d0281 --- /dev/null +++ b/site/blueprints/files/meta_image.yml @@ -0,0 +1,19 @@ +title: Meta image +accept: + mime: image/jpeg, image/png +fields: + crop: + label: + en: Social networks image crop + fr: Recadrage pour les réseaux sociaux + type: imagecrop + minSize: + width: 1200 + height: 675 + preserveAspectRatio: true + width: 1/2 + alt_text: + label: + en: Alternative text + fr: Texte alternatif + type: text diff --git a/site/blueprints/sections/generic_seo_meta_image.yml b/site/blueprints/sections/generic_seo_meta_image.yml new file mode 100644 index 0000000..11ddefa --- /dev/null +++ b/site/blueprints/sections/generic_seo_meta_image.yml @@ -0,0 +1,14 @@ +headline: Image +type: files +template: meta_image +layout: cards +size: small +image: + query: file.croppedImage + ratio: 16/9 + cover: false + back: white +max: 1 +help: + en: "Image displayed by social networks (format: JPEG or PNG)." + fr: "Image affichée par les réseaux sociaux (format : JPEG ou PNG)." diff --git a/site/blueprints/sections/generic_seo_metadata.yml b/site/blueprints/sections/generic_seo_metadata.yml index 9f04eaf..1b77ee8 100644 --- a/site/blueprints/sections/generic_seo_metadata.yml +++ b/site/blueprints/sections/generic_seo_metadata.yml @@ -5,52 +5,13 @@ fields: type: textarea size: small buttons: false - # required: true help: en: "Short description of the page displayed by search engines and social networks (recommended maximum length: 160 characters)." fr: "Courte description de la page affichée par les moteurs de recherche et les réseaux sociaux (taille maximale conseillée : 160 caractères)." - width: 3/4 - gap: - type: gap - width: 1/4 - meta_image: - label: Image - type: files - layout: cardlets - image: - cover: true - back: white - multiple: false - # required: true - help: - 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/sections/site_content_pages.yml b/site/blueprints/sections/site_content_pages.yml index 690c53c..8089886 100644 --- a/site/blueprints/sections/site_content_pages.yml +++ b/site/blueprints/sections/site_content_pages.yml @@ -10,4 +10,5 @@ create: false layout: cardlets image: cover: true + query: page.images.template('image').first back: white diff --git a/site/blueprints/tabs/about_seo.yml b/site/blueprints/tabs/about_seo.yml index 4c5afb9..0c9eee2 100644 --- a/site/blueprints/tabs/about_seo.yml +++ b/site/blueprints/tabs/about_seo.yml @@ -2,5 +2,10 @@ label: en: SEO fr: Référencement icon: search -sections: - seo_basic_meta: sections/generic_seo_metadata +columns: + - width: 3/4 + sections: + seo_basic_meta: sections/generic_seo_metadata + - width: 1/3 + sections: + seo_meta_image: sections/generic_seo_meta_image diff --git a/site/blueprints/tabs/gallery_seo.yml b/site/blueprints/tabs/gallery_seo.yml index 4c5afb9..0c9eee2 100644 --- a/site/blueprints/tabs/gallery_seo.yml +++ b/site/blueprints/tabs/gallery_seo.yml @@ -2,5 +2,10 @@ label: en: SEO fr: Référencement icon: search -sections: - seo_basic_meta: sections/generic_seo_metadata +columns: + - width: 3/4 + sections: + seo_basic_meta: sections/generic_seo_metadata + - width: 1/3 + sections: + seo_meta_image: sections/generic_seo_meta_image diff --git a/site/blueprints/tabs/home_seo.yml b/site/blueprints/tabs/home_seo.yml index 4c5afb9..0c9eee2 100644 --- a/site/blueprints/tabs/home_seo.yml +++ b/site/blueprints/tabs/home_seo.yml @@ -2,5 +2,10 @@ label: en: SEO fr: Référencement icon: search -sections: - seo_basic_meta: sections/generic_seo_metadata +columns: + - width: 3/4 + sections: + seo_basic_meta: sections/generic_seo_metadata + - width: 1/3 + sections: + seo_meta_image: sections/generic_seo_meta_image diff --git a/site/config/config.php b/site/config/config.php index 486e9dc..e110409 100644 --- a/site/config/config.php +++ b/site/config/config.php @@ -7,16 +7,10 @@ return [ 'language' => 'fr', 'css' => 'assets/css/panel.min.css' ], - // Meta Knight plugin options - 'diesdasdigital.meta-knight' => [ - 'siteTitleAfterPageTitle' => false, - 'separator' => ' | ', - 'metaAuthor' => false - ], // Sitemapper plugin options 'kirbyzone.sitemapper' => [ 'intro' => false, - 'byLine' => 'Sitemap automatically generated by Sitemapper, by Kirbyzone.' + 'byLine' => 'Sitemap generated with Sitemapper by Kirbyzone.' ], // Hooks 'hooks' => [ @@ -28,23 +22,6 @@ return [ ]); } }, - 'page.update:after' => function($newPage) { - // Populate page og_image and twitter_image fields with page meta_image field value after page update - if ($newPage->meta_image()) { - $newPage->update([ - 'og_image' => $newPage->meta_image()->value(), - 'twitter_image' => $newPage->meta_image()->value() - ]); - } - // 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(), - 'og_image' => $newPage->og_image()->value(), - 'twitter_image' => $newPage->twitter_image()->value() - ]); - } - }, 'kirbytext:after' => function (string $text) { // Replace any HTML

or

tag by

tag after Markdown parsing return preg_replace(['/

|

/', '/<\/h1>|<\/h2>/'], ['

', '

'], $text); diff --git a/site/snippets/favicon.twig b/site/snippets/favicon.twig new file mode 100644 index 0000000..1a8c81f --- /dev/null +++ b/site/snippets/favicon.twig @@ -0,0 +1,5 @@ + + + + + diff --git a/site/snippets/metadata.twig b/site/snippets/metadata.twig new file mode 100644 index 0000000..13b795f --- /dev/null +++ b/site/snippets/metadata.twig @@ -0,0 +1,73 @@ + + + + + + + + + +{{ site.title }} | {{ page.title }} + + + +{% if page.meta_description is not empty %} + + +{% elseif site.homePage.meta_description is not empty %} + + +{% endif %} + + + + + + + + + + + +{% if page.images.template('meta_image') is not empty %} + +{% elseif site.homePage.images.template('meta_image') is not empty %} + +{% endif %} + +{% if page.template != 'error' %} + + + + {% if page.meta_description is not empty %} + + {% elseif site.homePage.meta_description is not empty %} + + {% endif %} + {% if page.images.template('meta_image') is not empty %} + + + + {% elseif site.homePage.images.template('meta_image') is not empty %} + + + + {% endif %} + + + + + + + {% if page.meta_description is not empty %} + + {% elseif site.homePage.meta_description is not empty %} + + {% endif %} + {% if page.images.template('meta_image') is not empty %} + + {% elseif site.homePage.images.template('meta_image') is not empty %} + + {% endif %} + +{% endif %} diff --git a/site/templates/base.twig b/site/templates/base.twig index 514da36..d4a0e8e 100644 --- a/site/templates/base.twig +++ b/site/templates/base.twig @@ -3,15 +3,9 @@ - - - - {{ snippet('meta_information') }} - {{ snippet('robots') }} - - - - + + {{ snippet('metadata') }} + {{ snippet('favicon') }} {% block stylesheets %} @@ -32,15 +26,17 @@ - + {% if page != site.homePage %} + + {% endif %} @@ -75,7 +71,7 @@
-

© {{ 'now' | date('Y') }} {{ site.meta_author }}

+

© {{ 'now' | date('Y') }} {{ site.title }}

diff --git a/site/templates/gallery.twig b/site/templates/gallery.twig index 76f258c..bd51954 100644 --- a/site/templates/gallery.twig +++ b/site/templates/gallery.twig @@ -15,8 +15,8 @@ {% if page.text.isNotEmpty %}
{{ page.text.kirbytext|raw }}
{% endif %} - {% if page.files.isNotEmpty %} - {% set artworks = page.files.sortBy('sort') %} + {% if page.files.template("artwork").isNotEmpty %} + {% set artworks = page.files.template("artwork").sortBy('sort') %} {% for artwork in artworks %}
{% if artwork.type == 'video' %} diff --git a/site/templates/home.twig b/site/templates/home.twig index 1c77c3c..7aa15bd 100644 --- a/site/templates/home.twig +++ b/site/templates/home.twig @@ -19,7 +19,7 @@ {% set navItemNo = navItemNo + 1 %} {% endfor %}