diff --git a/user/themes/lecampus/blueprints/event.yaml b/user/themes/lecampus/blueprints/event.yaml index 88d3aa0..ee27587 100644 --- a/user/themes/lecampus/blueprints/event.yaml +++ b/user/themes/lecampus/blueprints/event.yaml @@ -12,16 +12,18 @@ form: title: Informations Complementaire columns: + ordering@: -4 type: columns fields: column1: type: column fields: - header.date_begin: + header.date: + replace@: true type: datetime - label: Début de l'événement + label: Debut de l'événement help: PLUGIN_ADMIN.DATE_HELP - + column2: type: column fields: @@ -29,7 +31,13 @@ form: type: datetime label: Fin de l'événement help: PLUGIN_ADMIN.DATE_HELP - + options: + fields: + publishing: + fields: + header.date: + unset@: true + blog: type: tab title: Blog Item diff --git a/user/themes/lecampus/templates/archive.html.twig b/user/themes/lecampus/templates/archive.html.twig index cd825a8..988981a 100644 --- a/user/themes/lecampus/templates/archive.html.twig +++ b/user/themes/lecampus/templates/archive.html.twig @@ -29,9 +29,9 @@ {% embed 'partials/layout.html.twig' with {blog: page} %} {% block item %} - {% for child in page.find('/agenda').children %} + {% for child in page.find('/agenda').children.order('date','desc') %} - {% if child.header.date_end|date("ymd") <= "now"|date("ymd") %} + {% if child.header.date|date("ymd") <= "now"|date("ymd") %} {% include 'partials/cal-list-event.html.twig' with {blog: page, page: child} %} {% endif %} diff --git a/user/themes/lecampus/templates/calendrier.html.twig b/user/themes/lecampus/templates/calendrier.html.twig index bcf2618..e325fe0 100644 --- a/user/themes/lecampus/templates/calendrier.html.twig +++ b/user/themes/lecampus/templates/calendrier.html.twig @@ -16,13 +16,15 @@ {% include 'partials/taxonomylist.html.twig' with {base_url: my_url, taxonomy: 'tag'} %} +
{% block item %} - {% for child in collection.order('folder','asc') %} - {% if child.header.date_begin|date("ymd") >= "now"|date("ymd") %} + {% for child in collection.order('date','asc') %} + {% if child.header.date|date("ymd") >= "now"|date("ymd") %} {% include 'partials/cal-list-event.html.twig' with {blog: page, page: child} %} {% endif %} {% endfor %} + {{date_b}} {% endblock %}
diff --git a/user/themes/lecampus/templates/partials/blog/date.html.twig b/user/themes/lecampus/templates/partials/blog/date.html.twig index 9ae6e29..c23109d 100644 --- a/user/themes/lecampus/templates/partials/blog/date.html.twig +++ b/user/themes/lecampus/templates/partials/blog/date.html.twig @@ -1,24 +1,24 @@
-{% set mois_begin = 'MONTHS_OF_THE_YEAR'|ta(page.header.date_begin|date('n') - 1) %} +{% set mois_begin = 'MONTHS_OF_THE_YEAR'|ta(page.header.date|date('n') - 1) %} {% set mois_end = 'MONTHS_OF_THE_YEAR'|ta(page.header.date_end|date('n') - 1) %} {% if not page.header.date_end %} Le -