diff --git a/.forestry/front_matter/templates/single.yml b/.forestry/front_matter/templates/single.yml index e39d9b6109cb8915dce4cb2f55b04ce6ef9b9655..e55bbc7c250c2682455680c677f07718b9a3acb2 100644 --- a/.forestry/front_matter/templates/single.yml +++ b/.forestry/front_matter/templates/single.yml @@ -4,13 +4,221 @@ hide_body: false fields: - type: text name: title - label: title + label: Titre + config: + required: true - name: last_modified_at type: datetime label: Date dernière modification description: '' config: - required: false - date_format: + required: true + date_format: DD-MM-YYYY time_format: display_utc: false + export_format: '' + default: now + hidden: true +- name: share + type: boolean + label: Afficher les boutons de partage (réseaux sociaux) + description: Boutons Twitter, Facebook, Linkedin en bas de la page + default: true +- name: toc + type: boolean + label: Afficher le sommaire ? + default: true +- name: classes + type: select + default: '' + config: + required: false + options: + - wide + - " " + source: + type: simple + section: + file: + path: + label: Élargir la zone du texte (wide) + description: Le texte prend aussi l'espace à droite de la page. S'il y a un sommaire, + il sera placé en haut de la page. +- name: description + type: text + config: + required: false + label: Description + description: Description courte et précise pour le référencement. +- name: has_header + type: boolean + label: Afficher une entête visuelle + default: true +- name: header + type: field_group + config: {} + fields: + - name: type + type: select + default: default + config: + required: false + options: + - overlay + - image + - video + - default + source: + type: simple + section: + file: + path: + label: Type + description: 'default: overlay avec juste le titre de la page et la bannière de + l''asso. overlay: des infos sur une couleur ou une image de fond (l''image est + prioritaire)' + - name: color + type: color + config: + required: false + color_format: Hex + label: Couleur + showOnly: + field: type + value: overlay + - name: overlay_image + type: file + config: + maxSize: '15' + label: Image + showOnly: + field: type + value: overlay + - name: fixed_image + type: file + config: + maxSize: '15' + label: Image + showOnly: + field: type + value: image + - name: overlay_title + type: boolean + label: Titre sur l'entête + default: true + showOnly: + field: type + value: overlay + - name: show_text + type: select + default: description + config: + required: false + options: + - description + - custom + source: + type: simple + section: + file: + path: + label: Texte sur l'entête + showOnly: + field: type + value: overlay + - name: overlay_text + type: text + config: + required: false + label: Texte + showOnly: + field: show_text + value: custom + - name: caption + type: text + config: + required: false + showOnly: + field: type + value: overlay + label: Crédits + description: Apparaitra tout petit en bas à droite de l'image + - name: actions + type: field_group_list + fields: + - name: label + type: text + config: + required: false + label: Label + - name: url + type: text + config: + required: false + label: URL + - name: fa-icon + type: select + default: [] + config: + required: false + options: + - facebook + - calendrier + - helloasso + source: + type: simple + section: + file: + path: + label: Icone + config: + min: '0' + max: '5' + labelField: label + label: Boutons + showOnly: + field: type + value: overlay + - name: video + type: field_group + config: {} + fields: + - name: id + type: text + config: + required: false + label: Identifiant de la vidéo + description: Par exemple https://www.youtube.com/watch?v=**rKNMf4LFX44** (mettre + uniquement la partie en gras) + - name: provider + type: select + default: youtube + config: + required: false + options: + - youtube + - vimeo + - google-drive + source: + type: simple + section: + file: + path: + label: Fournisseur + label: Vidéo + showOnly: + field: type + value: video + label: Entête + showOnly: + field: has_header + value: true +- name: author + type: text + config: + required: false + label: Changer l'auteur par défaut + description: Mettre nom court (prefix) de l'auteur. Voir la rubrique "Les auteurs". + Si rien n'est indiqué, l'auteur par défaut sera celui de l'asso correspondante + au sous-dossier de la page. Exemple les pages sous "Centre Culturel de Luminy" + ont pour auteur "ccl". diff --git a/.forestry/front_matter/templates/template-auteurs.yml b/.forestry/front_matter/templates/template-auteurs.yml new file mode 100644 index 0000000000000000000000000000000000000000..f30ce2de279b818e3fe4a073a5d387744d594761 --- /dev/null +++ b/.forestry/front_matter/templates/template-auteurs.yml @@ -0,0 +1,60 @@ +--- +label: Template auteurs +hide_body: true +fields: +- type: field_group_list + name: authors + label: Auteurs + fields: + - type: text + name: name + label: Nom + description: Nom à afficher + config: + required: true + - type: text + name: prefix + label: Nom court (prefix) + config: + required: true + description: Utilisé pour déterminer le sous-dossier pour lequel cet auteur sera + celui par défaut. Également utile pour référencer l'auteur. + - type: text + name: avatar + label: Avatar + description: À apparaitre sur le profil à gauche + - type: text + name: bio + label: Bio + description: Courte bio ou description, à apparaitre dans le profil. + - type: text + name: banner + label: Bannière + description: Image à afficher par défaut en entête de chaque page de cet auteur. + - type: text + name: location + label: Localisation + description: À peu près + - type: text + name: email + label: Email + - type: text + name: facebook + label: Facebook + description: Donner l'URL + - type: text + name: helloasso + label: HelloAsso + description: Idem + - type: text + name: og_image + label: Image OpenGraph + description: Image par défaut lorsqu'une page de cet auteur est partagée. Par + défaut, c'est l'avatar. + description: Liste des auteurs, assos et collectifs qui publient sur luminy.org. + Le "profile" de l'auteur sera placé à gauche sur chaque page. Par défaut, le sous-dossier + contenant la page détermine l'auteur. + config: + labelField: name +pages: +- _data/authors.yml diff --git a/.forestry/front_matter/templates/template-navigations.yml b/.forestry/front_matter/templates/template-navigations.yml new file mode 100644 index 0000000000000000000000000000000000000000..a43703ba55e79e7ca9eff1a1b80af6734dbecfac --- /dev/null +++ b/.forestry/front_matter/templates/template-navigations.yml @@ -0,0 +1,69 @@ +--- +label: Template navigations +hide_body: true +fields: +- type: field_group_list + name: main + label: Navigation principale du haut. + fields: + - type: text + name: title + label: Label + - type: text + name: url + label: URL + description: Commun à tout luminy.org + config: + labelField: title +- type: field_group_list + name: navs + label: Navigations ad-hoc + fields: + - type: text + name: name + label: Nom court de l'auteur + description: Voir le champs "nom court (prefix)" dans "Les auteurs" + - name: nav + type: field_group_list + fields: + - name: title + type: text + config: + required: false + label: Section + description: Peut être vide, dans ce cas le titre de la section ne sera pas + affiché, mais les sous-sections oui. + - name: url + type: text + config: + required: false + label: URL + description: idem + - name: children + type: field_group_list + fields: + - name: title + type: text + config: + required: false + label: Nom de la sous-section + - name: url + type: text + config: + required: false + label: URL + config: + min: + max: + labelField: title + label: Sous-section + config: + min: '1' + max: + labelField: title + label: Arborescence + description: Les arborescences associés aux auteurs/assos/collectifs + config: + labelField: name +pages: +- _data/navigation.yml diff --git a/.forestry/settings.yml b/.forestry/settings.yml index 8d8cfbe7da07af702529af472c547f600e002912..a541ac9419ed8385eebcc5c5516ae72e85ec6b8f 100644 --- a/.forestry/settings.yml +++ b/.forestry/settings.yml @@ -4,15 +4,63 @@ auto_deploy: false admin_path: admin webhook_url: sections: -- type: document - path: _data/navigation.yml - label: Navigations - match: "**/*" - type: directory path: _pages - label: Toutes les pages + label: Pages racines + create: documents + match: "*" + templates: + - single +- type: directory + path: _pages/allie + label: ALLIÉ + create: all + match: "**/*" + templates: + - single +- type: directory + path: _pages/cafe-des-langues + label: Café des Langues + create: all + match: "**/*" + templates: + - single +- type: directory + path: _pages/ccl + label: Centre Culturel de Luminy + create: all + match: "**/*" + templates: + - single +- type: directory + path: _pages/club-science + label: Club de Science + create: all + match: "**/*" + templates: + - single +- type: directory + path: _pages/fse + label: FSE + create: all + match: "**/*" + templates: + - single +- type: directory + path: _pages/jardin + label: Jardin create: all match: "**/*" + templates: + - single +- type: heading + label: Config +- type: document + path: _data/authors.yml + label: Les auteurs +- type: document + path: _data/navigation.yml + label: Navigations upload_dir: assets/images public_path: "/assets/images" front_matter_path: '' diff --git a/_config.yml b/_config.yml index d63747c833d25c9ef9c5ee08edd65283c4928c9c..03403ac8e87032e216f70dd9d06564bba5945a66 100644 --- a/_config.yml +++ b/_config.yml @@ -26,6 +26,7 @@ baseurl : # the subpath of your site, e.g. "/blog" repository : # GitHub username/repo-name e.g. "mmistakes/minimal-mistakes" teaser : # path of fallback teaser image, e.g. "/assets/images/500x300.png" logo : &logo "/assets/images/authors-logo/indien-petit.png" +banner : "/assets/images/puget-fleuri.png" masthead_title : # overrides the website title displayed in the masthead, use " " for no title breadcrumbs : true # true, false (default) words_per_minute : 200 @@ -217,14 +218,12 @@ 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 @@ -278,9 +277,6 @@ defaults: values: layout: single author_profile: true - share: true toc_sticky: true - header: - show_overlay_excerpt: false sidebar: nav: true diff --git a/_data/authors.yml b/_data/authors.yml index 28c3f044a1af6aa3187bbc538cbd2bf9a04a5d77..023bce64f4e58d1558294d095663b5e8ea445a44 100644 --- a/_data/authors.yml +++ b/_data/authors.yml @@ -1,59 +1,78 @@ -# /_data/authors.yml +--- authors: - - name : "Centre Culturel de Luminy" - prefix : "ccl" - 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" - location : "Luminy" - email : "centre-culturel@luminy.org" - facebook : "CCLuminy" - helloasso : "centre-culturel-de-luminy" - - - name : "Jardin Universitaire" - prefix : "jardin" - avatar : /assets/images/authors-logo/logo-jardin.png - banner : /assets/images/banniere-jardin.jpg - bio : "Jardin partagé chaleureux et ouvert à tous ! " - location : "Bât. D" - email : "jardin@luminy.org" - facebook : "jardinluminy" - helloasso : "jardin-universitaire-de-luminy" - links: - - - name : "Club de Science Luminy" - prefix : "club-science" - avatar : /assets/images/authors-logo/logo-club-sciences.jpeg - bio : "Organisation de conférences, de cours d'histoire et de philosophie des sciences" - location : "Luminy" - email : "club.science.luminy@gmail.com" - facebook : "Club-de-Science-Luminy-114357542612098/" - - - name : "FSE Luminy" - prefix : "fse" - avatar : /assets/images/authors-logo/fse-transparent.png - bio : "INFORMER les étudiants, DÉFENDRE leurs droits, et créer la SOLIDARITÉ sur nos campus !" - location : "Cité U & Hexagone" - # email : "club.science.luminy@gmail.com" - facebook : "https://www.facebook.com/FSE.Luminy/" - - - name : "Café des Langues" - prefix : "cafe-des-langues" - avatar : /assets/images/authors-logo/cafe-des-langues.png - bio : "Venez converser autour d’un bon café et dans une ambiance très conviviale !" - location : "Bibliothèque U." - email : "cafedeslanguesluminy@gmail.com" - uri : "https://www.dropbox.com/sh/6xn3uv56ao1ttkg/AAAAJwwZIFg6zstXIRPo1gdga?dl=0&fbclid=IwAR2Q58fOCrfKTtEBtpShFKWxwarcXTe0NgfJXjMeIcXyrhLsFVKnwR1Z_VA" - facebook : "https://www.facebook.com/cafedeslanguesluminy" - twitter : "Cafe_Langues" - - - name : "ALLIÉ" - prefix : "allie" - avatar : /assets/images/authors-logo/allie.png - bio : "Association Luminyenne de Lutte et d'Information des Etudiants, est basée à Marseille" - location : "Hexagone" - uri : "http://allie-luminy.e-monsite.com/" - email : "allie@luminy.org" - facebook : "https://www.facebook.com/alliejournal/" - +- name: Marin + prefix: marin + avatar: '' + og_image: '' + banner: '' + bio: '' + location: '' + email: '' + facebook: '' + helloasso: '' +- name: Centre Culturel de Luminy + prefix: ccl + 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 + location: Luminy + email: centre-culturel@luminy.org + facebook: CCLuminy + helloasso: centre-culturel-de-luminy +- name: Jardin Universitaire + prefix: jardin + avatar: "/assets/images/authors-logo/logo-jardin.png" + banner: "/assets/images/banniere-jardin.jpg" + bio: 'Jardin partagé chaleureux et ouvert à tous ! ' + location: Bât. D + email: jardin@luminy.org + facebook: jardinluminy + helloasso: jardin-universitaire-de-luminy + links: + og_image: '' +- name: Club de Science Luminy + prefix: club-science + avatar: "/assets/images/authors-logo/logo-club-sciences.jpeg" + bio: Organisation de conférences, de cours d'histoire et de philosophie des sciences + location: Luminy + email: club.science.luminy@gmail.com + facebook: Club-de-Science-Luminy-114357542612098/ + banner: '' + helloasso: '' + og_image: '' +- name: FSE Luminy + prefix: fse + avatar: "/assets/images/authors-logo/fse-transparent.png" + bio: INFORMER les étudiants, DÉFENDRE leurs droits, et créer la SOLIDARITÉ sur nos + campus ! + location: Cité U & Hexagone + facebook: https://www.facebook.com/FSE.Luminy/ + banner: '' + email: '' + helloasso: '' + og_image: '' +- name: Café des Langues + prefix: cafe-des-langues + avatar: "/assets/images/authors-logo/cafe-des-langues.png" + bio: Venez converser autour d’un bon café et dans une ambiance très conviviale ! + location: Bibliothèque U. + email: cafedeslanguesluminy@gmail.com + uri: https://www.dropbox.com/sh/6xn3uv56ao1ttkg/AAAAJwwZIFg6zstXIRPo1gdga?dl=0&fbclid=IwAR2Q58fOCrfKTtEBtpShFKWxwarcXTe0NgfJXjMeIcXyrhLsFVKnwR1Z_VA + facebook: https://www.facebook.com/cafedeslanguesluminy + twitter: Cafe_Langues + banner: '' + helloasso: '' + og_image: '' +- name: ALLIÉ + prefix: allie + avatar: "/assets/images/authors-logo/allie.png" + bio: Association Luminyenne de Lutte et d'Information des Etudiants, est basée à + Marseille + location: Hexagone + uri: http://allie-luminy.e-monsite.com/ + email: allie@luminy.org + facebook: https://www.facebook.com/alliejournal/ + banner: '' + helloasso: '' + og_image: '' diff --git a/_data/navigation.yml b/_data/navigation.yml index dc6afe642c08ff3c5a259a0b49602d2138285fc3..2df005edeb2b4f108577f92c9603ddd7381711cc 100644 --- a/_data/navigation.yml +++ b/_data/navigation.yml @@ -1,67 +1,65 @@ -# mashead links +--- main: - - title: "Agenda" - url: /agenda/ - - title: "Le Grenier" - url: /grenier/ - - title: "À Propos" - url: /about/ - - - +- 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/ - - name: "fse" - nav: - - title: "FSE Luminy" - url: /fse/ - children: - - title: "Communiqués de presse" - url: /fse/communiques +- 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" diff --git a/_includes/author-profile.html b/_includes/author-profile.html index 12c5971bba0f6d518f41f8a84538960290820c3b..884f2627755585b0ae6790acd89809c20171dfd1 100644 --- a/_includes/author-profile.html +++ b/_includes/author-profile.html @@ -1,6 +1,8 @@ <!-- {% assign author = page.author | default: page.authors[0] | default: site.author %} --> -{% assign author = page.url | split: "/" %} -{% assign author = author[1] %} +{% unless page.author %} + {% 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"> diff --git a/_includes/page__hero.html b/_includes/page__hero.html index 7d43bca58b6153f54b73fd53e7aaf0dc9b34fc8f..3ae27d14a3c186ac0e8c9ca36fb22c43276e4c7f 100644 --- a/_includes/page__hero.html +++ b/_includes/page__hero.html @@ -1,7 +1,42 @@ -{% if page.header.image contains "://" %} - {% capture img_path %}{{ page.header.image }}{% endcapture %} +{% if page.header.type == 'default' %} + {% capture header_type %}overlay{% endcapture %} + {% capture overlay_title %}true{% endcapture %} + {% capture overlay_text %}{{ page.header.description }}{% endcapture %} + {% capture overlay_actions %}false{% endcapture %} + {% capture img_path %}{{ author.banner | default: site.banner }}{% endcapture %} {% else %} - {% capture img_path %}{{ page.header.image | relative_url }}{% endcapture %} + + {% capture header_type %}{{ page.header.type }}{% endcapture %} + + {% if page.header.fixed_image contains "://" %} + {% capture fixed_img_path %}{{ page.header.fixed_image}}{% endcapture %} + {% else %} + {% capture fixed_img_path %}{{ page.header.fixed_image | 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 header_type == 'overlay' %} + {% capture img_path %}{{ overlay_img_path }}{% endcapture %} + {% elsif header_type == 'image' %} + {% capture img_path %}{{ fixed_img_path }}{% endcapture %} + {% endif %} + + {% capture overlay_title %}{{ page.header.overlay_title }}{% endcapture %} + + {% if page.header.show_text == 'description' %} + {% capture overlay_text %}{{ page.description }}{% endcapture %} + {% elsif page.header.show_text == 'custom' %} + {% capture overlay_text %}{{ page.header.custom_text }}{% endcapture %} + {% endif %} + + {% if page.header.actions %} + {% assign overlay_actions = true %} + {% endif %} {% endif %} {% if page.header.cta_url contains "://" %} @@ -10,14 +45,6 @@ {% capture cta_path %}{{ page.header.cta_url | relative_url }}{% endcapture %} {% endif %} -{% if page.overlay_image contains "://" %} - {% capture overlay_img_path %}{{ page.overlay_image }}{% endcapture %} -{% elsif page.overlay_image %} - {% capture overlay_img_path %}{{ page.overlay_image | relative_url }}{% endcapture %} -{% elsif author.banner %} - {% capture overlay_img_path %}{{ author.banner | relative_url }}{% endcapture %} -{% endif %} - {% if page.header.overlay_filter contains "rgba" %} {% capture overlay_filter %}{{ page.header.overlay_filter }}{% endcapture %} {% elsif page.header.overlay_filter %} @@ -32,43 +59,59 @@ {% assign image_description = image_description | markdownify | strip_html | strip_newlines | escape_once %} -<div class="page__hero{% if page.header.overlay_color or page.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 %}" +<div class="page__hero{% if header_type == 'overlay' %}--overlay{% endif %}" + style="{% if header_type == 'overlay' %} + {% if page.header.color %} + background-color: {{ page.header.color | default: 'transparent' }}; + {% endif %} + {% if img_path %} + background-image: + {% if overlay_filter %} + linear-gradient({{ overlay_filter }}, + {{ overlay_filter }}),{% endif %} + {% endif %}url('{{ img_path }}'); + {% endif %}" > - {% if page.overlay_image or author.banner %} + {% if header_type == 'overlay' %} <div class="wrapper"> - <h1 id="page-title" class="page__title" itemprop="headline"> + {% if overlay_title %} + <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 %} + {{ 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>" }} + {{ 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 %} + </h1> + {% endif %} + {% if overlay_text %} + <p class="page__lead">{{ overlay_text | 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 %} + {% 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 %} + {% endif %} + {% if overlay_actions == true and page.header.actions %} <p> {% for action in page.header.actions %} - {% if action.url contains "://" %} + {% if action.url contains "://" %} {% assign url = action.url %} - {% else %} + {% 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> + {% 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 %} + {% 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> + {% if page.header.caption %} + <span class="page__hero-caption">{{ page.header.caption | markdownify | remove: "<p>" | remove: "</p>" }}</span> + {% endif %} + {% elsif header_type == 'image' %} + <img src="{{ img_path }}" alt="{{ img_path }}" class="page__hero-image"> + {% elsif page.header_type == 'video' %} + {% capture video_id %}{{ page.header.video.id }}{% endcapture %} + {% capture video_provider %}{{ page.header.video.provider }}{% endcapture %} + {% include video id=video_id provider=video_provider %} {% endif %} </div> diff --git a/_includes/page__hero_video.html b/_includes/page__hero_video.html deleted file mode 100644 index 8586a95a2b15195fa9f6fc9539d1e92ea6979d11..0000000000000000000000000000000000000000 --- a/_includes/page__hero_video.html +++ /dev/null @@ -1,4 +0,0 @@ -{% capture video_id %}{{ page.header.video.id }}{% endcapture %} -{% capture video_provider %}{{ page.header.video.provider }}{% endcapture %} - -{% include video id=video_id provider=video_provider %} diff --git a/_includes/seo.html b/_includes/seo.html index be95b29e8989a855f153ff443700a5a88f71767d..f4415d3730cbd7f1822c0b368ef8f41e5b274be9 100644 --- a/_includes/seo.html +++ b/_includes/seo.html @@ -25,6 +25,7 @@ {%- assign seo_description = seo_description | markdownify | strip_html | strip_newlines | escape_once -%} {%- 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 %} diff --git a/_layouts/single.html b/_layouts/single.html index 1eec134759073fb331521e76a0113376586ebbac..acf2110274c983d98b037e73a98ee993eb8d222e 100644 --- a/_layouts/single.html +++ b/_layouts/single.html @@ -2,14 +2,14 @@ layout: default --- -{% assign author = page.url | split: "/" %} -{% assign author = author[1] %} +{% unless page.author %} + {% assign author = page.url | split: "/" %} + {% assign author = author[1] %} +{% endunless %} {% assign author = site.data.authors.authors | where: "prefix", author | first %} -{% if page.header.overlay_color or page.overlay_image or page.header.image or author.banner %} +{% if page.has_header %} {% include page__hero.html %} -{% elsif page.header.video.id and page.header.video.provider %} - {% include page__hero_video.html %} {% endif %} {% if page.url != "/" and site.breadcrumbs %} @@ -28,15 +28,13 @@ layout: default {% if page.last_modified_at %}<meta itemprop="dateModified" content="{{ page.last_modified_at | date: "%B %d, %Y" }}">{% endif %} <div class="page__inner-wrap"> - {% unless page.header.overlay_color or page.overlay_image or author.banner %} - {% unless page.no_title %} + {% unless page.header.type == 'overlay' or page.header.type == 'default' %} <header> {% if page.title %}<h1 id="page-title" class="page__title" itemprop="headline">{{ page.title | markdownify | remove: "<p>" | remove: "</p>" }}</h1>{% endif %} {% if page.read_time %} <p class="page__meta"><i class="far fa-clock" aria-hidden="true"></i> {% include read-time.html %}</p> {% endif %} </header> - {% endunless %} {% endunless %} <section class="page__content" itemprop="text"> diff --git a/_pages/404.md b/_pages/404.md index 58a83eb39918d19e3a9cc6dcd5c846aa50f663b1..61a4f545bc202e479213c1036088c808b49f225a 100644 --- a/_pages/404.md +++ b/_pages/404.md @@ -3,10 +3,5 @@ title: Page non trouvée permalink: "/404.html" author_profile: false share: false -menu: - footer: - title: Des témoignages - weight: 1 - --- -# 404 \ No newline at end of file +# 404 diff --git a/_pages/about.md b/_pages/about.md index 47c212c5e2087ad70433634bf6389779edd12057..ebdac9eaddf7cedd8ef99d2000f607ba21d400c1 100644 --- a/_pages/about.md +++ b/_pages/about.md @@ -1,10 +1,5 @@ --- 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 @@ -13,4 +8,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/) \ No newline at end of file +## [Parlez-en-nous !](/contacts/) diff --git a/_pages/agenda.md b/_pages/agenda.md index f6cb053efbb90b7e45f48be39dd7da476a612322..d060a0bd4b28e12a6b121a3984b95034dc9ea6a7 100644 --- a/_pages/agenda.md +++ b/_pages/agenda.md @@ -1,8 +1,12 @@ --- title: Agenda ---- +description: Agenda commun luminy.org +has_header: false +header: + type: default +--- <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> +scrolling="no"></iframe> \ No newline at end of file diff --git a/_pages/ccl/activites/lorem-ipsum.md b/_pages/ccl/activites/lorem-ipsum.md new file mode 100644 index 0000000000000000000000000000000000000000..8f5fb36d66c3bc68287f0cedd860015bb95b7535 --- /dev/null +++ b/_pages/ccl/activites/lorem-ipsum.md @@ -0,0 +1,80 @@ +--- +last_modified_at: 2019-11-24T19:12:07.000+00:00 +toc: true +has_header: true +header: + type: default + overlay_title: true + show_text: description + color: "#AC6B6B" + overlay_image: "/assets/images/banniere-jardin.jpg" + fixed_image: "/assets/images/atelier-mix.jpg" + overlay_text: '' + caption: Crédit + actions: + - label: Facebook + url: http://facebook.com + fa-icon: facebook +title: Lorem Ipsum +classes: wide +description: Une description incroyable + +--- +# 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/ccl/index.md b/_pages/ccl/index.md index aa0f2aa193d6d2db4c8ea00070642d7590502139..fb8b90a2161de3353eed15ae9c2f1adca47c70f4 100644 --- a/_pages/ccl/index.md +++ b/_pages/ccl/index.md @@ -1,8 +1,9 @@ --- title: Le CCL -no_title: true +has_header: true header: - image: assets/images/banniere-ccl-intime.png + type: image + fixed_image: assets/images/banniere-ccl-intime.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 ! diff --git a/_pages/ccl/l-asso/adherer.md b/_pages/ccl/l-asso/adherer.md index 1ede84abe7d77284354656bad6df3acc260eb4e4..a8ae4f9c39852d9458a58d72207a33acd974d3f4 100644 --- a/_pages/ccl/l-asso/adherer.md +++ b/_pages/ccl/l-asso/adherer.md @@ -1,6 +1,5 @@ --- title: Adhésion et soutiens -menu: ccl-l-asso toc: true share: true overlay_image: assets/images/banniere-bulles.png diff --git a/_pages/ccl/l-asso/bureau.md b/_pages/ccl/l-asso/bureau.md index 54a66b27bf9780b43295830512c404d5fcf460b2..9d38cd48802d69f0256cc3726ba575fc166f523c 100644 --- a/_pages/ccl/l-asso/bureau.md +++ b/_pages/ccl/l-asso/bureau.md @@ -1,6 +1,5 @@ --- title: Bureaux du CCL au fil des années -menu: ccl-l-asso section: ccl --- ## 2019-2020 diff --git a/_pages/ccl/l-asso/contacts.md b/_pages/ccl/l-asso/contacts.md index 623cff33829b3c3f4e9e7e82146c4f96ff72f095..79a206557064753a65d21e2dc2bece5c8b22ff5a 100644 --- a/_pages/ccl/l-asso/contacts.md +++ b/_pages/ccl/l-asso/contacts.md @@ -1,6 +1,5 @@ --- title: Contacts -menu: ccl-l-asso no_title: true section: ccl toc: true diff --git a/_pages/ccl/l-asso/presentation-longue.md b/_pages/ccl/l-asso/presentation-longue.md index 4d5f5f31e00c5425b12441b98a4e64b0a78d96d1..a402e70ffc04089c65443580e70775cf774d4ed9 100644 --- a/_pages/ccl/l-asso/presentation-longue.md +++ b/_pages/ccl/l-asso/presentation-longue.md @@ -1,6 +1,5 @@ --- title: Présentation -menu: ccl-l-asso section: "ccl" --- diff --git a/_pages/ccl/l-asso/statuts.md b/_pages/ccl/l-asso/statuts.md index d801241bdc9865e660215f1c640392e49b3c6a9a..d3fc63614cc0b8e1ecedfc62a39bf124da276376 100644 --- a/_pages/ccl/l-asso/statuts.md +++ b/_pages/ccl/l-asso/statuts.md @@ -1,6 +1,5 @@ --- title: "Statuts de l'asso" -menu: ccl-l-asso section: "ccl" --- diff --git a/_pages/index.md b/_pages/index.md index 923e226114fe6bab89eba6e98877fb4f5f3e6aa2..6679fda8509caa9edfefe78b4cd1fc4248027dd0 100644 --- a/_pages/index.md +++ b/_pages/index.md @@ -1,8 +1,11 @@ --- layout: splash title: Centre Culturel de Luminy +has_header: true overlay_image: assets/images/puget-fleuri.png header: + type: default + overlay_image: assets/images/banniere-ccl-intime.png actions: - label: "<i class='fas fa-users'></i> Adhérez" url: "/ccl/adherer/" @@ -11,7 +14,7 @@ header: - label: "<i class='fas fa-fw fa-calendar-alt'></i> Agenda" url: "/agenda/" show_overlay_excerpt: true -excerpt: > +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. feature_row: - image_path: assets/images/panier.png diff --git a/_pages/jardin/gallerie.md b/_pages/jardin/gallerie.md index 96f01f19035f2770ff02030e28b45e0b3d498a4c..f8074ad12c9f1b2a9b5da1a8fe051fea5f253b9e 100644 --- a/_pages/jardin/gallerie.md +++ b/_pages/jardin/gallerie.md @@ -1,8 +1,4 @@ --- title: Gallerie du jardin -menu: - jardin: - weight: 2 - --- -des images... \ No newline at end of file +des images... diff --git a/_pages/jardin/index.md b/_pages/jardin/index.md index 109456cd2eff91e972e4bbb239adbc223d3ba71c..de09941163f448aca927d803b9a781d580a3fb50 100644 --- a/_pages/jardin/index.md +++ b/_pages/jardin/index.md @@ -1,11 +1,12 @@ --- title: Jardin Universitaire de Luminy -menu: - header: - title: Les pages du jardin - weight: 1 - identifier: jardin - +has_header: true +toc: true +header: + type: default --- # c'est le jardin -gloubi boulga \ No newline at end of file + +gloubi boulga + +# Lorem ipsum \ No newline at end of file diff --git a/_pages/jardin/lorem-ipsum.md b/_pages/jardin/lorem-ipsum.md new file mode 100644 index 0000000000000000000000000000000000000000..67a159bd103180fd1477a85ccdcb5089ee398de6 --- /dev/null +++ b/_pages/jardin/lorem-ipsum.md @@ -0,0 +1,83 @@ +--- +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 index cac0f35031b028c2d0e6c1eaecac0f539357ed94..93c65d860e485cad7eea5b08520ef024b85ba035 100644 --- a/_pages/jardin/paniers.md +++ b/_pages/jardin/paniers.md @@ -1,13 +1,10 @@ --- title: Les paniers bio ! -last_modified_at: 2019-11-18T14:16:10.453Z -overlay_image: assets/images/banniere-bulles.png -menu: - footer: - weight: 3 - title: Les paniers bio - jardin: - weight: 1 +last_modified_at: 2019-11-18T14:16:10.453+00:00 +has_header: true +header: + type: default +author: marin --- 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, ... @@ -53,4 +50,4 @@ jardin {% endif %} </li> {% endfor %} -</ul> \ No newline at end of file +</ul> diff --git a/_pages/lorem.md b/_pages/lorem.md new file mode 100644 index 0000000000000000000000000000000000000000..9450b2d789b53f1a485fdd6bb5628072bba9dc85 --- /dev/null +++ b/_pages/lorem.md @@ -0,0 +1,26 @@ +--- +last_modified_at: 2019-11-24 17:25:29 +0100 +toc: true +has_header: true +header: + header_type: Par défaut + overlay_color: rgb(125, 103, 103) + overlay_title: true + header_text: Texte personnalisé + overlay_image: '' + image: '' + texte_d_entete_personnalise: desc lorem + caption: '' + actions: + - label: go + url: fb-url + fa-icon: facebook + - label: agenda + url: agenda + fa-icon: calendrier +title: lorem +classes: '' +description: '' + +--- +lorem ipesum \ No newline at end of file diff --git a/admin/index.html b/admin/index.html index 537b597a3b4b7e9d648177ffcfc0fc123de9e972..17662aebda59386b389b9d92cc3b5ceae01afcac 100644 --- a/admin/index.html +++ b/admin/index.html @@ -28,7 +28,7 @@ </div> <script id="admin-config-script" type="text/javascript"> var env = { - siteId: "fvoljsa2pwi-ca", + siteId: "tusbl68jjri-pq", local: false }; </script>