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

Merge branch 'develop' into content

parents 6987a066 b0a4cced
No related branches found
No related tags found
1 merge request!13[bot] Nouveau post sur la page facebook du CCL
This commit is part of merge request !13. Comments created here will be created in the context of that merge request.
Showing
with 12 additions and 97 deletions
...@@ -4,4 +4,4 @@ assets/js/lunr/* linguist-vendored ...@@ -4,4 +4,4 @@ assets/js/lunr/* linguist-vendored
assets/js/plugins/* linguist-vendored assets/js/plugins/* linguist-vendored
assets/js/vendor/* linguist-vendored assets/js/vendor/* linguist-vendored
_sass/minimal-mistakes/vendor/* linguist-vendored _sass/minimal-mistakes/vendor/* linguist-vendored
assets/images/*.* filter=lfs diff=lfs merge=lfs -text assets/images/*/*.* filter=lfs diff=lfs merge=lfs -text
...@@ -17,3 +17,6 @@ vendor/bundle ...@@ -17,3 +17,6 @@ vendor/bundle
# Local Netlify folder # Local Netlify folder
.netlify .netlify
Gemfile.lock Gemfile.lock
# minimal mistakes examples docs
docs/
---
footer:
- title: À propos de Luminy.org
url: about.md
weight: 1
- title: Poèmes
url: poemes/
weight: 1
ccl:
- title: "Activités"
url: "/ccl/activites/"
identifier: ccl-activites
- title: "L'association"
url: "/ccl/"
identifier: ccl-l-asso
# - 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/
<!-- {% assign author = page.author | default: page.authors[0] | default: site.author %} --> <!-- {% assign author = page.author | default: page.authors[0] | default: site.author %} -->
{% unless page.author %} {% assign author = site.data.authors.authors | where: "prefix", site.author | first %}
{% 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"> <div itemscope itemtype="https://schema.org/Person">
......
{% assign navigation = site.data.navigation.navs | where: "name", include.nav | map: "nav" | first %} {% assign navigation = site.data.navigation.nav %}
<nav class="nav__list"> <nav class="nav__list">
{% if page.sidebar.title %}<h3 class="nav__title" style="padding-left: 0;">{{ page.sidebar.title }}</h3>{% endif %} {% if page.sidebar.title %}<h3 class="nav__title" style="padding-left: 0;">{{ page.sidebar.title }}</h3>{% endif %}
......
...@@ -26,9 +26,7 @@ ...@@ -26,9 +26,7 @@
{%- endif -%} {%- endif -%}
<!-- don't use page.author even if it is set, find author based on url --> <!-- don't use page.author even if it is set, find author based on url -->
{% assign author = page.url | split: "/" %} {% assign author = site.data.authors.authors | where: "prefix", site.author | first %}
{% assign author = author[1] %}
{% assign author = site.data.authors.authors | where: "prefix", author | first %}
{%- if author.twitter -%} {%- if author.twitter -%}
{%- assign author_twitter = author.twitter | replace: "@", "" -%} {%- assign author_twitter = author.twitter | replace: "@", "" -%}
......
...@@ -2,11 +2,7 @@ ...@@ -2,11 +2,7 @@
layout: default layout: default
--- ---
{% unless page.author %} {% assign author = site.data.authors.authors | where: "prefix", site.author | first %}
{% assign author = page.url | split: "/" %}
{% assign author = author[1] %}
{% endunless %}
{% assign author = site.data.authors.authors | where: "prefix", author | first %}
{% if page.has_header %} {% if page.has_header %}
{% include page__hero.html %} {% include page__hero.html %}
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
layout: default layout: default
--- ---
{% if page.header.overlay_color or page.overlay_image or page.header.image %} {% if page.header.overlay_color or page.header.overlay_image or page.header.image %}
{% 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 %}
......
--- ---
layout: splash layout: splash
title: Centre Culturel de Luminy title: Accueil
has_header: true has_header: true
overlay_image: assets/images/puget-fleuri.png
header: header:
type: default type: overlay
overlay_image: assets/images/banniere-ccl-intime.png overlay_image: assets/images/puget-fleuri.png
actions:
- label: "<i class='fas fa-users'></i> Adhérez"
url: "/ccl/adherer/"
- label: "<i class='fab fa-fw fa-facebook-square'></i> Suivez-nous"
url: "https://www.facebook.com/CCLuminy/"
- label: "<i class='fas fa-fw fa-calendar-alt'></i> Agenda"
url: "/agenda/"
show_overlay_excerpt: true
description: > description: >
Le CCL porte de nombreuses initiatives et se propose d'aider à en monter de nouvelles ! Son but : remettre les notions de créativité, de connaissance, de collectivité, de partage et d'entraide au coeur de la vie de notre campus universitaire en proposant à toutes les bonnes volontés de participer à construire leur lieu d'étude, de travail ou encore de vie. Le CCL porte de nombreuses initiatives et se propose d'aider à en monter de nouvelles ! Son but : remettre les notions de créativité, de connaissance, de collectivité, de partage et d'entraide au coeur de la vie de notre campus universitaire en proposant à toutes les bonnes volontés de participer à construire leur lieu d'étude, de travail ou encore de vie.
feature_row: feature_row:
...@@ -84,9 +75,3 @@ feature_row: ...@@ -84,9 +75,3 @@ feature_row:
</script> </script>
{% include feature_row %} {% include feature_row %}
<div id="fb-root"></div>
<script async defer crossorigin="anonymous" src="https://connect.facebook.net/fr_FR/sdk.js#xfbml=1&version=v5.0"></script>
<div class="fb-page" data-href="https://www.facebook.com/CCLuminy/" data-tabs="timeline" data-width="" data-height="" data-small-header="false" data-adapt-container-width="true" data-hide-cover="false" data-show-facepile="true"><blockquote cite="https://www.facebook.com/CCLuminy/" class="fb-xfbml-parse-ignore"><a href="https://www.facebook.com/CCLuminy/">Centre Culturel de Luminy - CCL</a></blockquote></div>
...@@ -14,24 +14,3 @@ Tous les jeudis, les paniers marseillais proposent des produits bio en direct de ...@@ -14,24 +14,3 @@ Tous les jeudis, les paniers marseillais proposent des produits bio en direct de
La distribution se fait tout les jeudis (sauf exceptions, par exemple en p&eacute;riode de vacances scolaires) de 16h45 &agrave; 19h sur le terrain du jardin, juste &agrave; droite. \# Distribution paniers bio [Cagette.net]({{ site.data.extlinks.cagette }}) La distribution se fait tout les jeudis (sauf exceptions, par exemple en p&eacute;riode de vacances scolaires) de 16h45 &agrave; 19h sur le terrain du jardin, juste &agrave; droite. \# Distribution paniers bio [Cagette.net]({{ site.data.extlinks.cagette }})
header
plop
* {% for item in site.menus.header %}
* [{{ item.title }}]({{ item.url }} "Go to {{ item.title }}") {% if item.children %}
* {% for item in item.children %} {{ item.identifier | inspect }}
* [{{ item.title }}]({{ item.url }} "Go to {{ item.title }}"){: .menu-item-{{ loop.index }}}
* {% endfor %}
{: .sub-menu} {% endif %}{: .menu-item-{{ loop.index }}}
* {% endfor %}
jardin
* {% for item in site.menus.jardin %}
* [{{ item.title }}]({{ item.url }} "Go to {{ item.title }}") {% if item.children %}
* {% for item in item.children %} {{ item.identifier | inspect }}
* [{{ item.title }}]({{ item.url }} "Go to {{ item.title }}"){: .menu-item-{{ loop.index }}}
* {% endfor %}
{: .sub-menu} {% endif %}{: .menu-item-{{ loop.index }}}
* {% endfor %}
\ No newline at end of file
No preview for this file type
No preview for this file type
No preview for this file type
No preview for this file type
No preview for this file type
No preview for this file type
No preview for this file type
No preview for this file type
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment