Skip to content
Snippets Groups Projects
Commit 69292f76 authored by Eloi Perdereau's avatar Eloi Perdereau
Browse files

large update

    - 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
    - ...
parent 40f55ab8
Branches
No related tags found
No related merge requests found
Showing
with 88 additions and 65 deletions
...@@ -27,7 +27,7 @@ repository : # GitHub username/repo-name e.g. "mmistakes/minimal-m ...@@ -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" teaser : # path of fallback teaser image, e.g. "/assets/images/500x300.png"
logo : &logo "/assets/images/logo-ccl-grand.png" logo : &logo "/assets/images/logo-ccl-grand.png"
masthead_title : # overrides the website title displayed in the masthead, use " " for no title 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 words_per_minute : 200
comments: comments:
provider : # false (default), "disqus", "discourse", "facebook", "staticman", "staticman_v2", "utterances", "custom" provider : # false (default), "disqus", "discourse", "facebook", "staticman", "staticman_v2", "utterances", "custom"
...@@ -116,7 +116,6 @@ footer: ...@@ -116,7 +116,6 @@ footer:
icon: "fab fa-fw fa-facebook-square" icon: "fab fa-fw fa-facebook-square"
url: "https://facebook.com/CCLuminy" url: "https://facebook.com/CCLuminy"
- label: "HelloAsso" - label: "HelloAsso"
icon: "fas fa-fw fa-fire"
url: "https://www.helloasso.com/associations/centre-culturel-de-luminy" url: "https://www.helloasso.com/associations/centre-culturel-de-luminy"
- label: "GitHub" - label: "GitHub"
icon: "fab fa-fw fa-github" icon: "fab fa-fw fa-github"
...@@ -251,8 +250,6 @@ compress_html: ...@@ -251,8 +250,6 @@ compress_html:
ignore: ignore:
envs: development envs: development
exclude: [ "*/snippets/", ]
# see _data/authors.yml # see _data/authors.yml
author: ccl author: ccl
...@@ -268,9 +265,9 @@ defaults: ...@@ -268,9 +265,9 @@ defaults:
values: values:
layout: single layout: single
author_profile: true author_profile: true
share: false share: true
toc_sticky: true toc_sticky: true
header: header:
show_overlay_excerpt: false show_overlay_excerpt: false
sidebar: sidebar:
nav: tout nav: true
# /_data/authors.yml # /_data/authors.yml
ccl: ccl:
name : "CCL" name : "CCL"
prefix : "ccl"
avatar : /assets/images/authors-logo/indien-petit.png 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" bio : "Animer, partager, avancer, s'améliorer, s'amuser"
location : "Luminy" location : "Luminy"
email : "centre-culturel@luminy.org" email : "centre-culturel@luminy.org"
...@@ -21,7 +24,9 @@ ccl: ...@@ -21,7 +24,9 @@ ccl:
jardin: jardin:
name : "Jardin Universitaire" name : "Jardin Universitaire"
prefix : "jardin"
avatar : /assets/images/authors-logo/logo-jardin.png avatar : /assets/images/authors-logo/logo-jardin.png
banner : /assets/images/banniere-jardin.jpg
bio : "Jardin partagé chaleureux et ouvert à tous ! " bio : "Jardin partagé chaleureux et ouvert à tous ! "
location : "Bât. D" location : "Bât. D"
email : "jardin@luminy.org" email : "jardin@luminy.org"
...@@ -33,8 +38,9 @@ jardin: ...@@ -33,8 +38,9 @@ jardin:
# icon: "fas fa-fw fa-link" # icon: "fas fa-fw fa-link"
# url: "https://www.helloasso.com/associations/centre-culturel-de-luminy" # url: "https://www.helloasso.com/associations/centre-culturel-de-luminy"
com: comnsea:
name : "Com & Sea" name : "Com & Sea"
prefix : "comnsea"
avatar : /assets/images/authors-logo/logo-com.png avatar : /assets/images/authors-logo/logo-com.png
bio : "Association d'Océanologie" bio : "Association d'Océanologie"
location : "Hexagone" location : "Hexagone"
...@@ -49,6 +55,7 @@ com: ...@@ -49,6 +55,7 @@ com:
club-science: club-science:
name : "Club de Science Luminy" name : "Club de Science Luminy"
prefix : "club-science"
avatar : /assets/images/authors-logo/logo-club-sciences.jpeg avatar : /assets/images/authors-logo/logo-club-sciences.jpeg
bio : "Organisation de conférences, de cours d'histoire et de philosophie des sciences" bio : "Organisation de conférences, de cours d'histoire et de philosophie des sciences"
location : "Luminy" location : "Luminy"
......
# main links # mashead links
main: main:
- title: "Le CCL" - title: "Le CCL"
url: /ccl/ url: /ccl/
...@@ -9,58 +9,67 @@ main: ...@@ -9,58 +9,67 @@ main:
- title: "Contacts" - title: "Contacts"
url: /contacts/ url: /contacts/
# navigation sidebar ccl:
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/"
- title: "Activités" - title: "Activités"
url: "/activites/" url: "/ccl/activites/"
children: children:
- title: "Concerts et festivals" - title: "Concerts et festivals"
url: /activites/concerts/ url: /ccl/activites/concerts/
- title: "Toukouleur" - title: "Toukouleur"
url: /activites/toukouleur/ url: /ccl/activites/toukouleur/
- title: "Les jeudis du CCL" - title: "Les jeudis du CCL"
url: /activites/jeudis/ url: /ccl/activites/jeudis/
- title: "Campus propre" - title: "Campus propre"
url: /activites/campus-propre/ url: /ccl/activites/campus-propre/
- title: "Club de science" - title: "Club de science"
url: /activites/club-science/ url: /ccl/activites/club-science/
- title: "Projections" - title: "Projections"
url: /activites/projections/ url: /ccl/activites/projections/
- title: "Ateliers et animation" - title: "Ateliers et animation"
url: /activites/ateliers/ url: /ccl/activites/ateliers/
- title: "Projets" - title: "Projets"
url: /activites/projets/ url: /ccl/activites/projets/
- title: "Luminy" - title: "L'association"
url: "/luminy/" 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: children:
- title: "Jardin Universitaire"
url: /luminy/jardin/
- title: "Paniers bio" - title: "Paniers bio"
url: /luminy/paniers/ url: /jardin/paniers/
- title: "Asso ALLIE" - title: "Gallerie"
url: /luminy/allie/ url: /jardin/gallerie/
- title: "Conseil des résidents"
url: /luminy/conseil-residents/ # autre:
- title: "Asso ERASMUS" # - title: "Asso ALLIE"
url: /luminy/erasmus/ # url: /luminy/allie/
- title: "Asso Com & Sea" # - title: "Conseil des résidents"
url: /luminy/comnsea/ # url: /luminy/conseil-residents/
- title: "FSE" # - title: "Asso ERASMUS"
url: /luminy/fse/ # url: /luminy/erasmus/
- title: "Votre projet" # - title: "Asso Com & Sea"
url: /luminy/votre-projet/ # url: /luminy/comnsea/
- title: "Notre projet" # - title: "FSE"
url: /luminy/votre-projet/ # 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/
{% 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 %} {% assign author = site.data.authors[author] | default: author %}
<div itemscope itemtype="https://schema.org/Person"> <div itemscope itemtype="https://schema.org/Person">
......
...@@ -14,6 +14,8 @@ ...@@ -14,6 +14,8 @@
{% capture overlay_img_path %}{{ page.header.overlay_image }}{% endcapture %} {% capture overlay_img_path %}{{ page.header.overlay_image }}{% endcapture %}
{% elsif page.header.overlay_image %} {% elsif page.header.overlay_image %}
{% capture overlay_img_path %}{{ page.header.overlay_image | relative_url }}{% endcapture %} {% capture overlay_img_path %}{{ page.header.overlay_image | relative_url }}{% endcapture %}
{% elsif author.banner %}
{% capture overlay_img_path %}{{ author.banner | relative_url }}{% endcapture %}
{% endif %} {% endif %}
{% if page.header.overlay_filter contains "rgba" %} {% if page.header.overlay_filter contains "rgba" %}
...@@ -30,10 +32,10 @@ ...@@ -30,10 +32,10 @@
{% assign image_description = image_description | markdownify | strip_html | strip_newlines | escape_once %} {% 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 %}" 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"> <div class="wrapper">
<h1 id="page-title" class="page__title" itemprop="headline"> <h1 id="page-title" class="page__title" itemprop="headline">
{% if paginator and site.paginate_show_page_num %} {% if paginator and site.paginate_show_page_num %}
......
...@@ -25,14 +25,15 @@ ...@@ -25,14 +25,15 @@
{%- assign seo_description = seo_description | markdownify | strip_html | strip_newlines | escape_once -%} {%- assign seo_description = seo_description | markdownify | strip_html | strip_newlines | escape_once -%}
{%- endif -%} {%- endif -%}
{%- assign author = page.author | default: page.authors[0] | default: site.author -%} {% assign author = page.url | split: "/" %}
{%- assign author = site.data.authors[author] | default: author -%} {% assign author = author[1] %}
{% assign author = site.data.authors[author] | default: author %}
{%- if author.twitter -%} {%- if author.twitter -%}
{%- assign author_twitter = author.twitter | replace: "@", "" -%} {%- assign author_twitter = author.twitter | replace: "@", "" -%}
{%- endif -%} {%- 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 '://' -%} {%- unless page_large_image contains '://' -%}
{%- assign page_large_image = page_large_image | absolute_url -%} {%- assign page_large_image = page_large_image | absolute_url -%}
{%- endunless -%} {%- endunless -%}
......
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
{% if s.nav %}{% include nav_list nav=s.nav %}{% endif %} {% if s.nav %}{% include nav_list nav=s.nav %}{% endif %}
{% endfor %} {% endfor %}
{% if page.sidebar.nav %} {% if page.sidebar.nav %}
{% include nav_list nav=page.sidebar.nav %} {% include nav_list nav=author.prefix %}
{% endif %} {% endif %}
{% endif %} {% endif %}
</div> </div>
......
...@@ -2,7 +2,11 @@ ...@@ -2,7 +2,11 @@
layout: default 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 %} {% include page__hero.html %}
{% elsif page.header.video.id and page.header.video.provider %} {% elsif page.header.video.id and page.header.video.provider %}
{% include page__hero_video.html %} {% include page__hero_video.html %}
...@@ -24,7 +28,7 @@ layout: default ...@@ -24,7 +28,7 @@ layout: default
{% if page.last_modified_at %}<meta itemprop="dateModified" content="{{ page.last_modified_at | date: "%B %d, %Y" }}">{% endif %} {% if page.last_modified_at %}<meta itemprop="dateModified" content="{{ page.last_modified_at | date: "%B %d, %Y" }}">{% endif %}
<div class="page__inner-wrap"> <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 %} {% unless page.no_title %}
<header> <header>
{% if page.title %}<h1 id="page-title" class="page__title" itemprop="headline">{{ page.title | markdownify | remove: "<p>" | remove: "</p>" }}</h1>{% endif %} {% 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 ...@@ -93,3 +97,4 @@ layout: default
</div> </div>
{% endif %} {% endif %}
</div> </div>
File moved
File moved
File moved
--- ---
title: Toukouleur title: Toukouleur
author_profile: true
toc: true toc: true
description: Le festival Toukouleur organisé chaque année par le CCL! description: Le festival Toukouleur organisé chaque année par le CCL!
header: header:
......
File moved
File moved
--- ---
title: Le CCL title: Le CCL
category_name: "ccl" no_title: true
header: header:
image: assets/images/banniere-ccl-intime.png 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 ! ## 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 ...@@ -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) [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 ## En savoir plus
{% assign section_pages = site.pages | where: 'section', 'ccl' %} {% assign section_pages = site.pages | where: 'section', 'ccl' %}
......
...@@ -27,4 +27,4 @@ Culturel de Luminy. ...@@ -27,4 +27,4 @@ Culturel de Luminy.
{: .notice} {: .notice}
{% include_relative snippets/devenir-benevole.md %} {% include_relative devenir-benevole.md %}
File moved
File moved
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment