From 155b10cc9d3fee06d1c45604c5d330a44e4706bb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Paul=20Nicou=C3=A9?= Date: Fri, 25 Nov 2022 14:17:23 +0100 Subject: [PATCH] Edit administration panel layout --- site/blueprints/pages/exhibitions.yml | 21 ------ site/blueprints/pages/gallery.yml | 21 ------ site/blueprints/pages/home.yaml | 5 ++ .../exhibitions_content_exhibitions.yml | 57 ---------------- .../sections/generic_seo_metadata.yml | 43 ------------ ...t_contact.yml => site_content_contact.yml} | 20 +++--- .../sections/site_content_exhibitions.yml | 22 +++++++ ...ent_images.yml => site_content_images.yml} | 6 +- .../sections/site_content_pages.yml | 16 ----- ...seo_metadata.yml => site_seo_metadata.yml} | 6 +- site/blueprints/site.yml | 1 + site/blueprints/tabs/exhibitions_content.yml | 9 --- site/blueprints/tabs/exhibitions_seo.yml | 6 -- site/blueprints/tabs/gallery_content.yml | 6 -- site/blueprints/tabs/site_content.yml | 10 +-- .../tabs/{gallery_seo.yml => site_seo.yml} | 2 +- site/controllers/home.php | 10 +-- site/snippets/metadata.twig | 66 ++++++------------- 18 files changed, 75 insertions(+), 252 deletions(-) delete mode 100644 site/blueprints/pages/exhibitions.yml delete mode 100644 site/blueprints/pages/gallery.yml create mode 100644 site/blueprints/pages/home.yaml delete mode 100644 site/blueprints/sections/exhibitions_content_exhibitions.yml delete mode 100644 site/blueprints/sections/generic_seo_metadata.yml rename site/blueprints/sections/{exhibitions_content_contact.yml => site_content_contact.yml} (96%) create mode 100644 site/blueprints/sections/site_content_exhibitions.yml rename site/blueprints/sections/{gallery_content_images.yml => site_content_images.yml} (67%) delete mode 100644 site/blueprints/sections/site_content_pages.yml rename site/blueprints/sections/{exhibitions_seo_metadata.yml => site_seo_metadata.yml} (84%) delete mode 100644 site/blueprints/tabs/exhibitions_content.yml delete mode 100644 site/blueprints/tabs/exhibitions_seo.yml delete mode 100644 site/blueprints/tabs/gallery_content.yml rename site/blueprints/tabs/{gallery_seo.yml => site_seo.yml} (56%) diff --git a/site/blueprints/pages/exhibitions.yml b/site/blueprints/pages/exhibitions.yml deleted file mode 100644 index 46b8df7..0000000 --- a/site/blueprints/pages/exhibitions.yml +++ /dev/null @@ -1,21 +0,0 @@ -title: - en: Home - fr: Accueil -icon: list-bullet -status: - draft: true - listed: true -options: - changeSlug: - admin: true - editor: false - changeStatus: false - changeTemplate: false - changeTitle: - admin: true - editor: false - delete: false - duplicate: false -tabs: - content: tabs/exhibitions_content - seo: tabs/exhibitions_seo diff --git a/site/blueprints/pages/gallery.yml b/site/blueprints/pages/gallery.yml deleted file mode 100644 index 1dffee7..0000000 --- a/site/blueprints/pages/gallery.yml +++ /dev/null @@ -1,21 +0,0 @@ -title: - en: Gallery - fr: Galerie -icon: images -status: - draft: true - listed: true -options: - changeSlug: - admin: true - editor: false - changeStatus: false - changeTemplate: false - changeTitle: - admin: true - editor: false - delete: false - duplicate: false -tabs: - content: tabs/gallery_content - seo: tabs/gallery_seo diff --git a/site/blueprints/pages/home.yaml b/site/blueprints/pages/home.yaml new file mode 100644 index 0000000..c1e7f73 --- /dev/null +++ b/site/blueprints/pages/home.yaml @@ -0,0 +1,5 @@ +title: + en: Home + fr: Accueil +options: + read: false diff --git a/site/blueprints/sections/exhibitions_content_exhibitions.yml b/site/blueprints/sections/exhibitions_content_exhibitions.yml deleted file mode 100644 index cce448d..0000000 --- a/site/blueprints/sections/exhibitions_content_exhibitions.yml +++ /dev/null @@ -1,57 +0,0 @@ -headline: - en: Exhibitions - fr: Expositions -type: fields -fields: - exhibitions: - label: - en: Exhibitions - fr: Expositions - type: structure - prepend: true - sortable: true - required: true - fields: - url: - label: - en: URL - fr: URL - type: url - width: 2/4 - external_link: - label: - en: External link - fr: Lien externe - type: toggle - text: - - - en: 'No' - fr: Non - - - en: 'Yes' - fr: Oui - width: 1/4 - background_color: - when: - external_link: false - label: - en: Background color - fr: Couleur de fond - type: select - options: - feldgrau: Feldgrau - white: - en: White - fr: Blanc - default: feldgrau - width: 1/4 - columns: - url: - width: 2/4 - external_link: - width: 1/4 - background_color: - width: 1/4 - - - diff --git a/site/blueprints/sections/generic_seo_metadata.yml b/site/blueprints/sections/generic_seo_metadata.yml deleted file mode 100644 index d7c9121..0000000 --- a/site/blueprints/sections/generic_seo_metadata.yml +++ /dev/null @@ -1,43 +0,0 @@ -type: fields -fields: - meta_description: - label: - en: Meta description - fr: Méta description - type: textarea - size: small - buttons: false - help: - en: "Short description of the page displayed by search engines and social networks (recommended maximum length: 160 characters). Home page meta description is used if this field is empty." - 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). La méta description de la page d'accueil est utilisée si ce champ est vide." - width: 3/4 - gap: - type: gap - width: 1/4 - meta_image: - label: - en: Meta image - fr: Méta image - type: image-clip - query: page.images - uploads: image - layout: cards - image: - cover: true - back: white - multiple: false - clip: - minwidth: 1200 - minheight: 675 - ratio: fixed - help: - en: "Image displayed by social networks (format: JPEG or PNG). Home page meta image is used if this field is empty." - fr: "Image affichée par les réseaux sociaux (format : JPEG ou PNG). La méta image de la page d'accueil est utilisée si ce champ est vide." - width: 1/4 - # Hidden fields - og_type: - type: hidden - default: article - twitter_card_type: - type: hidden - default: summary_large_image diff --git a/site/blueprints/sections/exhibitions_content_contact.yml b/site/blueprints/sections/site_content_contact.yml similarity index 96% rename from site/blueprints/sections/exhibitions_content_contact.yml rename to site/blueprints/sections/site_content_contact.yml index 513ad8e..0380fbf 100644 --- a/site/blueprints/sections/exhibitions_content_contact.yml +++ b/site/blueprints/sections/site_content_contact.yml @@ -2,16 +2,6 @@ type: fields fields: contact_line: type: line - email: - label: - en: Email - fr: Adresse e-mail - type: email - required: true - width: 1/2 - gap: - type: gap - width: 1/2 instagram: type: url label: @@ -20,3 +10,13 @@ fields: icon: instagram required: true width: 1/2 + contact_gap: + type: gap + width: 1/2 + email: + label: + en: Email + fr: Adresse e-mail + type: email + required: true + width: 1/2 diff --git a/site/blueprints/sections/site_content_exhibitions.yml b/site/blueprints/sections/site_content_exhibitions.yml new file mode 100644 index 0000000..ccdb40c --- /dev/null +++ b/site/blueprints/sections/site_content_exhibitions.yml @@ -0,0 +1,22 @@ +headline: + en: Exhibitions + fr: Expositions +type: fields +fields: + exhibitions: + label: + en: Exhibitions + fr: Expositions + type: structure + prepend: true + sortable: true + required: true + fields: + url: + label: + en: URL + fr: URL + type: url + + + diff --git a/site/blueprints/sections/gallery_content_images.yml b/site/blueprints/sections/site_content_images.yml similarity index 67% rename from site/blueprints/sections/gallery_content_images.yml rename to site/blueprints/sections/site_content_images.yml index 4f6fb17..927db34 100644 --- a/site/blueprints/sections/gallery_content_images.yml +++ b/site/blueprints/sections/site_content_images.yml @@ -1,12 +1,12 @@ headline: - en: Artworks - fr: Œuvres + en: Image gallery + fr: Galerie d'images type: files template: full_screen_image min: 2 layout: cards size: small -limit: 60 +limit: 10 image: ratio: 1/1 back: white diff --git a/site/blueprints/sections/site_content_pages.yml b/site/blueprints/sections/site_content_pages.yml deleted file mode 100644 index daa59af..0000000 --- a/site/blueprints/sections/site_content_pages.yml +++ /dev/null @@ -1,16 +0,0 @@ -headline: - en: Pages - fr: Pages -type: pages -templates: - - exhibitions - - gallery -sortBy: title desc -create: false -layout: cards -size: small -image: - ratio: 1/1 - cover: true - query: page.images.template('full_screen_image').first - back: white diff --git a/site/blueprints/sections/exhibitions_seo_metadata.yml b/site/blueprints/sections/site_seo_metadata.yml similarity index 84% rename from site/blueprints/sections/exhibitions_seo_metadata.yml rename to site/blueprints/sections/site_seo_metadata.yml index 8e2c8a0..71748dc 100644 --- a/site/blueprints/sections/exhibitions_seo_metadata.yml +++ b/site/blueprints/sections/site_seo_metadata.yml @@ -10,9 +10,9 @@ fields: # 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)." + fr: "Courte description du site web affichée par les moteurs de recherche et les réseaux sociaux (taille maximale conseillée : 160 caractères)." width: 3/4 - gap: + seo_gap: type: gap width: 1/4 meta_image: @@ -20,7 +20,7 @@ fields: en: Meta image fr: Méta image type: image-clip - query: page.images + query: site.images layout: cards image: cover: true diff --git a/site/blueprints/site.yml b/site/blueprints/site.yml index b7b6729..180b66e 100644 --- a/site/blueprints/site.yml +++ b/site/blueprints/site.yml @@ -3,4 +3,5 @@ title: fr: Site web tabs: content: tabs/site_content + seo: tabs/site_seo analytics: tabs/site_analytics diff --git a/site/blueprints/tabs/exhibitions_content.yml b/site/blueprints/tabs/exhibitions_content.yml deleted file mode 100644 index f8e6a15..0000000 --- a/site/blueprints/tabs/exhibitions_content.yml +++ /dev/null @@ -1,9 +0,0 @@ -label: - en: Content - fr: Contenu -icon: text -sections: - exhibitions: sections/exhibitions_content_exhibitions - contact: sections/exhibitions_content_contact - - diff --git a/site/blueprints/tabs/exhibitions_seo.yml b/site/blueprints/tabs/exhibitions_seo.yml deleted file mode 100644 index 675c3d8..0000000 --- a/site/blueprints/tabs/exhibitions_seo.yml +++ /dev/null @@ -1,6 +0,0 @@ -label: - en: SEO - fr: Référencement -icon: search -sections: - seo_basic_meta: sections/exhibitions_seo_metadata diff --git a/site/blueprints/tabs/gallery_content.yml b/site/blueprints/tabs/gallery_content.yml deleted file mode 100644 index 63d8765..0000000 --- a/site/blueprints/tabs/gallery_content.yml +++ /dev/null @@ -1,6 +0,0 @@ -label: - en: Content - fr: Contenu -icon: text -sections: - artworks: sections/gallery_content_images diff --git a/site/blueprints/tabs/site_content.yml b/site/blueprints/tabs/site_content.yml index 0faa11b..7552c54 100644 --- a/site/blueprints/tabs/site_content.yml +++ b/site/blueprints/tabs/site_content.yml @@ -1,6 +1,8 @@ label: - en: Website - fr: Site web -icon: home + en: Content + fr: Contenu +icon: text sections: - pages: sections/site_content_pages + exhibitions: sections/site_content_exhibitions + artworks: sections/site_content_images + contact: sections/site_content_contact diff --git a/site/blueprints/tabs/gallery_seo.yml b/site/blueprints/tabs/site_seo.yml similarity index 56% rename from site/blueprints/tabs/gallery_seo.yml rename to site/blueprints/tabs/site_seo.yml index 4c5afb9..2d36075 100644 --- a/site/blueprints/tabs/gallery_seo.yml +++ b/site/blueprints/tabs/site_seo.yml @@ -3,4 +3,4 @@ label: fr: Référencement icon: search sections: - seo_basic_meta: sections/generic_seo_metadata + seo_basic_meta: sections/site_seo_metadata diff --git a/site/controllers/home.php b/site/controllers/home.php index 929629f..f4f15c3 100644 --- a/site/controllers/home.php +++ b/site/controllers/home.php @@ -1,9 +1,9 @@ exhibitions()->yaml(); + $exhibitions = $site->exhibitions()->yaml(); // Add url based title to each exhibition foreach ($exhibitions as &$exhibition) { @@ -12,11 +12,11 @@ return function ($page) { } // Get contact fields content - $email = $page->email(); - $instagram = $page->instagram(); + $email = $site->email(); + $instagram = $site->instagram(); // Get image files section content - $images = $page->files()->template("full_screen_image")->shuffle(); + $images = $site->files()->template("full_screen_image")->shuffle(); return [ 'exhibitions' => $exhibitions, diff --git a/site/snippets/metadata.twig b/site/snippets/metadata.twig index 193493b..e468094 100644 --- a/site/snippets/metadata.twig +++ b/site/snippets/metadata.twig @@ -6,21 +6,13 @@ {# Title #} -{% if page.isHomePage %} - {{ site.title }} - -{% else %} - {{ site.title }} | {{ page.title }} - -{% endif %} +{{ site.title }} + {# Description #} -{% if page.meta_description is not empty %} - - -{% elseif site.homePage.meta_description is not empty %} - - +{% if site.meta_description is not empty %} + + {% endif %} {# Canonical URL #} @@ -33,53 +25,33 @@ {# Image #} -{% if page.meta_image is not empty %} - -{% elseif site.homePage.meta_image is not empty %} - +{% if site.meta_image is not empty %} + {% endif %} {% if page.template != 'error' %} {# Open Graph #} - {% if page.isHomePage %} - - {% else %} - + + {% if site.meta_description is not empty %} + {% endif %} - {% if page.meta_description is not empty %} - - {% elseif site.homePage.meta_description is not empty %} - - {% endif %} - {% if page.meta_image is not empty %} - - - - {% elseif site.homePage.meta_image is not empty %} - + {% if site.meta_image is not empty %} + {% endif %} - + {# Twitter Card #} - - {% if page.isHomePage %} - - {% else %} - + + + {% if site.meta_description is not empty %} + {% endif %} - {% if page.meta_description is not empty %} - - {% elseif site.homePage.meta_description is not empty %} - - {% endif %} - {% if page.meta_image is not empty %} - - {% elseif site.homePage.meta_image is not empty %} - + {% if site.meta_image is not empty %} + {% endif %} {% endif %}