From 69292f76a893aeb48061f48b7c1b80c17a38f168 Mon Sep 17 00:00:00 2001
From: Eloi Perdereau <eloi@perdereau.eu>
Date: Sun, 17 Nov 2019 05:29:45 +0100
Subject: [PATCH] large update
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
- refonte structure: 1 auteur par dossier
- navigation par auteur
- auteur déduit du path
- maj des priorités sur og_image
- ajout og_image par défaut par auteur
- ...
---
_config.yml | 9 +-
_data/authors.yml | 9 +-
_data/navigation.yml | 97 ++++++++++---------
_includes/author-profile.html | 4 +-
_includes/page__hero.html | 6 +-
_includes/seo.html | 7 +-
_includes/sidebar.html | 4 +-
_layouts/single.html | 9 +-
_pages/{luminy/votre-projet.md => about.md} | 0
_pages/{ => ccl}/activites/ateliers.md | 0
_pages/{ => ccl}/activites/club-science.md | 0
_pages/{ => ccl}/activites/index.md | 0
_pages/{ => ccl}/activites/toukouleur.md | 1 +
_pages/{old => ccl/grenier}/index.md | 0
_pages/{old => ccl/grenier}/toukouleur2014.md | 0
_pages/ccl/index.md | 5 +-
_pages/ccl/{ => l-asso}/adherer.md | 2 +-
_pages/ccl/{ => l-asso}/bureau.md | 0
_pages/{ => ccl/l-asso}/contacts.md | 0
.../{snippets => l-asso}/devenir-benevole.md | 0
.../ccl/{ => l-asso}/presentation-longue.md | 0
_pages/ccl/{ => l-asso}/statuts.md | 0
_pages/{luminy => }/comnsea.md | 1 -
_pages/detail-site.md | 4 -
_pages/index.md | 6 +-
_pages/jardin/gallerie.md | 5 +
_pages/{luminy/jardin.md => jardin/index.md} | 3 -
_pages/{luminy => jardin}/paniers.md | 6 +-
_pages/luminy/index.md | 9 --
_pages/test.md | 5 -
30 files changed, 98 insertions(+), 94 deletions(-)
rename _pages/{luminy/votre-projet.md => about.md} (100%)
rename _pages/{ => ccl}/activites/ateliers.md (100%)
rename _pages/{ => ccl}/activites/club-science.md (100%)
rename _pages/{ => ccl}/activites/index.md (100%)
rename _pages/{ => ccl}/activites/toukouleur.md (95%)
rename _pages/{old => ccl/grenier}/index.md (100%)
rename _pages/{old => ccl/grenier}/toukouleur2014.md (100%)
rename _pages/ccl/{ => l-asso}/adherer.md (94%)
rename _pages/ccl/{ => l-asso}/bureau.md (100%)
rename _pages/{ => ccl/l-asso}/contacts.md (100%)
rename _pages/ccl/{snippets => l-asso}/devenir-benevole.md (100%)
rename _pages/ccl/{ => l-asso}/presentation-longue.md (100%)
rename _pages/ccl/{ => l-asso}/statuts.md (100%)
rename _pages/{luminy => }/comnsea.md (98%)
delete mode 100644 _pages/detail-site.md
create mode 100644 _pages/jardin/gallerie.md
rename _pages/{luminy/jardin.md => jardin/index.md} (51%)
rename _pages/{luminy => jardin}/paniers.md (67%)
delete mode 100644 _pages/luminy/index.md
delete mode 100644 _pages/test.md
diff --git a/_config.yml b/_config.yml
index c460d6a..17a3d65 100644
--- a/_config.yml
+++ b/_config.yml
@@ -27,7 +27,7 @@ repository : # GitHub username/repo-name e.g. "mmistakes/minimal-m
teaser : # path of fallback teaser image, e.g. "/assets/images/500x300.png"
logo : &logo "/assets/images/logo-ccl-grand.png"
masthead_title : # overrides the website title displayed in the masthead, use " " for no title
-# breadcrumbs : false # true, false (default)
+breadcrumbs : true # true, false (default)
words_per_minute : 200
comments:
provider : # false (default), "disqus", "discourse", "facebook", "staticman", "staticman_v2", "utterances", "custom"
@@ -116,7 +116,6 @@ footer:
icon: "fab fa-fw fa-facebook-square"
url: "https://facebook.com/CCLuminy"
- label: "HelloAsso"
- icon: "fas fa-fw fa-fire"
url: "https://www.helloasso.com/associations/centre-culturel-de-luminy"
- label: "GitHub"
icon: "fab fa-fw fa-github"
@@ -251,8 +250,6 @@ compress_html:
ignore:
envs: development
-exclude: [ "*/snippets/", ]
-
# see _data/authors.yml
author: ccl
@@ -268,9 +265,9 @@ defaults:
values:
layout: single
author_profile: true
- share: false
+ share: true
toc_sticky: true
header:
show_overlay_excerpt: false
sidebar:
- nav: tout
+ nav: true
diff --git a/_data/authors.yml b/_data/authors.yml
index d0014df..477783c 100644
--- a/_data/authors.yml
+++ b/_data/authors.yml
@@ -1,7 +1,10 @@
# /_data/authors.yml
ccl:
name : "CCL"
+ 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"
@@ -21,7 +24,9 @@ ccl:
jardin:
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"
@@ -33,8 +38,9 @@ jardin:
# icon: "fas fa-fw fa-link"
# url: "https://www.helloasso.com/associations/centre-culturel-de-luminy"
-com:
+comnsea:
name : "Com & Sea"
+ prefix : "comnsea"
avatar : /assets/images/authors-logo/logo-com.png
bio : "Association d'Océanologie"
location : "Hexagone"
@@ -49,6 +55,7 @@ com:
club-science:
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"
diff --git a/_data/navigation.yml b/_data/navigation.yml
index 27e0819..b4dbbb5 100644
--- a/_data/navigation.yml
+++ b/_data/navigation.yml
@@ -1,4 +1,4 @@
-# main links
+# mashead links
main:
- title: "Le CCL"
url: /ccl/
@@ -9,58 +9,67 @@ main:
- title: "Contacts"
url: /contacts/
-# navigation sidebar
-tout:
- - title: "Le CCL"
- url: "/ccl/"
- children:
- - title: "Qui sommes-nous ?"
- url: /ccl/presentation-longue/
- - title: "Adhérer"
- url: /ccl/adherer/
- - title: "Statuts"
- url: /ccl/statuts/
- - title: "Contacts"
- url: /contacts/
- - title: "Agenda"
- url: "/agenda/"
+ccl:
- title: "Activités"
- url: "/activites/"
+ url: "/ccl/activites/"
children:
- title: "Concerts et festivals"
- url: /activites/concerts/
+ url: /ccl/activites/concerts/
- title: "Toukouleur"
- url: /activites/toukouleur/
+ url: /ccl/activites/toukouleur/
- title: "Les jeudis du CCL"
- url: /activites/jeudis/
+ url: /ccl/activites/jeudis/
- title: "Campus propre"
- url: /activites/campus-propre/
+ url: /ccl/activites/campus-propre/
- title: "Club de science"
- url: /activites/club-science/
+ url: /ccl/activites/club-science/
- title: "Projections"
- url: /activites/projections/
+ url: /ccl/activites/projections/
- title: "Ateliers et animation"
- url: /activites/ateliers/
+ url: /ccl/activites/ateliers/
- title: "Projets"
- url: /activites/projets/
- - title: "Luminy"
- url: "/luminy/"
+ 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/
+
+jardin:
+ - title: ""
+ url: "/jardin/"
children:
- - title: "Jardin Universitaire"
- url: /luminy/jardin/
- title: "Paniers bio"
- url: /luminy/paniers/
- - title: "Asso ALLIE"
- url: /luminy/allie/
- - title: "Conseil des résidents"
- url: /luminy/conseil-residents/
- - title: "Asso ERASMUS"
- url: /luminy/erasmus/
- - title: "Asso Com & Sea"
- url: /luminy/comnsea/
- - title: "FSE"
- url: /luminy/fse/
- - title: "Votre projet"
- url: /luminy/votre-projet/
- - title: "Notre projet"
- url: /luminy/votre-projet/
+ url: /jardin/paniers/
+ - title: "Gallerie"
+ url: /jardin/gallerie/
+
+# autre:
+# - title: "Asso ALLIE"
+# url: /luminy/allie/
+# - title: "Conseil des résidents"
+# url: /luminy/conseil-residents/
+# - title: "Asso ERASMUS"
+# url: /luminy/erasmus/
+# - title: "Asso Com & Sea"
+# url: /luminy/comnsea/
+# - title: "FSE"
+# url: /luminy/fse/
+
+# # navigation sidebar
+# footer:
+# - title: "Agenda"
+# url: "/agenda/"
+# - title: "Luminy"
+# url: "/luminy/"
+# children:
+# - title: "Votre projet"
+# url: /luminy/votre-projet/
+# - title: "Notre projet"
+# url: /luminy/votre-projet/
diff --git a/_includes/author-profile.html b/_includes/author-profile.html
index 58fac05..9bd7d80 100644
--- a/_includes/author-profile.html
+++ b/_includes/author-profile.html
@@ -1,4 +1,6 @@
-{% assign author = page.author | default: page.authors[0] | default: site.author %}
+<!-- {% assign author = page.author | default: page.authors[0] | default: site.author %} -->
+{% assign author = page.url | split: "/" %}
+{% assign author = author[1] %}
{% assign author = site.data.authors[author] | default: author %}
<div itemscope itemtype="https://schema.org/Person">
diff --git a/_includes/page__hero.html b/_includes/page__hero.html
index 98bff72..e20deff 100644
--- a/_includes/page__hero.html
+++ b/_includes/page__hero.html
@@ -14,6 +14,8 @@
{% 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 %}
+{% elsif author.banner %}
+ {% capture overlay_img_path %}{{ author.banner | relative_url }}{% endcapture %}
{% endif %}
{% if page.header.overlay_filter contains "rgba" %}
@@ -30,10 +32,10 @@
{% assign image_description = image_description | markdownify | strip_html | strip_newlines | escape_once %}
-<div class="page__hero{% if page.header.overlay_color or page.header.overlay_image %}--overlay{% endif %}"
+<div class="page__hero{% if page.header.overlay_color or page.header.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 %}"
>
- {% if page.header.overlay_color or page.header.overlay_image %}
+ {% if page.header.overlay_color or page.header.overlay_image or author.banner %}
<div class="wrapper">
<h1 id="page-title" class="page__title" itemprop="headline">
{% if paginator and site.paginate_show_page_num %}
diff --git a/_includes/seo.html b/_includes/seo.html
index ead2d1f..a557cb5 100644
--- a/_includes/seo.html
+++ b/_includes/seo.html
@@ -25,14 +25,15 @@
{%- assign seo_description = seo_description | markdownify | strip_html | strip_newlines | escape_once -%}
{%- endif -%}
-{%- assign author = page.author | default: page.authors[0] | default: site.author -%}
-{%- assign author = site.data.authors[author] | default: author -%}
+{% assign author = page.url | split: "/" %}
+{% assign author = author[1] %}
+{% assign author = site.data.authors[author] | default: author %}
{%- if author.twitter -%}
{%- assign author_twitter = author.twitter | replace: "@", "" -%}
{%- endif -%}
-{%- assign page_large_image = page.header.og_image | default: page.header.overlay_image | default: page.header.image -%}
+{%- assign page_large_image = page.og_image | default: author.og_image | default: author.avatar | default: page.header.overlay_image | default: page.header.image -%}
{%- unless page_large_image contains '://' -%}
{%- assign page_large_image = page_large_image | absolute_url -%}
{%- endunless -%}
diff --git a/_includes/sidebar.html b/_includes/sidebar.html
index 2a1884e..d313046 100644
--- a/_includes/sidebar.html
+++ b/_includes/sidebar.html
@@ -17,8 +17,8 @@
{% if s.nav %}{% include nav_list nav=s.nav %}{% endif %}
{% endfor %}
{% if page.sidebar.nav %}
- {% include nav_list nav=page.sidebar.nav %}
+ {% include nav_list nav=author.prefix %}
{% endif %}
{% endif %}
</div>
-{% endif %}
\ No newline at end of file
+{% endif %}
diff --git a/_layouts/single.html b/_layouts/single.html
index 4551125..a703c19 100644
--- a/_layouts/single.html
+++ b/_layouts/single.html
@@ -2,7 +2,11 @@
layout: default
---
-{% if page.header.overlay_color or page.header.overlay_image or page.header.image %}
+{% assign author = page.url | split: "/" %}
+{% assign author = author[1] %}
+{% assign author = site.data.authors[author] | default: author %}
+
+{% if page.header.overlay_color or page.header.overlay_image or page.header.image or author.banner %}
{% include page__hero.html %}
{% elsif page.header.video.id and page.header.video.provider %}
{% include page__hero_video.html %}
@@ -24,7 +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.header.overlay_image %}
+ {% unless page.header.overlay_color or page.header.overlay_image or author.banner %}
{% unless page.no_title %}
<header>
{% if page.title %}<h1 id="page-title" class="page__title" itemprop="headline">{{ page.title | markdownify | remove: "<p>" | remove: "</p>" }}</h1>{% endif %}
@@ -93,3 +97,4 @@ layout: default
</div>
{% endif %}
</div>
+
diff --git a/_pages/luminy/votre-projet.md b/_pages/about.md
similarity index 100%
rename from _pages/luminy/votre-projet.md
rename to _pages/about.md
diff --git a/_pages/activites/ateliers.md b/_pages/ccl/activites/ateliers.md
similarity index 100%
rename from _pages/activites/ateliers.md
rename to _pages/ccl/activites/ateliers.md
diff --git a/_pages/activites/club-science.md b/_pages/ccl/activites/club-science.md
similarity index 100%
rename from _pages/activites/club-science.md
rename to _pages/ccl/activites/club-science.md
diff --git a/_pages/activites/index.md b/_pages/ccl/activites/index.md
similarity index 100%
rename from _pages/activites/index.md
rename to _pages/ccl/activites/index.md
diff --git a/_pages/activites/toukouleur.md b/_pages/ccl/activites/toukouleur.md
similarity index 95%
rename from _pages/activites/toukouleur.md
rename to _pages/ccl/activites/toukouleur.md
index ed70a7c..b8cd076 100644
--- a/_pages/activites/toukouleur.md
+++ b/_pages/ccl/activites/toukouleur.md
@@ -1,5 +1,6 @@
---
title: Toukouleur
+author_profile: true
toc: true
description: Le festival Toukouleur organisé chaque année par le CCL!
header:
diff --git a/_pages/old/index.md b/_pages/ccl/grenier/index.md
similarity index 100%
rename from _pages/old/index.md
rename to _pages/ccl/grenier/index.md
diff --git a/_pages/old/toukouleur2014.md b/_pages/ccl/grenier/toukouleur2014.md
similarity index 100%
rename from _pages/old/toukouleur2014.md
rename to _pages/ccl/grenier/toukouleur2014.md
diff --git a/_pages/ccl/index.md b/_pages/ccl/index.md
index 3cd5d0f..aa0f2aa 100644
--- a/_pages/ccl/index.md
+++ b/_pages/ccl/index.md
@@ -1,9 +1,8 @@
---
title: Le CCL
-category_name: "ccl"
+no_title: true
header:
image: assets/images/banniere-ccl-intime.png
- og_image: assets/images/logo-com-grand.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 !
@@ -25,7 +24,7 @@ Ou bien apprenez à nous connaitre en surfant et découvrez nos activités
[Voir le plan de Luminy](/assets/images/plan-luminy-ccl.png)
-{% include_relative snippets/devenir-benevole.md %}
+{% include_relative l-asso/devenir-benevole.md %}
## En savoir plus
{% assign section_pages = site.pages | where: 'section', 'ccl' %}
diff --git a/_pages/ccl/adherer.md b/_pages/ccl/l-asso/adherer.md
similarity index 94%
rename from _pages/ccl/adherer.md
rename to _pages/ccl/l-asso/adherer.md
index 1d37b4c..ce34a5c 100644
--- a/_pages/ccl/adherer.md
+++ b/_pages/ccl/l-asso/adherer.md
@@ -27,4 +27,4 @@ Culturel de Luminy.
{: .notice}
-{% include_relative snippets/devenir-benevole.md %}
+{% include_relative devenir-benevole.md %}
diff --git a/_pages/ccl/bureau.md b/_pages/ccl/l-asso/bureau.md
similarity index 100%
rename from _pages/ccl/bureau.md
rename to _pages/ccl/l-asso/bureau.md
diff --git a/_pages/contacts.md b/_pages/ccl/l-asso/contacts.md
similarity index 100%
rename from _pages/contacts.md
rename to _pages/ccl/l-asso/contacts.md
diff --git a/_pages/ccl/snippets/devenir-benevole.md b/_pages/ccl/l-asso/devenir-benevole.md
similarity index 100%
rename from _pages/ccl/snippets/devenir-benevole.md
rename to _pages/ccl/l-asso/devenir-benevole.md
diff --git a/_pages/ccl/presentation-longue.md b/_pages/ccl/l-asso/presentation-longue.md
similarity index 100%
rename from _pages/ccl/presentation-longue.md
rename to _pages/ccl/l-asso/presentation-longue.md
diff --git a/_pages/ccl/statuts.md b/_pages/ccl/l-asso/statuts.md
similarity index 100%
rename from _pages/ccl/statuts.md
rename to _pages/ccl/l-asso/statuts.md
diff --git a/_pages/luminy/comnsea.md b/_pages/comnsea.md
similarity index 98%
rename from _pages/luminy/comnsea.md
rename to _pages/comnsea.md
index 5a4c37b..b7e3f84 100644
--- a/_pages/luminy/comnsea.md
+++ b/_pages/comnsea.md
@@ -1,6 +1,5 @@
---
title: Com & Sea
-author: com
header:
image: assets/images/logo-com-grand.png
---
diff --git a/_pages/detail-site.md b/_pages/detail-site.md
deleted file mode 100644
index 831c0b4..0000000
--- a/_pages/detail-site.md
+++ /dev/null
@@ -1,4 +0,0 @@
----
-title: luminy.org
----
-c'est quoi luminy.org
diff --git a/_pages/index.md b/_pages/index.md
index b8bb5df..e3e443b 100644
--- a/_pages/index.md
+++ b/_pages/index.md
@@ -19,21 +19,21 @@ feature_row:
title: "Des paniers bio"
excerpt: "Livrés chaque jeudi, des légumes d'Arles à commander! Contrats de
solidarité avec en producteur."
- url: "/luminy/paniers/"
+ url: "/jardin/paniers/"
btn_class: "btn--primary"
btn_label: "Plus"
- image_path: assets/images/logo-jardin-grand.png
alt: "jardin"
title: "Jardin"
excerpt: "Découvrez le jardin! Projet lancé par le CCL en 2014, désormais indépendant"
- url: "/activites/jardin/"
+ url: "/jardin/"
btn_class: "btn--primary"
btn_label: "Plus"
- image_path: assets/images/theatre-rouge.jpg
alt: "ateliers"
title: "Ateliers"
excerpt: "Des ateliers à gogo"
- url: "/activites/ateliers/"
+ url: "/ccl/activites/ateliers/"
btn_class: "btn--primary"
btn_label: "Plus"
---
diff --git a/_pages/jardin/gallerie.md b/_pages/jardin/gallerie.md
new file mode 100644
index 0000000..50a6968
--- /dev/null
+++ b/_pages/jardin/gallerie.md
@@ -0,0 +1,5 @@
+---
+title: Gallerie du jardin
+---
+
+des images...
diff --git a/_pages/luminy/jardin.md b/_pages/jardin/index.md
similarity index 51%
rename from _pages/luminy/jardin.md
rename to _pages/jardin/index.md
index 36b3fd1..bf0f627 100644
--- a/_pages/luminy/jardin.md
+++ b/_pages/jardin/index.md
@@ -1,8 +1,5 @@
---
title: Jardin Universitaire de Luminy
-author: jardin
-header:
- overlay_image: assets/images/banniere-jardin.jpg
---
# c'est le jardin
gloubi boulga
diff --git a/_pages/luminy/paniers.md b/_pages/jardin/paniers.md
similarity index 67%
rename from _pages/luminy/paniers.md
rename to _pages/jardin/paniers.md
index 445a09e..845b89f 100644
--- a/_pages/luminy/paniers.md
+++ b/_pages/jardin/paniers.md
@@ -1,9 +1,7 @@
---
-title: Jardin Universitaire de Luminy
-author_profile: false
-image: /assets/images/panier.png
+title: Les paniers bio !
header:
- overlay_image: assets/images/banniere-jardin.jpg
+ overlay_image: assets/images/banniere-bulles.png
---
Tous les jeudis, les paniers marseillais proposent des produits bio en direct de chez les producteurs ; légumes, fruits, œufs, pain, jus, vin, huile, olives, fruits secs, vinaigre, viande, fromages, ...
diff --git a/_pages/luminy/index.md b/_pages/luminy/index.md
deleted file mode 100644
index 4a920fe..0000000
--- a/_pages/luminy/index.md
+++ /dev/null
@@ -1,9 +0,0 @@
----
-title: Luminy c'est aussi
-category_name: "luminy"
-toc: true
-header:
- overlay_image: assets/images/banniere-hexagone.png
----
-
-pleins de choses sur luminy...
diff --git a/_pages/test.md b/_pages/test.md
deleted file mode 100644
index 0cb96be..0000000
--- a/_pages/test.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: page collection 'pages'
----
-
-ici
--
GitLab