diff --git a/_data/authors.yml b/_data/authors.yml
index 96c83e0c2452a8c58f2f9a15dfc7b387d98cdff3..395ee96ebcb05142444c764c7b2ee4b3b7e8c1b5 100644
--- a/_data/authors.yml
+++ b/_data/authors.yml
@@ -76,3 +76,13 @@ authors:
banner: ''
helloasso: ''
og_image: ''
+- name: Com&Sea
+ prefix: comnsea
+ avatar: "/assets/images/authors-logo/logo-com.png"
+ bio: Association d'océano
+ location: Hexagone
+ email: comandseaass@gmail.com
+ facebook: https://www.facebook.com/comandseaAMU/
+ banner: ''
+ helloasso: ''
+ og_image: ''
diff --git a/_data/extlinks.yml b/_data/extlinks.yml
index 891143fee6d897f4f18a24a6ddd270aca0c9c412..9655cb0a5a58ee1fed86e3fcd20e57ff133133b8 100644
--- a/_data/extlinks.yml
+++ b/_data/extlinks.yml
@@ -8,6 +8,7 @@ fb-ccl: https://www.facebook.com/CCLuminy/
fb-jardin: https://www.facebook.com/jardinluminy/
fb-club-science: https://www.facebook.com/Club-de-Science-Luminy-114357542612098/
fb-fse: https://www.facebook.com/Club-de-Science-Luminy-114357542612098/
+fb-allie: https://www.facebook.com/allie.luminy
helloasso-ccl: https://www.helloasso.com/associations/centre-culturel-de-luminy
github-ccl: https://github.com/CCLuminy/CCL-site/
cagette: http://app.cagette.net/group/2003
diff --git a/_data/navigation.yml b/_data/navigation.yml
index 2df005edeb2b4f108577f92c9603ddd7381711cc..dec87e8751c6bcf88ace8cc6ae419882fdf3f8b8 100644
--- a/_data/navigation.yml
+++ b/_data/navigation.yml
@@ -2,64 +2,13 @@
main:
- title: Agenda
url: "/agenda/"
-- title: Le Grenier
- url: "/grenier/"
- title: À Propos
url: "/about/"
-navs:
-- name: ccl
- nav:
- - 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
- 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
- nav:
- - title: ''
- url: "/jardin/"
- children:
- - title: Paniers bio
- url: "/jardin/paniers/"
- - title: Gallerie
- url: "/jardin/gallerie/"
-- name: club-science
- nav:
- - title: Club science
- url: "/club-science/"
- children:
- - title: Ressources
- url: "/club-science/ressources/"
- - title: Contacts
- utl: "/club-science/contacts/"
- url: ''
-- name: fse
- nav:
- - title: FSE Luminy
- url: "/fse/"
- children:
- - title: Communiqués de presse
- url: "/fse/communiques"
+nav:
+# - title: Activités
+# url: "/ccl/activites/"
+# children:
+# - title: Concerts et festivals
+# url: "/ccl/activites/concerts/"
+# - title: Toukouleur
+# url: "/ccl/activites/toukouleur/"
diff --git a/_includes/author-profile.html b/_includes/author-profile.html
index 9ef529cef00d1ae321f54fb12f9e2521f77c6501..aee652dfecedcbc291936478a56a661927d4f0ac 100644
--- a/_includes/author-profile.html
+++ b/_includes/author-profile.html
@@ -1,5 +1,6 @@
<!-- {% assign author = page.author | default: page.authors[0] | default: site.author %} -->
-{% assign author = site.data.authors.authors | where: "prefix", site.author | first %}
+{% assign author_prefix = page.author | default: site.author %}
+{% assign author = site.data.authors.authors | where: "prefix", author | first %}
<div itemscope itemtype="https://schema.org/Person">
diff --git a/_pages/about.md b/_pages/about.md
index ebdac9eaddf7cedd8ef99d2000f607ba21d400c1..56a1cdd1fcda6b087fce114df8ead7eefb85da68 100644
--- a/_pages/about.md
+++ b/_pages/about.md
@@ -1,5 +1,6 @@
---
title: Votre projet sur `luminy.org`
+author_profile: false
---
## Contribuez au référencement des activités luminyennes
Vous êtes actifs sur Luminy ? Vous participez, contribuez ou organisez des
diff --git a/_pages/agenda.md b/_pages/agenda.md
index d060a0bd4b28e12a6b121a3984b95034dc9ea6a7..1f3cd377e3f292396c0fa4cd72ac45c40860ba8e 100644
--- a/_pages/agenda.md
+++ b/_pages/agenda.md
@@ -4,9 +4,9 @@ description: Agenda commun luminy.org
has_header: false
header:
type: default
-
+author_profile: false
---
<iframe
src="https://calendar.google.com/calendar/b/1/embed?height=600&wkst=2&bgcolor=%23ffffff&ctz=Europe%2FParis&src=bGVwdWdldEBsdW1pbnkub3Jn&src=ZnIuZnJlbmNoI2hvbGlkYXlAZ3JvdXAudi5jYWxlbmRhci5nb29nbGUuY29t&src=dm9ubTE3aG5jcDJtcWJmMXA0NGk4dDUxMjdydGszZmFAaW1wb3J0LmNhbGVuZGFyLmdvb2dsZS5jb20&color=%23D6AE00&color=%233366CC&color=%233366CC&showCalendars=1&showPrint=0&showNav=1"
style="border-width:0" width="800" height="600" frameborder="0"
-scrolling="no"></iframe>
\ No newline at end of file
+scrolling="no"></iframe>
diff --git a/_pages/allie.md b/_pages/allie.md
new file mode 100644
index 0000000000000000000000000000000000000000..302bfea229742c5602b272326ee41bd7ada2bc00
--- /dev/null
+++ b/_pages/allie.md
@@ -0,0 +1,15 @@
+---
+title: ALLIE
+author: allie
+---
+
+{{ site.data.external-links.facebook.link }}
+
+# Actualités sur [<i class='fab fa-facebook-square'></i>]({{ site.data.extlinks.fb-allie }})
+
+<!-- TODO: move this up, it should be executed only once -->
+<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/alliejournal/" data-tabs="timeline" data-width="500" data-height="700" data-small-header="false" data-adapt-container-width="true" data-hide-cover="false" data-show-facepile="true"><blockquote cite="https://www.facebook.com/alliejournal/" class="fb-xfbml-parse-ignore"><a href="https://www.facebook.com/alliejournal/">ALLIÉ Luminy</a></blockquote></div>
diff --git a/_pages/allie/index.md b/_pages/allie/index.md
deleted file mode 100644
index d9ba1420487b2a037d9c960e99f3d2d10cf967ec..0000000000000000000000000000000000000000
--- a/_pages/allie/index.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Café des Langues Luminy
----
-
-Go!
diff --git a/_pages/cafe-des-langues/index.md b/_pages/cafe-des-langues.md
similarity index 70%
rename from _pages/cafe-des-langues/index.md
rename to _pages/cafe-des-langues.md
index ebdc9619eb43d6ecaf1dc293eda51bce7ba51025..eefbfda0c9128e707a54d6cc48ba970753997f1a 100644
--- a/_pages/cafe-des-langues/index.md
+++ b/_pages/cafe-des-langues.md
@@ -1,6 +1,7 @@
---
title: Café des Langues Luminy
last_modified_at: 2019-11-18 23:00:00 +0000
+author: cafe-des-langues
---
Venez discuter avec des étudiants internationaux dans leur langue maternelle autour d'un bon café (italien, bien sûr), tous les jours, du lundi au vendredi, de 13h à 14h au Foyer étudiants (premier étage de l'Hexagone).
@@ -20,4 +21,4 @@ Vendredi : Français
<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/cafedeslanguesluminy" 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/cafedeslanguesluminy" class="fb-xfbml-parse-ignore"><a href="https://www.facebook.com/cafedeslanguesluminy">Café des Langues Luminy</a></blockquote></div>
+<div class="fb-page" data-href="https://www.facebook.com/cafedeslanguesluminy" data-tabs="timeline" data-width="500" data-height="700" data-small-header="false" data-adapt-container-width="true" data-hide-cover="false" data-show-facepile="true"><blockquote cite="https://www.facebook.com/cafedeslanguesluminy" class="fb-xfbml-parse-ignore"><a href="https://www.facebook.com/cafedeslanguesluminy">Café des Langues Luminy</a></blockquote></div>
diff --git a/_pages/cafe-des-langues/.gitkeep b/_pages/cafe-des-langues/.gitkeep
deleted file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000
diff --git a/_pages/club-science/index.md b/_pages/club-science.md
similarity index 97%
rename from _pages/club-science/index.md
rename to _pages/club-science.md
index 5b7d612dff25edea1a5d036267da6b7a50ca99f1..e7d7a0e25fffbc7dff970ff38f226656f3790a69 100644
--- a/_pages/club-science/index.md
+++ b/_pages/club-science.md
@@ -2,6 +2,7 @@
title: Club de Science
author: club-science
overlay_image: assets/images/banniere-club-science.png
+author: club-science
---
{{ site.data.external-links.facebook.link }}
diff --git a/_pages/comnsea.md b/_pages/comnsea.md
new file mode 100644
index 0000000000000000000000000000000000000000..021356ab546bf918f7893d590c95e4cfb02cab7d
--- /dev/null
+++ b/_pages/comnsea.md
@@ -0,0 +1,13 @@
+---
+title: Com & Sea
+author: comnsea
+---
+
+# Actualités sur [<i class='fab fa-facebook-square'></i>]({{ site.data.extlinks.fb-fse }})
+<!-- TODO: move this up, it should be executed only once -->
+<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/comandseaAMU/" data-tabs="timeline" data-width="500" data-height="700" data-small-header="false" data-adapt-container-width="true" data-hide-cover="false" data-show-facepile="true"><blockquote cite="https://www.facebook.com/comandseaAMU/" class="fb-xfbml-parse-ignore"><a href="https://www.facebook.com/comandseaAMU/">Com&Sea (officiel)</a></blockquote></div>
+
diff --git a/_pages/fse/index.md b/_pages/fse.md
similarity index 54%
rename from _pages/fse/index.md
rename to _pages/fse.md
index 6d0988be5d64eed66654b6ab7131caead42e9c39..68c3b283fca5521a98f74c6de2c00d3d9692fe64 100644
--- a/_pages/fse/index.md
+++ b/_pages/fse.md
@@ -1,5 +1,6 @@
---
title: Fédération Syndicale Étudiante
+author: fse
---
# Actualités sur [<i class='fab fa-facebook-square'></i>]({{ site.data.extlinks.fb-fse }})
@@ -8,4 +9,4 @@ title: Fédération Syndicale Étudiante
<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/FSE.Luminy/" 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/FSE.Luminy/" class="fb-xfbml-parse-ignore"><a href="https://www.facebook.com/FSE.Luminy/">FSE Luminy</a></blockquote></div>
+<div class="fb-page" data-href="https://www.facebook.com/FSE.Luminy/" data-tabs="timeline" data-width="500" data-height="700" data-small-header="false" data-adapt-container-width="true" data-hide-cover="false" data-show-facepile="true"><blockquote cite="https://www.facebook.com/FSE.Luminy/" class="fb-xfbml-parse-ignore"><a href="https://www.facebook.com/FSE.Luminy/">FSE Luminy</a></blockquote></div>
diff --git a/_pages/index.md b/_pages/index.md
index 8fc69b8bd65e2b3b17dc84017b8df09a24807174..5f7f4cc83b91c622112e46c96aff2874571970b1 100644
--- a/_pages/index.md
+++ b/_pages/index.md
@@ -96,13 +96,13 @@ last_modified_at: 2019-12-01 00:00:00 +0100
<div class="cards-list">
-<a href="luminy.org">
+<a href="https://ccl.test.luminy.org">
<div class="card">
<div class="card_image"><img src="assets/images/authors-logo/logo-ccl-nb.png" /></div>
</div>
</a>
-<a href="">
+<a href="jardin">
<div class="card">
<div class="card_image">
<img src="assets/images/authors-logo/logo-jardin.png" />
@@ -113,7 +113,7 @@ last_modified_at: 2019-12-01 00:00:00 +0100
</div>
</a>
-<a href="">
+<a href="club-science">
<div class="card">
<div class="card_image">
<img src="assets/images/authors-logo/logo-club-sciences.jpeg" />
@@ -124,7 +124,7 @@ last_modified_at: 2019-12-01 00:00:00 +0100
</div>
</a>
-<a href="">
+<a href="allie">
<div class="card">
<div class="card_image">
<img src="assets/images/authors-logo/allie.png" />
@@ -132,7 +132,7 @@ last_modified_at: 2019-12-01 00:00:00 +0100
</div>
</a>
-<a href="">
+<a href="fse">
<div class="card">
<div class="card_image">
<img src="assets/images/authors-logo/fse-transparent.png" />
@@ -140,7 +140,7 @@ last_modified_at: 2019-12-01 00:00:00 +0100
</div>
</a>
-<a href="">
+<a href="comnsea">
<div class="card">
<div class="card_image">
<img src="assets/images/authors-logo/logo-com.png" />
@@ -148,7 +148,7 @@ last_modified_at: 2019-12-01 00:00:00 +0100
</div>
</a>
-<a href="">
+<a href="cafe-des-langues">
<div class="card">
<div class="card_image">
<img src="assets/images/authors-logo/cafe-des-langues.png" />
diff --git a/_pages/jardin.md b/_pages/jardin.md
new file mode 100644
index 0000000000000000000000000000000000000000..bc2b1dd1d4ceb71966a96bc9263e7e67ed739923
--- /dev/null
+++ b/_pages/jardin.md
@@ -0,0 +1,12 @@
+---
+title: Jardin Universitaire de Luminy
+author: jardin
+---
+
+# Actualités sur [<i class='fab fa-facebook-square'></i>]({{ site.data.extlinks.fb-fse }})
+<!-- TODO: move this up, it should be executed only once -->
+<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/jardinluminy/" data-tabs="timeline" data-width="500" data-height="700" data-small-header="false" data-adapt-container-width="true" data-hide-cover="false" data-show-facepile="true"><blockquote cite="https://www.facebook.com/jardinluminy/" class="fb-xfbml-parse-ignore"><a href="https://www.facebook.com/jardinluminy/">Jardin Universitaire de Luminy - JUDL</a></blockquote></div>
diff --git a/_pages/jardin/gallerie.md b/_pages/jardin/gallerie.md
deleted file mode 100644
index f8074ad12c9f1b2a9b5da1a8fe051fea5f253b9e..0000000000000000000000000000000000000000
--- a/_pages/jardin/gallerie.md
+++ /dev/null
@@ -1,4 +0,0 @@
----
-title: Gallerie du jardin
----
-des images...
diff --git a/_pages/jardin/index.md b/_pages/jardin/index.md
deleted file mode 100644
index de09941163f448aca927d803b9a781d580a3fb50..0000000000000000000000000000000000000000
--- a/_pages/jardin/index.md
+++ /dev/null
@@ -1,12 +0,0 @@
----
-title: Jardin Universitaire de Luminy
-has_header: true
-toc: true
-header:
- type: default
----
-# c'est le jardin
-
-gloubi boulga
-
-# Lorem ipsum
\ No newline at end of file
diff --git a/_pages/jardin/lorem-ipsum.md b/_pages/jardin/lorem-ipsum.md
deleted file mode 100644
index 67a159bd103180fd1477a85ccdcb5089ee398de6..0000000000000000000000000000000000000000
--- a/_pages/jardin/lorem-ipsum.md
+++ /dev/null
@@ -1,83 +0,0 @@
----
-last_modified_at: 2019-11-24T17:31:20.000+00:00
-toc: true
-has_header: false
-header:
- type: overlay
- overlay_color: rgb(125, 103, 103)
- overlay_title: true
- show_text: custom
- overlay_image: #"/assets/images/atelier-combat.jpg"
- custom_text: ''
- caption: ''
- actions:
- color: "#B19292"
- fixed_image: "/assets/images/banniere-parvis.jpg"
- overlay_text: ''
- video:
- id: rKNMf4LFX44
- provider: youtube
-title: Lorem Ipsum
-classes: 'wide'
-description: Description de ouf
-share: true
-
----
-# 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
diff --git a/_pages/jardin/paniers.md b/_pages/jardin/paniers.md
deleted file mode 100644
index 242a2f3b737aeaa4d630dca95cacada602ea68db..0000000000000000000000000000000000000000
--- a/_pages/jardin/paniers.md
+++ /dev/null
@@ -1,16 +0,0 @@
----
-title: Les paniers bio !
-last_modified_at: 2019-11-18 14:16:00
-has_header: true
-header:
- type: default
-author: marin
-share: false
----
-
-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, …
-
-# Nous trouver
-
-La distribution se fait tout les jeudis (sauf exceptions, par exemple en période de vacances scolaires) de 16h45 à 19h sur le terrain du jardin, juste à droite. \# Distribution paniers bio [Cagette.net]({{ site.data.extlinks.cagette }})
-
diff --git a/assets/images/authors-logo/logo-jardin-grand.png b/assets/images/authors-logo/logo-jardin.png
similarity index 100%
rename from assets/images/authors-logo/logo-jardin-grand.png
rename to assets/images/authors-logo/logo-jardin.png