Merge branch 'content' into develop

.forestry/front_matter/templates/single.yml

+---
+label: single
+hide_body: false
+fields:
+- type: text
+  name: title
+  label: title
+- name: last_modified_at
+  type: datetime
+  label: Date dernière modification
+  description: ''
+  config:
+    required: false
+    date_format: 
+    time_format: 
+    display_utc: false
+pages:
+- _pages/cafe-des-langues/presentation.md

.forestry/settings.yml

 ---
 new_page_extension: md
 auto_deploy: false
-admin_path: 
+admin_path: admin
 webhook_url: 
 sections:
-- type: jekyll-pages
-  label: Pages
-  create: all
-- type: jekyll-posts
-  label: Posts
-  create: all
 - type: directory
   path: _pages
-  label: Pages
+  label: Toutes les pages
   create: all
   match: "**/*"
-upload_dir: uploads
-public_path: "/uploads"
+upload_dir: assets/images
+public_path: "/assets/images"
 front_matter_path: ''
-use_front_matter_path: false
+use_front_matter_path: 
 file_template: ":filename:"
 build:
   preview_env:
   - JEKYLL_ENV=staging
+  - GIT_LFS_SKIP_SMUDGE=1
   preview_output_directory: _site
-  install_dependencies_command: bundle install --path vendor/bundle
+  install_dependencies_command: bundle install
   preview_docker_image: forestryio/ruby:2.6
   mount_path: "/srv"
   working_dir: "/srv"

.forestry/snippets/table.snippet

+### Table title
+
+| Header | Header | Header  |
+| ------ | ------ | ------- |
+| Cell   | Cell   | Cell   |
+| Cell   | Cell   | Cell   |
+| Cell   | Cell   | Cell   |

Gemfile

@@ -22,7 +22,6 @@ gem "jekyll"
 group :jekyll_plugins do
   gem "jekyll-paginate"
   gem "jekyll-sitemap"
-  gem "jekyll-gist"
-  gem "jekyll-feed"
   gem "jekyll-include-cache"
+  gem "jekyll-menus"
 end

_config.yml

@@ -206,12 +206,14 @@ 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

_data/menus.yml

+---
+footer:
+- title: À propos de Luminy.org
+  url: about.md
+  weight: 2

_pages/404.md

 ---
 title: Page non trouvée
-permalink: /404.html
+permalink: "/404.html"
 author_profile: false
 share: false
+menu:
+  footer:
+    title: Des témoignages
+    weight: 1
+
 ---
-# 404
+# 404
\ No newline at end of file

_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
@@ -8,5 +13,4 @@ Le CCL, qui gère `luminy.org`, se propose d'héberger votre page, vos pages ou
 même votre site légé à part sur luminy.org, à apparaître dans la
 rubrique "[Luminy c'est aussi](/luminy/) !
 
-## [Parlez-en-nous !](/contacts/)
-
+## [Parlez-en-nous !](/contacts/)
\ No newline at end of file

_pages/cafe-des-langues/presentation.md

+---
+title: Présentation
+last_modified_at: 2019-11-18 23:00:00 +0000
+
+---
+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).
+
+Come and chat with students from all over the world in their native language, every day from Monday to Friday, 13-14, in the Foyer étudiants (first floor at the Hexagone).
+
+Emploi du temps 2019/2020 :
+
+Lundi : Italiano (italien)
+Mardi : Русский (russe) & Português (portugais)
+Mercredi : Español (espagnol)
+Jeudi : English (anglais)
+Vendredi : Français
\ No newline at end of file

_pages/jardin/gallerie.md

 ---
 title: Gallerie du jardin
----
+menu:
+  jardin:
+    weight: 2
 
-des images...
+---
+des images...
\ No newline at end of file

_pages/jardin/index.md

 ---
 title: Jardin Universitaire de Luminy
+menu:
+  header:
+    title: Les pages du jardin
+    weight: 1
+    identifier: jardin
+
 ---
 # c'est le jardin
-gloubi boulga
+gloubi boulga
\ No newline at end of file

_pages/jardin/paniers.md

 ---
 title: Les paniers bio !
 overlay_image: assets/images/banniere-bulles.png
----
+menu:
+  footer:
+    weight: 3
+    title: Les paniers bio
+  jardin:
+    weight: 1
 
+---
 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, ...
 
 # Distribution paniers bio
 [Cagette.net]({{ site.data.extlinks.cagette }})
+
+header
+<ul>
+{% for item in site.menus.header %}
+  <li class="menu-item-{{ loop.index }}">
+    <a href="{{ item.url }}" title="Go to {{ item.title }}">{{ item.title }}</a>
+    {% if item.children %}
+      <ul class="sub-menu">
+      {% for item in item.children %}
+  {{ item.identifier | inspect }}
+        <li class="menu-item-{{ loop.index }}">
+          <a href="{{ item.url }}" title="Go to {{ item.title }}">{{ item.title }}</a>
+        </li>
+      {% endfor %}
+      </ul>
+    {% endif %}
+  </li>
+{% endfor %}
+</ul>
+
+jardin
+<ul>
+{% for item in site.menus.jardin %}
+  <li class="menu-item-{{ loop.index }}">
+    <a href="{{ item.url }}" title="Go to {{ item.title }}">{{ item.title }}</a>
+    {% if item.children %}
+      <ul class="sub-menu">
+      {% for item in item.children %}
+  {{ item.identifier | inspect }}
+        <li class="menu-item-{{ loop.index }}">
+          <a href="{{ item.url }}" title="Go to {{ item.title }}">{{ item.title }}</a>
+        </li>
+      {% endfor %}
+      </ul>
+    {% endif %}
+  </li>
+{% endfor %}
+</ul>
\ No newline at end of file

_posts/2019-11-08-welcome-to-jekyll.markdown

----
-title:  "Nouveau site"
-date:   2019-11-09 01:45:27 +0100
-categories: jekyll site
-image:
-  path: /assets/images/puget.jpg
----
-un test de post
-
-`avec un peu de code`
-et *de l'italique*
-
-puis des listes
- - un
-   vrai bordel
-   * plop
- - deux

_posts/2019-11-09-lucas-post.markdown

----
-title:  "Welcome to Jekyll!"
-date:   2019-11-08 21:45:27 +0100
-author: lucas
-categories: jekyll update
----
-You’ll find this post in your `_posts` directory. Go ahead and edit it and re-build the site to see your changes. You can rebuild the site in many different ways, but the most common way is to run `jekyll serve`, which launches a web server and auto-regenerates your site when a file is updated.
-
-Jekyll requires blog post files to be named according to the following format:
-
-`YEAR-MONTH-DAY-title.MARKUP`
-
-Where `YEAR` is a four-digit number, `MONTH` and `DAY` are both two-digit numbers, and `MARKUP` is the file extension representing the format used in the file. After that, include the necessary front matter. Take a look at the source for this post to get an idea about how it works.
-
-Jekyll also offers powerful support for code snippets:
-
-{% highlight ruby %}
-def print_hi(name)
-  puts "Hi, #{name}"
-end
-print_hi('Tom')
-#=> prints 'Hi, Tom' to STDOUT.
-{% endhighlight %}
-
-Check out the [Jekyll docs][jekyll-docs] for more info on how to get the most out of Jekyll. File all bugs/feature requests at [Jekyll’s GitHub repo][jekyll-gh]. If you have questions, you can ask them on [Jekyll Talk][jekyll-talk].
-
-[jekyll-docs]: https://jekyllrb.com/docs/home
-[jekyll-gh]:   https://github.com/jekyll/jekyll
-[jekyll-talk]: https://talk.jekyllrb.com/

_posts/2019-11-09-photo-puget.md

----
-title: photo du Puget
-layout: default
----
-
-trouvé
-
-![](/assets/uploads/400d-montpuget-grandbleu-080311-950x475.jpg)
\ No newline at end of file

admin/index.html

+<!-- forestryio: ignore; forestryio: admin -->
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="utf-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name="robots" content="noindex" />
+    <title>Admin</title>
+    <meta name="description" content=" " />
+    <meta name="author" content=" " />
+    <meta name="HandheldFriendly" content="true" />
+    <meta name="MobileOptimized" content="320" />
+    <!-- Use maximum-scale and user-scalable at your own risk. It disables pinch/zoom. Think about usability/accessibility before including.-->
+    <meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=no" />
+
+    <link rel="stylesheet" href="https://local.forestry.io/main.css" />
+
+    <!-- Google font -->
+    <link href="https://fonts.googleapis.com/css?family=Open+Sans" rel="stylesheet">
+
+    <!-- Fort awesome icon kit -->
+    <script src="https://use.fortawesome.com/b6f38602.js"></script>
+
+</head>
+<body>
+<div id="app">
+
+</div>
+<script id="admin-config-script" type="text/javascript">
+    var env = {
+        siteId: "fvoljsa2pwi-ca",
+        local: false
+    };
+</script>
+<script type="application/javascript" src="https://local.forestry.io/forestry.min.js"></script>
+
+</body>
+</html>