From 875d1914b450d63496b47e3c60586c2f75cd0620 Mon Sep 17 00:00:00 2001 From: Kevin Date: Tue, 7 Jul 2020 12:50:56 +0200 Subject: [PATCH] fix date && isotope --- web/app/themes/la_mine/archive.php | 17 ++++++++++ web/app/themes/la_mine/asset/dist/style.css | 19 ------------ web/app/themes/la_mine/functions.php | 20 +++++++++++- web/app/themes/la_mine/templates/archive.twig | 31 ++++++++++++++----- .../components/thumbnails/thumbnails.twig | 18 +++++------ web/app/themes/la_mine/templates/single.twig | 19 ++++++------ 6 files changed, 78 insertions(+), 46 deletions(-) create mode 100644 web/app/themes/la_mine/archive.php diff --git a/web/app/themes/la_mine/archive.php b/web/app/themes/la_mine/archive.php new file mode 100644 index 00000000..394b9f5a --- /dev/null +++ b/web/app/themes/la_mine/archive.php @@ -0,0 +1,17 @@ + 'post', + 'post_status'=>'publish', +); + +$context['post'] = Timber::get_post(); +$context['posts'] = Timber::get_posts( $args ); +$context['terms'] = Timber::get_terms(array( 'taxonomy'=> 'category', 'hide_empty' => true, 'parent' => 0)); + +Timber::render('archive.twig', $context ); diff --git a/web/app/themes/la_mine/asset/dist/style.css b/web/app/themes/la_mine/asset/dist/style.css index 80f753f3..79e9cd26 100644 --- a/web/app/themes/la_mine/asset/dist/style.css +++ b/web/app/themes/la_mine/asset/dist/style.css @@ -976,25 +976,6 @@ body.la-collecte .__header h3{ .coming_soon{ width: 100%; } - .coming_soon .thumbnails, .other-posts .thumbnails, .item.thumbnails { - margin-top: 30px; - -webkit-transform: scale(1); - -ms-transform: scale(1); - transform: scale(1); - -webkit-transition: -webkit-transform 0.3s ease; - transition: -webkit-transform 0.3s ease; - -o-transition: transform 0.3s ease; - transition: transform 0.3s ease; - transition: transform 0.3s ease, -webkit-transform 0.3s ease; - } - .coming_soon .thumbnails:hover, .other-posts .thumbnails:hover, .item.thumbnails:hover { - -webkit-transform: scale(1.05); - -ms-transform: scale(1.05); - transform: scale(1.05); - -webkit-transition: all 0.3s ease; - -o-transition: all 0.3s ease; - transition: all 0.3s ease; - } /* ALL thumbnails */ .thumbnails .__img{ diff --git a/web/app/themes/la_mine/functions.php b/web/app/themes/la_mine/functions.php index f8b253a5..9478165e 100644 --- a/web/app/themes/la_mine/functions.php +++ b/web/app/themes/la_mine/functions.php @@ -188,7 +188,25 @@ add_action('init', 'post_projets', 10); - + add_action( 'init', 'cp_change_post_object' ); + // Change dashboard Posts to News + function cp_change_post_object() { + $get_post_type = get_post_type_object('post'); + $labels = $get_post_type->labels; + $labels->name = 'Évenements'; + $labels->singular_name = 'Évenements'; + $labels->add_new = 'Add Évenements'; + $labels->add_new_item = 'Add Évenements'; + $labels->edit_item = 'Edit Évenements'; + $labels->new_item = 'Évenements'; + $labels->view_item = 'View Évenements'; + $labels->search_items = 'Search Évenements'; + $labels->not_found = 'No Évenements found'; + $labels->not_found_in_trash = 'No Évenements found in Trash'; + $labels->all_items = 'All Évenements'; + $labels->menu_name = 'Évenements'; + $labels->name_admin_bar = 'Évenements'; + } ?> diff --git a/web/app/themes/la_mine/templates/archive.twig b/web/app/themes/la_mine/templates/archive.twig index 7e79671b..bcc8ffb0 100644 --- a/web/app/themes/la_mine/templates/archive.twig +++ b/web/app/themes/la_mine/templates/archive.twig @@ -1,9 +1,26 @@ -{# This file demonstrates using most of the index.twig template and modifying - just a small part. See `search.twig` for an example of another approach #} - -{% extends "index.twig" %} - +{% extends "base.twig" %} {% block content %} -

This is my archive

- {{ parent() }} +{% include 'components/title_page.twig' %} +
+ + +
+ {% for item in posts %} + {% include 'components/thumbnails/thumbnails.twig'%} + {% endfor %} +
+
+ objet 4 +
+
+ {% endblock %} diff --git a/web/app/themes/la_mine/templates/components/thumbnails/thumbnails.twig b/web/app/themes/la_mine/templates/components/thumbnails/thumbnails.twig index 3b9a9328..15c90343 100644 --- a/web/app/themes/la_mine/templates/components/thumbnails/thumbnails.twig +++ b/web/app/themes/la_mine/templates/components/thumbnails/thumbnails.twig @@ -18,27 +18,27 @@
- {% set start = item.debut_event|date("Ydj") %} - {% set end = item.fin_event|date("Ydj") %} + {% set start = item.informations_debut_event|date("Ydj") %} + {% set end = item.informations_fin_event|date("Ydj") %} {% if start == end %} - Le - de + Le + de - à + à {% else %} - Du - à + Du + à -
Au - à
+
Au + à
{% endif %} diff --git a/web/app/themes/la_mine/templates/single.twig b/web/app/themes/la_mine/templates/single.twig index b1e63ec7..0d8a2983 100644 --- a/web/app/themes/la_mine/templates/single.twig +++ b/web/app/themes/la_mine/templates/single.twig @@ -30,28 +30,27 @@
- - {% set start = group.debut_event|date("Ydj") %} - {% set end = group.fin_event|date("Ydj") %} + {% set start = post.informations_debut_event|date("Ydj") %} + {% set end = post.informations_fin_event|date("Ydj") %} {% if start == end %} - Le - de + Le + de - à + à {% else %} - Du - à + Du + à -
Au - à
+
Au + à
{% endif %}