bachir/grav-lecampus
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

bug fix angenda+sidebar

Browse Source
This commit is contained in:
Kevin Tessier 2019-06-08 18:00:55 +02:00
parent b3800e5e04
commit 5c8f37419f
5 changed files with 42 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
user/themes/lecampus/blueprints/event.yaml
View File

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

4
user/themes/lecampus/templates/archive.html.twig
View File

@ -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 %}

6
user/themes/lecampus/templates/calendrier.html.twig
View File

@ -16,13 +16,15 @@
{% include 'partials/taxonomylist.html.twig' with {base_url: my_url, taxonomy: 'tag'} %}
</div>
</section>
<section class="body-wrapper">
{% 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 %}
</section>

16
user/themes/lecampus/templates/partials/blog/date.html.twig
View File

@ -1,24 +1,24 @@
<div class="date">
<span class="dt">
{% 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
<time class="dt-begin" datetime="{{ page.header.date_begin|date("c") }}">
{{ page.header.date_begin|date('d') }}
<time class="dt-begin" datetime="{{ page.header.date|date("c") }}">
{{ page.header.date|date('d') }}
{{mois_begin}}
{{ page.header.date_begin|date('Y') }}
{{ page.header.date|date('Y') }}
à
{{ page.header.date_begin|date('g', "Europe/Paris") }}h{{ page.header.date_begin|date('i', "Europe/Paris") }}
{{ page.header.date|date('g', "Europe/Paris") }}h{{ page.header.date|date('i', "Europe/Paris") }}
</time>
{% endif %}
{% if page.header.date_end %}
Du
<time class="dt-begin" datetime="{{ page.header.date_begin|date("c") }}">
{{ page.header.date_begin|date('d') }}
<time class="dt-begin" datetime="{{ page.header.date|date("c") }}">
{{ page.header.date|date('d') }}
{{mois_begin}}
{{ page.header.date_begin|date('Y') }}
{{ page.header.date|date('Y') }}
</time>
au
<time class="dt-end" datetime="{{ page.header.date_end|date("c") }}">

25
user/themes/lecampus/templates/partials/sidebar.html.twig
View File

@ -1,19 +1,26 @@
{% set options = { items: {'@page.children': '/agenda'}, 'limit': 3, 'order': {'by': 'date', 'dir': 'asc'} } %}
{% set options = { items: {'@page.children': '/agenda'} } %}
{% set h2 = h2 ?: 'h2' %}
{% set h3 = h3 ?: 'h3' %}
<div class="sidebar">
<{{h2}}>À venir</{{h2}}>
{% for p in page.collection(options)%}
<div class="side-agenda">
<a href="{{p.url}}">
{% include 'partials/blog/date.html.twig' with {page: p } %}
<{{h3}}>{{p.title}}</{{h3}}>
{{p.summary(70)}}
</a>
</div>
{% set this_year = "now"|date('Y') %}
{% set this_month = "now"|date('M') %}
{% set this_day = "now"|date('d') %}
{% for p in page.collection(options).dateRange( this_day ~ this_month ~ this_year, '12/31/' ~ this_year).slice(0, 3).order('date', 'asc') %}
<div class="side-agenda">
<a href="{{p.url}}">
{% include 'partials/blog/date.html.twig' with {page: p} %}
<{{h3}}>{{p.title}}</{{h3}}>
{{p.summary(70)}}
</a>
</div>
{% endfor %}
<div class="side-all-agenda">
<a href="/agenda">voir tout l'agenda</a>
</div>
</div>