Merge branch 'develop' into ccl

_data/menus.yml

----
-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/

_includes/author-profile.html

 <!-- {% assign author = page.author | default: page.authors[0] | default: site.author %} -->
-{% unless page.author %}
-  {% assign author = page.url | split: "/" %}
-  {% assign author = author[1] %}
-{% endunless %}
-{% assign author = site.data.authors.authors | where: "prefix", author | first %}
+{% assign author = site.data.authors.authors | where: "prefix", site.author | first %}
 
 <div itemscope itemtype="https://schema.org/Person">
 

_includes/nav_list

-{% assign navigation = site.data.navigation.navs | where: "name", include.nav | map: "nav" | first %}
+{% assign navigation = site.data.navigation.nav %}
 
 <nav class="nav__list">
   {% if page.sidebar.title %}<h3 class="nav__title" style="padding-left: 0;">{{ page.sidebar.title }}</h3>{% endif %}

_includes/page__hero.html.bak

+{% if page.header.image contains "://" %}
+  {% capture img_path %}{{ page.header.image }}{% endcapture %}
+{% else %}
+  {% capture img_path %}{{ page.header.image | relative_url }}{% endcapture %}
+{% endif %}
+
+{% if page.header.cta_url contains "://" %}
+  {% capture cta_path %}{{ page.header.cta_url }}{% endcapture %}
+{% else %}
+  {% capture cta_path %}{{ page.header.cta_url | relative_url }}{% endcapture %}
+{% endif %}
+
+{% if page.header.overlay_image contains "://" %}
+  {% 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 %}
+{% endif %}
+
+{% if page.header.overlay_filter contains "rgba" %}
+  {% capture overlay_filter %}{{ page.header.overlay_filter }}{% endcapture %}
+{% elsif page.header.overlay_filter %}
+  {% capture overlay_filter %}rgba(0, 0, 0, {{ page.header.overlay_filter }}){% endcapture %}
+{% endif %}
+
+{% if page.header.image_description %}
+  {% assign image_description = page.header.image_description %}
+{% else %}
+  {% assign image_description = page.title %}
+{% endif %}
+
+{% 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 %}"
+  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 %}
+    <div class="wrapper">
+      <h1 id="page-title" class="page__title" itemprop="headline">
+        {% if paginator and site.paginate_show_page_num %}
+          {{ site.title }}{% unless paginator.page == 1 %} {{ site.data.ui-text[site.locale].page | default: "Page" }} {{ paginator.page }}{% endunless %}
+        {% else %}
+          {{ page.title | default: site.title | markdownify | remove: "<p>" | remove: "</p>" }}
+        {% endif %}
+      </h1>
+      {% if page.header.show_overlay_excerpt != false and page.excerpt %}
+        <p class="page__lead">{{ page.excerpt | markdownify | remove: "<p>" | remove: "</p>" }}</p>
+      {% endif %}
+      {% if page.read_time %}
+        <p class="page__meta"><i class="far fa-clock" aria-hidden="true"></i> {% include read-time.html %}</p>
+      {% endif %}
+      {% if page.header.cta_url %}
+        <p><a href="{{ cta_path }}" class="btn btn--light-outline btn--large">{{ page.header.cta_label | default: site.data.ui-text[site.locale].more_label | default: "Learn More" }}</a></p>
+      {% endif %}
+      {% if page.header.actions %}
+        <p>
+        {% for action in page.header.actions %}
+          {% if action.url contains "://" %}
+            {% assign url = action.url %}
+          {% else %}
+            {% assign url = action.url | relative_url %}
+          {% endif %}
+          <a href="{{ url }}" class="btn btn--light-outline btn--large">{{ action.label | default: site.data.ui-text[site.locale].more_label | default: "Learn More" }}</a>
+        {% endfor %}
+      {% endif %}
+    </div>
+  {% else %}
+    <img src="{{ img_path }}" alt="{{ image_description }}" class="page__hero-image">
+  {% endif %}
+  {% if page.header.caption %}
+    <span class="page__hero-caption">{{ page.header.caption | markdownify | remove: "<p>" | remove: "</p>" }}</span>
+  {% endif %}
+</div>

_includes/seo.html

@@ -26,9 +26,7 @@
 {%- endif -%}
 
 <!-- don't use page.author even if it is set, find author based on url -->
-{% assign author = page.url | split: "/" %}
-{% assign author = author[1] %}
-{% assign author = site.data.authors.authors | where: "prefix", author | first %}
+{% assign author = site.data.authors.authors | where: "prefix", site.author | first %}
 
 {%- if author.twitter -%}
   {%- assign author_twitter = author.twitter | replace: "@", "" -%}

_layouts/single.html

@@ -2,11 +2,7 @@
 layout: default
 ---
 
-{% unless page.author %}
-  {% assign author = page.url | split: "/" %}
-  {% assign author = author[1] %}
-{% endunless %}
-{% assign author = site.data.authors.authors | where: "prefix", author | first %}
+{% assign author = site.data.authors.authors | where: "prefix", site.author | first %}
 
 {% if page.has_header %}
   {% include page__hero.html %}