Merge pull request #5 from CCLuminy/content

Big fat update, mostly cms configuration

.forestry/front_matter/templates/single.yml

@@ -4,13 +4,221 @@ hide_body: false
 fields:
 - type: text
   name: title
-  label: title
+  label: Titre
+  config:
+    required: true
 - name: last_modified_at
   type: datetime
   label: Date dernière modification
   description: ''
   config:
-    required: false
-    date_format: 
+    required: true
+    date_format: DD-MM-YYYY
     time_format: 
     display_utc: false
+    export_format: ''
+  default: now
+  hidden: true
+- name: share
+  type: boolean
+  label: Afficher les boutons de partage (réseaux sociaux)
+  description: Boutons Twitter, Facebook, Linkedin en bas de la page
+  default: true
+- name: toc
+  type: boolean
+  label: Afficher le sommaire ?
+  default: true
+- name: classes
+  type: select
+  default: ''
+  config:
+    required: false
+    options:
+    - wide
+    - " "
+    source:
+      type: simple
+      section: 
+      file: 
+      path: 
+  label: Élargir la zone du texte (wide)
+  description: Le texte prend aussi l'espace à droite de la page. S'il y a un sommaire,
+    il sera placé en haut de la page.
+- name: description
+  type: text
+  config:
+    required: false
+  label: Description
+  description: Description courte et précise pour le référencement.
+- name: has_header
+  type: boolean
+  label: Afficher une entête visuelle
+  default: true
+- name: header
+  type: field_group
+  config: {}
+  fields:
+  - name: type
+    type: select
+    default: default
+    config:
+      required: false
+      options:
+      - overlay
+      - image
+      - video
+      - default
+      source:
+        type: simple
+        section: 
+        file: 
+        path: 
+    label: Type
+    description: 'default: overlay avec juste le titre de la page et la bannière de
+      l''asso. overlay: des infos sur une couleur ou une image de fond (l''image est
+      prioritaire)'
+  - name: color
+    type: color
+    config:
+      required: false
+      color_format: Hex
+    label: Couleur
+    showOnly:
+      field: type
+      value: overlay
+  - name: overlay_image
+    type: file
+    config:
+      maxSize: '15'
+    label: Image
+    showOnly:
+      field: type
+      value: overlay
+  - name: fixed_image
+    type: file
+    config:
+      maxSize: '15'
+    label: Image
+    showOnly:
+      field: type
+      value: image
+  - name: overlay_title
+    type: boolean
+    label: Titre sur l'entête
+    default: true
+    showOnly:
+      field: type
+      value: overlay
+  - name: show_text
+    type: select
+    default: description
+    config:
+      required: false
+      options:
+      - description
+      - custom
+      source:
+        type: simple
+        section: 
+        file: 
+        path: 
+    label: Texte sur l'entête
+    showOnly:
+      field: type
+      value: overlay
+  - name: overlay_text
+    type: text
+    config:
+      required: false
+    label: Texte
+    showOnly:
+      field: show_text
+      value: custom
+  - name: caption
+    type: text
+    config:
+      required: false
+    showOnly:
+      field: type
+      value: overlay
+    label: Crédits
+    description: Apparaitra tout petit en bas à droite de l'image
+  - name: actions
+    type: field_group_list
+    fields:
+    - name: label
+      type: text
+      config:
+        required: false
+      label: Label
+    - name: url
+      type: text
+      config:
+        required: false
+      label: URL
+    - name: fa-icon
+      type: select
+      default: []
+      config:
+        required: false
+        options:
+        - facebook
+        - calendrier
+        - helloasso
+        source:
+          type: simple
+          section: 
+          file: 
+          path: 
+      label: Icone
+    config:
+      min: '0'
+      max: '5'
+      labelField: label
+    label: Boutons
+    showOnly:
+      field: type
+      value: overlay
+  - name: video
+    type: field_group
+    config: {}
+    fields:
+    - name: id
+      type: text
+      config:
+        required: false
+      label: Identifiant de la vidéo
+      description: Par exemple https://www.youtube.com/watch?v=**rKNMf4LFX44** (mettre
+        uniquement la partie en gras)
+    - name: provider
+      type: select
+      default: youtube
+      config:
+        required: false
+        options:
+        - youtube
+        - vimeo
+        - google-drive
+        source:
+          type: simple
+          section: 
+          file: 
+          path: 
+      label: Fournisseur
+    label: Vidéo
+    showOnly:
+      field: type
+      value: video
+  label: Entête
+  showOnly:
+    field: has_header
+    value: true
+- name: author
+  type: text
+  config:
+    required: false
+  label: Changer l'auteur par défaut
+  description: Mettre nom court (prefix) de l'auteur. Voir la rubrique "Les auteurs".
+    Si rien n'est indiqué, l'auteur par défaut sera celui de l'asso correspondante
+    au sous-dossier de la page. Exemple les pages sous "Centre Culturel de Luminy"
+    ont pour auteur "ccl".

.forestry/front_matter/templates/template-auteurs.yml

+---
+label: Template auteurs
+hide_body: true
+fields:
+- type: field_group_list
+  name: authors
+  label: Auteurs
+  fields:
+  - type: text
+    name: name
+    label: Nom
+    description: Nom à afficher
+    config:
+      required: true
+  - type: text
+    name: prefix
+    label: Nom court (prefix)
+    config:
+      required: true
+    description: Utilisé pour déterminer le sous-dossier pour lequel cet auteur sera
+      celui par défaut. Également utile pour référencer l'auteur.
+  - type: text
+    name: avatar
+    label: Avatar
+    description: À apparaitre sur le profil à gauche
+  - type: text
+    name: bio
+    label: Bio
+    description: Courte bio ou description, à apparaitre dans le profil.
+  - type: text
+    name: banner
+    label: Bannière
+    description: Image à afficher par défaut en entête de chaque page de cet auteur.
+  - type: text
+    name: location
+    label: Localisation
+    description: À peu près
+  - type: text
+    name: email
+    label: Email
+  - type: text
+    name: facebook
+    label: Facebook
+    description: Donner l'URL
+  - type: text
+    name: helloasso
+    label: HelloAsso
+    description: Idem
+  - type: text
+    name: og_image
+    label: Image OpenGraph
+    description: Image par défaut lorsqu'une page de cet auteur est partagée. Par
+      défaut, c'est l'avatar.
+  description: Liste des auteurs, assos et collectifs qui publient sur luminy.org.
+    Le "profile" de l'auteur sera placé à gauche sur chaque page. Par défaut, le sous-dossier
+    contenant la page détermine l'auteur.
+  config:
+    labelField: name
+pages:
+- _data/authors.yml

.forestry/front_matter/templates/template-navigations.yml

+---
+label: Template navigations
+hide_body: true
+fields:
+- type: field_group_list
+  name: main
+  label: Navigation principale du haut.
+  fields:
+  - type: text
+    name: title
+    label: Label
+  - type: text
+    name: url
+    label: URL
+  description: Commun à tout luminy.org
+  config:
+    labelField: title
+- type: field_group_list
+  name: navs
+  label: Navigations ad-hoc
+  fields:
+  - type: text
+    name: name
+    label: Nom court de l'auteur
+    description: Voir le champs "nom court (prefix)" dans "Les auteurs"
+  - name: nav
+    type: field_group_list
+    fields:
+    - name: title
+      type: text
+      config:
+        required: false
+      label: Section
+      description: Peut être vide, dans ce cas le titre de la section ne sera pas
+        affiché, mais les sous-sections oui.
+    - name: url
+      type: text
+      config:
+        required: false
+      label: URL
+      description: idem
+    - name: children
+      type: field_group_list
+      fields:
+      - name: title
+        type: text
+        config:
+          required: false
+        label: Nom de la sous-section
+      - name: url
+        type: text
+        config:
+          required: false
+        label: URL
+      config:
+        min: 
+        max: 
+        labelField: title
+      label: Sous-section
+    config:
+      min: '1'
+      max: 
+      labelField: title
+    label: Arborescence
+  description: Les arborescences associés aux auteurs/assos/collectifs
+  config:
+    labelField: name
+pages:
+- _data/navigation.yml

.forestry/settings.yml

@@ -4,15 +4,63 @@ auto_deploy: false
 admin_path: admin
 webhook_url: 
 sections:
-- type: document
-  path: _data/navigation.yml
-  label: Navigations
-  match: "**/*"
 - type: directory
   path: _pages
-  label: Toutes les pages
+  label: Pages racines
+  create: documents
+  match: "*"
+  templates:
+  - single
+- type: directory
+  path: _pages/allie
+  label: ALLIÉ
+  create: all
+  match: "**/*"
+  templates:
+  - single
+- type: directory
+  path: _pages/cafe-des-langues
+  label: Café des Langues
+  create: all
+  match: "**/*"
+  templates:
+  - single
+- type: directory
+  path: _pages/ccl
+  label: Centre Culturel de Luminy
+  create: all
+  match: "**/*"
+  templates:
+  - single
+- type: directory
+  path: _pages/club-science
+  label: Club de Science
+  create: all
+  match: "**/*"
+  templates:
+  - single
+- type: directory
+  path: _pages/fse
+  label: FSE
+  create: all
+  match: "**/*"
+  templates:
+  - single
+- type: directory
+  path: _pages/jardin
+  label: Jardin
   create: all
   match: "**/*"
+  templates:
+  - single
+- type: heading
+  label: Config
+- type: document
+  path: _data/authors.yml
+  label: Les auteurs
+- type: document
+  path: _data/navigation.yml
+  label: Navigations
 upload_dir: assets/images
 public_path: "/assets/images"
 front_matter_path: ''

_config.yml

@@ -26,6 +26,7 @@ baseurl                  : # the subpath of your site, e.g. "/blog"
 repository               : # GitHub username/repo-name e.g. "mmistakes/minimal-mistakes"
 teaser                   : # path of fallback teaser image, e.g. "/assets/images/500x300.png"
 logo                     : &logo "/assets/images/authors-logo/indien-petit.png"
+banner                   : "/assets/images/puget-fleuri.png"
 masthead_title           : # overrides the website title displayed in the masthead, use " " for no title
 breadcrumbs              : true # true, false (default)
 words_per_minute         : 200
@@ -217,14 +218,12 @@ plugins:
   - jekyll-paginate
   - jekyll-sitemap
   - jekyll-include-cache
-  - jekyll-menus
 
 # mimic GitHub Pages with --safe
 whitelist:
   - jekyll-paginate
   - jekyll-sitemap
   - jekyll-include-cache
-  - jekyll-menus
 
 
 # Archives
@@ -278,9 +277,6 @@ defaults:
     values:
       layout: single
       author_profile: true
-      share: true
       toc_sticky: true
-      header:
-        show_overlay_excerpt: false
       sidebar:
         nav: true

_data/authors.yml

-# /_data/authors.yml
+---
 authors:
-  - name             : "Centre Culturel de Luminy"
-    prefix           : "ccl"
-    avatar           : /assets/images/authors-logo/indien-petit.png
-    og_image         : /assets/images/logo-ccl-grand.png
-    banner           : /assets/images/banniere-ccl-intime.png
-    bio              : "Animer, partager, avancer, s'améliorer, s'amuser"
-    location         : "Luminy"
-    email            : "centre-culturel@luminy.org"
-    facebook         : "CCLuminy"
-    helloasso        : "centre-culturel-de-luminy"
-
-  - name             : "Jardin Universitaire"
-    prefix           : "jardin"
-    avatar           : /assets/images/authors-logo/logo-jardin.png
-    banner           : /assets/images/banniere-jardin.jpg
-    bio              : "Jardin partagé chaleureux et ouvert à tous ! "
-    location         : "Bât. D"
-    email            : "jardin@luminy.org"
-    facebook         : "jardinluminy"
-    helloasso        : "jardin-universitaire-de-luminy"
+- name: Marin
+  prefix: marin
+  avatar: ''
+  og_image: ''
+  banner: ''
+  bio: ''
+  location: ''
+  email: ''
+  facebook: ''
+  helloasso: ''
+- name: Centre Culturel de Luminy
+  prefix: ccl
+  avatar: "/assets/images/authors-logo/indien-petit.png"
+  og_image: "/assets/images/logo-ccl-grand.png"
+  banner: "/assets/images/banniere-ccl-intime.png"
+  bio: Animer, partager, avancer, s'améliorer, s'amuser
+  location: Luminy
+  email: centre-culturel@luminy.org
+  facebook: CCLuminy
+  helloasso: centre-culturel-de-luminy
+- name: Jardin Universitaire
+  prefix: jardin
+  avatar: "/assets/images/authors-logo/logo-jardin.png"
+  banner: "/assets/images/banniere-jardin.jpg"
+  bio: 'Jardin partagé chaleureux et ouvert à tous ! '
+  location: Bât. D
+  email: jardin@luminy.org
+  facebook: jardinluminy
+  helloasso: jardin-universitaire-de-luminy
   links: 
-
-  - name             : "Club de Science Luminy"
-    prefix           : "club-science"
-    avatar           : /assets/images/authors-logo/logo-club-sciences.jpeg
-    bio              : "Organisation de conférences, de cours d'histoire et de philosophie des sciences"
-    location         : "Luminy"
-    email            : "club.science.luminy@gmail.com"
-    facebook         : "Club-de-Science-Luminy-114357542612098/"
-
-  - name             : "FSE Luminy"
-    prefix           : "fse"
-    avatar           : /assets/images/authors-logo/fse-transparent.png
-    bio              : "INFORMER les étudiants, DÉFENDRE leurs droits, et créer la SOLIDARITÉ sur nos campus !"
-    location         : "Cité U & Hexagone"
-    # email            : "club.science.luminy@gmail.com"
-    facebook         : "https://www.facebook.com/FSE.Luminy/"
-
-  - name             : "Café des Langues"
-    prefix           : "cafe-des-langues"
-    avatar           : /assets/images/authors-logo/cafe-des-langues.png
-    bio              : "Venez converser autour d’un bon café et dans une ambiance très conviviale !"
-    location         : "Bibliothèque U."
-    email            : "cafedeslanguesluminy@gmail.com"
-    uri              : "https://www.dropbox.com/sh/6xn3uv56ao1ttkg/AAAAJwwZIFg6zstXIRPo1gdga?dl=0&fbclid=IwAR2Q58fOCrfKTtEBtpShFKWxwarcXTe0NgfJXjMeIcXyrhLsFVKnwR1Z_VA"
-    facebook         : "https://www.facebook.com/cafedeslanguesluminy"
-    twitter          : "Cafe_Langues"
-
-  - name             : "ALLIÉ"
-    prefix           : "allie"
-    avatar           : /assets/images/authors-logo/allie.png
-    bio              : "Association Luminyenne de Lutte et d'Information des Etudiants, est basée à Marseille"
-    location         : "Hexagone"
-    uri              : "http://allie-luminy.e-monsite.com/"
-    email            : "allie@luminy.org"
-    facebook         : "https://www.facebook.com/alliejournal/"
-
+  og_image: ''
+- name: Club de Science Luminy
+  prefix: club-science
+  avatar: "/assets/images/authors-logo/logo-club-sciences.jpeg"
+  bio: Organisation de conférences, de cours d'histoire et de philosophie des sciences
+  location: Luminy
+  email: club.science.luminy@gmail.com
+  facebook: Club-de-Science-Luminy-114357542612098/
+  banner: ''
+  helloasso: ''
+  og_image: ''
+- name: FSE Luminy
+  prefix: fse
+  avatar: "/assets/images/authors-logo/fse-transparent.png"
+  bio: INFORMER les étudiants, DÉFENDRE leurs droits, et créer la SOLIDARITÉ sur nos
+    campus !
+  location: Cité U & Hexagone
+  facebook: https://www.facebook.com/FSE.Luminy/
+  banner: ''
+  email: ''
+  helloasso: ''
+  og_image: ''
+- name: Café des Langues
+  prefix: cafe-des-langues
+  avatar: "/assets/images/authors-logo/cafe-des-langues.png"
+  bio: Venez converser autour d’un bon café et dans une ambiance très conviviale !
+  location: Bibliothèque U.
+  email: cafedeslanguesluminy@gmail.com
+  uri: https://www.dropbox.com/sh/6xn3uv56ao1ttkg/AAAAJwwZIFg6zstXIRPo1gdga?dl=0&fbclid=IwAR2Q58fOCrfKTtEBtpShFKWxwarcXTe0NgfJXjMeIcXyrhLsFVKnwR1Z_VA
+  facebook: https://www.facebook.com/cafedeslanguesluminy
+  twitter: Cafe_Langues
+  banner: ''
+  helloasso: ''
+  og_image: ''
+- name: ALLIÉ
+  prefix: allie
+  avatar: "/assets/images/authors-logo/allie.png"
+  bio: Association Luminyenne de Lutte et d'Information des Etudiants, est basée à
+    Marseille
+  location: Hexagone
+  uri: http://allie-luminy.e-monsite.com/
+  email: allie@luminy.org
+  facebook: https://www.facebook.com/alliejournal/
+  banner: ''
+  helloasso: ''
+  og_image: ''

_data/navigation.yml

-# mashead links
+---
 main:
-  - title: "Agenda"
-    url: /agenda/
-  - title: "Le Grenier"
-    url: /grenier/
-  - title: "À Propos"
-    url: /about/
-
-
-
+- title: Agenda
+  url: "/agenda/"
+- title: Le Grenier
+  url: "/grenier/"
+- title: À Propos
+  url: "/about/"
 navs:
-  - name: "ccl"
+- name: ccl
   nav:
-    - title: "Activités"
+  - title: Activités
     url: "/ccl/activites/"
     children:
-        - title: "Concerts et festivals"
-          url: /ccl/activites/concerts/
-        - title: "Toukouleur"
-          url: /ccl/activites/toukouleur/
-        - title: "Les jeudis du CCL"
-          url: /ccl/activites/jeudis/
-        - title: "Campus propre"
-          url: /ccl/activites/campus-propre/
-        - title: "Projections"
-          url: /ccl/activites/projections/
-        - title: "Ateliers et animation"
-          url: /ccl/activites/ateliers/
-        - title: "Projets"
-          url: /ccl/activites/projets/
-    - title: "L'association"
+    - title: Concerts et festivals
+      url: "/ccl/activites/concerts/"
+    - title: Toukouleur
+      url: "/ccl/activites/toukouleur/"
+    - title: Les jeudis du CCL
+      url: "/ccl/activites/jeudis/"
+    - title: Campus propre
+      url: "/ccl/activites/campus-propre/"
+    - title: Projections
+      url: "/ccl/activites/projections/"
+    - title: Ateliers et animation
+      url: "/ccl/activites/ateliers/"
+    - title: Projets
+      url: "/ccl/activites/projets/"
+  - title: L'association
     url: "/ccl/"
     children:
-        - title: "Qui sommes-nous ?"
-          url: /ccl/l-asso/presentation-longue/
-        - title: "Adhérer"
-          url: /ccl/l-asso/adherer/
-        - title: "Statuts"
-          url: /ccl/l-asso/statuts/
-        - title: "Contacts"
-          url: /ccl/l-asso/contacts/
-  - name: "jardin"
+    - title: Qui sommes-nous ?
+      url: "/ccl/l-asso/presentation-longue/"
+    - title: Adhérer
+      url: "/ccl/l-asso/adherer/"
+    - title: Statuts
+      url: "/ccl/l-asso/statuts/"
+    - title: Contacts
+      url: "/ccl/l-asso/contacts/"
+- name: jardin
   nav:
-    - title: ""
+  - title: ''
     url: "/jardin/"
     children:
-        - title: "Paniers bio"
-          url: /jardin/paniers/
-        - title: "Gallerie"
-          url: /jardin/gallerie/
-  - name: "club-science"
+    - title: Paniers bio
+      url: "/jardin/paniers/"
+    - title: Gallerie
+      url: "/jardin/gallerie/"
+- name: club-science
   nav:
-      - title: "Club science"
-        url: /club-science/
+  - title: Club science
+    url: "/club-science/"
     children:
-          - title: "Ressources"
-            url: /club-science/ressources/
-          - title: "Contacts"
-            utl: /club-science/contacts/
-  - name: "fse"
+    - title: Ressources
+      url: "/club-science/ressources/"
+    - title: Contacts
+      utl: "/club-science/contacts/"
+      url: ''
+- name: fse
   nav:
-      - title: "FSE Luminy"
-        url: /fse/
+  - title: FSE Luminy
+    url: "/fse/"
     children:
-          - title: "Communiqués de presse"
-            url: /fse/communiques
+    - title: Communiqués de presse
+      url: "/fse/communiques"

_includes/author-profile.html

 <!-- {% assign author = page.author | default: page.authors[0] | default: site.author %} -->
+{% unless page.author %}
   {% assign author = page.url | split: "/" %}
   {% assign author = author[1] %}
+{% endunless %}
 {% assign author = site.data.authors.authors | where: "prefix", author | first %}
 
 <div itemscope itemtype="https://schema.org/Person">

_includes/page__hero.html

-{% if page.header.image contains "://" %}
-  {% capture img_path %}{{ page.header.image }}{% endcapture %}
+{% if page.header.type == 'default' %}
+  {% capture header_type %}overlay{% endcapture %}
+  {% capture overlay_title %}true{% endcapture %}
+  {% capture overlay_text %}{{ page.header.description }}{% endcapture %}
+  {% capture overlay_actions %}false{% endcapture %}
+  {% capture img_path %}{{ author.banner | default: site.banner }}{% endcapture %}
 {% else %}
-  {% capture img_path %}{{ page.header.image | relative_url }}{% endcapture %}
+
+  {% capture header_type %}{{ page.header.type }}{% endcapture %}
+
+  {% if page.header.fixed_image contains "://" %}
+    {% capture fixed_img_path %}{{ page.header.fixed_image}}{% endcapture %}
+  {% else %}
+    {% capture fixed_img_path %}{{ page.header.fixed_image | relative_url }}{% endcapture %}
+  {% endif %}
+
+  {% if page.header.overlay_image contains "://" %}
+    {% capture overlay_img_path %}{{ page.header.overlay_image }}{% endcapture %}
+  {% elsif page.header.overlay_image %}
+    {% capture overlay_img_path %}{{ page.header.overlay_image | relative_url }}{% endcapture %}
+  {% endif %}
+
+  {% if header_type == 'overlay' %}
+    {% capture img_path %}{{ overlay_img_path }}{% endcapture %}
+  {% elsif header_type == 'image' %}
+    {% capture img_path %}{{ fixed_img_path }}{% endcapture %}
+  {% endif %}
+
+  {% capture overlay_title %}{{ page.header.overlay_title }}{% endcapture %}
+
+  {% if page.header.show_text == 'description' %}
+    {% capture overlay_text %}{{ page.description }}{% endcapture %}
+  {% elsif page.header.show_text == 'custom' %}
+    {% capture overlay_text %}{{ page.header.custom_text }}{% endcapture %}
+  {% endif %}
+
+  {% if page.header.actions %}
+    {% assign overlay_actions = true %}
+  {% endif %}
 {% endif %}
 
 {% if page.header.cta_url contains "://" %}
@@ -10,14 +45,6 @@
   {% capture cta_path %}{{ page.header.cta_url | relative_url }}{% endcapture %}
 {% endif %}
 
-{% if page.overlay_image contains "://" %}
-  {% capture overlay_img_path %}{{ page.overlay_image }}{% endcapture %}
-{% elsif page.overlay_image %}
-  {% capture overlay_img_path %}{{ page.overlay_image | relative_url }}{% endcapture %}
-{% elsif author.banner %}
-  {% capture overlay_img_path %}{{ author.banner | relative_url }}{% endcapture %}
-{% endif %}
-
 {% if page.header.overlay_filter contains "rgba" %}
   {% capture overlay_filter %}{{ page.header.overlay_filter }}{% endcapture %}
 {% elsif page.header.overlay_filter %}
@@ -32,11 +59,22 @@
 
 {% assign image_description = image_description | markdownify | strip_html | strip_newlines | escape_once %}
 
-<div class="page__hero{% if page.header.overlay_color or page.overlay_image or author.banner %}--overlay{% endif %}"
-  style="{% if page.header.overlay_color %}background-color: {{ page.header.overlay_color | default: 'transparent' }};{% endif %} {% if overlay_img_path %}background-image: {% if overlay_filter %}linear-gradient({{ overlay_filter }}, {{ overlay_filter }}), {% endif %}url('{{ overlay_img_path }}');{% endif %}"
+<div class="page__hero{% if header_type == 'overlay' %}--overlay{% endif %}"
+  style="{% if header_type == 'overlay' %}
+          {% if page.header.color %}
+            background-color: {{ page.header.color | default: 'transparent' }};
+          {% endif %}
+          {% if img_path %}
+            background-image:
+            {% if overlay_filter %}
+              linear-gradient({{ overlay_filter }},
+            {{ overlay_filter }}),{% endif %}
+          {% endif %}url('{{ img_path }}');
+        {% endif %}"
 >
-  {% if page.overlay_image or author.banner %}
+    {% if header_type == 'overlay' %}
     <div class="wrapper">
+    {% if overlay_title %}
         <h1 id="page-title" class="page__title" itemprop="headline">
         {% if paginator and site.paginate_show_page_num %}
             {{ site.title }}{% unless paginator.page == 1 %} {{ site.data.ui-text[site.locale].page | default: "Page" }} {{ paginator.page }}{% endunless %}
@@ -44,8 +82,9 @@
             {{ page.title | default: site.title | markdownify | remove: "<p>" | remove: "</p>" }}
         {% endif %}
         </h1>
-      {% if page.header.show_overlay_excerpt != false and page.excerpt %}
-        <p class="page__lead">{{ page.excerpt | markdownify | remove: "<p>" | remove: "</p>" }}</p>
+    {% endif %}
+    {% if overlay_text %}
+        <p class="page__lead">{{ overlay_text | markdownify | remove: "<p>" | remove: "</p>" }}</p>
     {% endif %}
     {% if page.read_time %}
         <p class="page__meta"><i class="far fa-clock" aria-hidden="true"></i> {% include read-time.html %}</p>
@@ -53,7 +92,7 @@
     {% if page.header.cta_url %}
         <p><a href="{{ cta_path }}" class="btn btn--light-outline btn--large">{{ page.header.cta_label | default: site.data.ui-text[site.locale].more_label | default: "Learn More" }}</a></p>
     {% endif %}
-      {% if page.header.actions %}
+    {% if overlay_actions == true and page.header.actions %}
         <p>
         {% for action in page.header.actions %}
         {% if action.url contains "://" %}
@@ -65,10 +104,14 @@
         {% endfor %}
     {% endif %}
     </div>
-  {% else %}
-    <img src="{{ img_path }}" alt="{{ image_description }}" class="page__hero-image">
-  {% endif %}
     {% if page.header.caption %}
         <span class="page__hero-caption">{{ page.header.caption | markdownify | remove: "<p>" | remove: "</p>" }}</span>
     {% endif %}
+  {% elsif header_type == 'image' %}
+    <img src="{{ img_path }}" alt="{{ img_path }}" class="page__hero-image">
+  {% elsif page.header_type == 'video' %}
+    {% capture video_id %}{{ page.header.video.id }}{% endcapture %}
+    {% capture video_provider %}{{ page.header.video.provider }}{% endcapture %}
+    {% include video id=video_id provider=video_provider %}
+  {% endif %}
 </div>

_includes/page__hero_video.html

-{% capture video_id %}{{ page.header.video.id }}{% endcapture %}
-{% capture video_provider %}{{ page.header.video.provider }}{% endcapture %}
-
-{% include video id=video_id provider=video_provider %}

_includes/seo.html

@@ -25,6 +25,7 @@
   {%- assign seo_description = seo_description | markdownify | strip_html | strip_newlines | escape_once -%}
 {%- endif -%}
 
+<!-- don't use page.author even if it is set, find author based on url -->
 {% assign author = page.url | split: "/" %}
 {% assign author = author[1] %}
 {% assign author = site.data.authors.authors | where: "prefix", author | first %}

_layouts/single.html

@@ -2,14 +2,14 @@
 layout: default
 ---
 
+{% unless page.author %}
   {% assign author = page.url | split: "/" %}
   {% assign author = author[1] %}
+{% endunless %}
 {% assign author = site.data.authors.authors | where: "prefix", author | first %}
 
-{% if page.header.overlay_color or page.overlay_image or page.header.image or author.banner %}
+{% if page.has_header %}
   {% include page__hero.html %}
-{% elsif page.header.video.id and page.header.video.provider %}
-  {% include page__hero_video.html %}
 {% endif %}
 
 {% if page.url != "/" and site.breadcrumbs %}
@@ -28,8 +28,7 @@ layout: default
     {% if page.last_modified_at %}<meta itemprop="dateModified" content="{{ page.last_modified_at | date: "%B %d, %Y" }}">{% endif %}
 
     <div class="page__inner-wrap">
-      {% unless page.header.overlay_color or page.overlay_image or author.banner %}
-        {% unless page.no_title %}
+      {% unless page.header.type == 'overlay' or page.header.type == 'default' %}
         <header>
           {% if page.title %}<h1 id="page-title" class="page__title" itemprop="headline">{{ page.title | markdownify | remove: "<p>" | remove: "</p>" }}</h1>{% endif %}
           {% if page.read_time %}
@@ -37,7 +36,6 @@ layout: default
           {% endif %}
         </header>
       {% endunless %}
-      {% endunless %}
 
       <section class="page__content" itemprop="text">
         {% if page.toc %}

_pages/404.md

@@ -3,10 +3,5 @@ title: Page non trouvée
 permalink: "/404.html"
 author_profile: false
 share: false
-menu:
-  footer:
-    title: Des témoignages
-    weight: 1
-
 ---
 # 404

_pages/about.md

 ---
 title: Votre projet sur `luminy.org`
-menu:
-  header:
-    weight: 2
-    title: À propos
-
 ---
 ## Contribuez au référencement des activités luminyennes
 Vous êtes actifs sur Luminy ? Vous participez, contribuez ou organisez des

_pages/agenda.md

 ---
 title: Agenda
----
+description: Agenda commun luminy.org
+has_header: false
+header:
+  type: default
 
+---
 <iframe
 src="https://calendar.google.com/calendar/b/1/embed?height=600&amp;wkst=2&amp;bgcolor=%23ffffff&amp;ctz=Europe%2FParis&amp;src=bGVwdWdldEBsdW1pbnkub3Jn&amp;src=ZnIuZnJlbmNoI2hvbGlkYXlAZ3JvdXAudi5jYWxlbmRhci5nb29nbGUuY29t&amp;src=dm9ubTE3aG5jcDJtcWJmMXA0NGk4dDUxMjdydGszZmFAaW1wb3J0LmNhbGVuZGFyLmdvb2dsZS5jb20&amp;color=%23D6AE00&amp;color=%233366CC&amp;color=%233366CC&amp;showCalendars=1&amp;showPrint=0&amp;showNav=1"
 style="border-width:0" width="800" height="600" frameborder="0"

_pages/ccl/activites/lorem-ipsum.md

+---
+last_modified_at: 2019-11-24T19:12:07.000+00:00
+toc: true
+has_header: true
+header:
+  type: default
+  overlay_title: true
+  show_text: description
+  color: "#AC6B6B"
+  overlay_image: "/assets/images/banniere-jardin.jpg"
+  fixed_image: "/assets/images/atelier-mix.jpg"
+  overlay_text: ''
+  caption: Crédit
+  actions:
+  - label: Facebook
+    url: http://facebook.com
+    fa-icon: facebook
+title: Lorem Ipsum
+classes: wide
+description: Une description incroyable
+
+---
+# Eundem exemplo ternis moenia labor super Tenedos
+
+## Dum quamvis praeceps silvis
+
+Lorem markdownum prior, deriguisse cineres, virgo alto mollia **vulnere**. Ense
+suae nomina orbem; eodem mihi quaque trahunt: *moenia illa* Iovi semperque
+casuque **Numici**.
+
+- Consilium semimarem
+- Aries utque superamur iaculum exit Procnes
+- Mollem quem ferebam clamoribus hos auxiliaribus signo
+- Phoebus cecidere crimine
+- Ille tenebat solus etiam quondam Argosque ferum
+
+## Tibi tuum amens hoc
+
+Sollemnia ad tardus Odrysius illic face [ille](http://quis.org/) modulatur quo
+illis egisse capere. Audito inbellibus scylla. Adversos esse antiquum prima
+doleam: exercet uror cui tota vincta. Et est suo te omni unguibus mensis
+viscera; quem quem nymphis fontis.
+
+- Perde esse haustae
+- Marinae exitus genu per simillima formae de
+- Inque securum rura illum fere rursus stamina
+- Est satiatae ardor regione
+
+Terris domo undis qualia a vivacem flumina at memores tardi inter ventis,
+oblectamina pater placere. Et Symplegadas serpere at Iove loca virum mento
+**litorei**, omnia. Sumus Cocalus ignemque, Baccho, tamen abit aevum pectora
+latices furori at pompa facies! Et quoque, coniecto cladibus spiritus.
+
+## Tenet spina fugacis
+
+Eodem quotiensque pallor visus periuria annis, trunco natorum; medium, in unda!
+Nam admovit pedes erat, ima cantu Hectoris parcere **visa**. Cupidine aere quid
+que *meae*. Vultus Curibusque invocat sistrorum Olympi sonuit tenuit funeribus.
+
+    interpreterSyntaxFiber.ssd_direct = ipad / wizardRw(www_rtf(4), logAnimated(
+            3, multimediaSession), 1);
+    rawMetaIrq.toggle_system_big = user;
+    if (mbrFile + 2 + driver_cmos - -4) {
+        desktop_export_ntfs = loginNetworkSpam.thermistor_drive(-3 + nat);
+        handle_queue_im.pseudocodeOpenMashup = compatible;
+        cpaBareBalancing(-3 + web_network, ram_dual_name, threading_ppga);
+    }
+    var flaming = dashboard_archive_vpi(flash, 873971, latency);
+
+Neve Iovi nepos, templum et: rupisset veteris atque. Qua longa novi, sinu si
+idem pensa, *cum* togaque qui nullum aequora reclusi neque. Pulsisque es sorores
+calcitrat saevorum, sed ferit quae *umbram inquit*. Esse tamque quae voces vidit
+firma fugio debita, pennas coloribus. Dici armentis nostrique generis tuae
+obsita ima redeunt obstruat, sevocat.
+
+Delphica vestri, illum et cruore *faveatque Lycopen tecta*. Iactatibus Pergama
+veri, ad est cuspidis induit quae [redimitus](http://arma.com/furta) tenus, in.
+Ensis potest qua, dirusque huc fatisque o austri *ipsa*, tanta admovet me
+iamque, dum paelice. Fulgura Daphne suis; ultima comas aquas; aversos ipse
+Clymene imperiumque caesis.
\ No newline at end of file

_pages/ccl/index.md

 ---
 title: Le CCL
-no_title: true
+has_header: true
 header:
-  image: assets/images/banniere-ccl-intime.png
+  type: image
+  fixed_image: assets/images/banniere-ccl-intime.png
 ---
 
 ## Le CCL, c'est nous ! C'est vous ! C'est tous ceux qui ont envie de faire, de partager et de proposer pour que bouge ce campus !

_pages/ccl/l-asso/adherer.md

 ---
 title: Adhésion et soutiens
-menu: ccl-l-asso
 toc: true
 share: true
 overlay_image: assets/images/banniere-bulles.png

_pages/ccl/l-asso/bureau.md

 ---
 title: Bureaux du CCL au fil des années
-menu: ccl-l-asso
 section: ccl
 ---
 ## 2019-2020

_pages/ccl/l-asso/contacts.md

 ---
 title: Contacts
-menu: ccl-l-asso
 no_title: true
 section: ccl
 toc: true