From 3978fb61c8572f53f83c6a50234fff8a8e5ec112 Mon Sep 17 00:00:00 2001 From: chloe Date: Fri, 22 May 2020 18:17:46 +0200 Subject: [PATCH] =?UTF-8?q?cr=C3=A9ation=20contenu=20page=20ass,=20page=20?= =?UTF-8?q?collecte=20et=20temps=20forts?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- web/app/themes/la_mine/les_temps_forts.php | 18 +------- .../themes/la_mine/templates/association.twig | 21 ++++----- .../components/buttons/bouton_asso.html.twig | 4 ++ .../buttons/bouton_contact.html.twig | 3 ++ .../templates/components/sider_left.twig | 45 +++++++++++++++++++ .../la_mine/templates/la_benevole_zone.twig | 32 ++++--------- .../themes/la_mine/templates/la_collecte.twig | 15 ++++--- .../la_mine/templates/les_temps_forts.twig | 42 ++++++++++++----- 8 files changed, 112 insertions(+), 68 deletions(-) create mode 100644 web/app/themes/la_mine/templates/components/buttons/bouton_asso.html.twig create mode 100644 web/app/themes/la_mine/templates/components/buttons/bouton_contact.html.twig create mode 100644 web/app/themes/la_mine/templates/components/sider_left.twig diff --git a/web/app/themes/la_mine/les_temps_forts.php b/web/app/themes/la_mine/les_temps_forts.php index 4239be59..75aaa56f 100755 --- a/web/app/themes/la_mine/les_temps_forts.php +++ b/web/app/themes/la_mine/les_temps_forts.php @@ -7,21 +7,5 @@ $context = Timber::context(); $timber_post = new Timber\Post(); $context['post'] = $timber_post; + Timber::render( array( 'page-' . $timber_post->post_name . '.twig', 'les_temps_forts.twig' ), $context ); - -//repeater de temps forts -if(get_field('temps_forts')): - -endif; - - -?> diff --git a/web/app/themes/la_mine/templates/association.twig b/web/app/themes/la_mine/templates/association.twig index d554f640..80eb032f 100644 --- a/web/app/themes/la_mine/templates/association.twig +++ b/web/app/themes/la_mine/templates/association.twig @@ -1,14 +1,15 @@ {% extends "base.twig" %} {% block content %} -
-
-
-

{{post.title}}

-
- {{post.content}} -
-
-
-
+{% include 'components/title_page.twig' %} +{% include '/components/sider_left.twig' %} + +
+
+

{{ post.meta('titre_1) }}

+
+ {{ post.meta( 'paragraphe_1') }} +
+
+
{% endblock %} diff --git a/web/app/themes/la_mine/templates/components/buttons/bouton_asso.html.twig b/web/app/themes/la_mine/templates/components/buttons/bouton_asso.html.twig new file mode 100644 index 00000000..0ba81252 --- /dev/null +++ b/web/app/themes/la_mine/templates/components/buttons/bouton_asso.html.twig @@ -0,0 +1,4 @@ +
+ {{post.meta('bouton_asso').texte_bouton}} + +
diff --git a/web/app/themes/la_mine/templates/components/buttons/bouton_contact.html.twig b/web/app/themes/la_mine/templates/components/buttons/bouton_contact.html.twig new file mode 100644 index 00000000..0be91217 --- /dev/null +++ b/web/app/themes/la_mine/templates/components/buttons/bouton_contact.html.twig @@ -0,0 +1,3 @@ +
+ {{post.meta('bouton_contact').texte_bouton}} +
diff --git a/web/app/themes/la_mine/templates/components/sider_left.twig b/web/app/themes/la_mine/templates/components/sider_left.twig new file mode 100644 index 00000000..930adcb6 --- /dev/null +++ b/web/app/themes/la_mine/templates/components/sider_left.twig @@ -0,0 +1,45 @@ +{% if form %} +{% include '/components/formulaire.twig' %} +{% endif %} +{{dump(post)}} + +{% if name == 'benevole' %} +
+
+

{{ post.meta('titre_bloc') }}

+
+ + {{ post.meta('paragraphe_bloc') }} +
+
+ +
+ {% include '/components/buttons/bouton_asso.html.twig' %} + {% include '/components/buttons/bouton_contact.html.twig' %} +
+
+ +{% endif %} + +{{dump(post)}} +
+
+ + {% if name == 'association' %} +
+

{{ post.meta('titre') }}

+ {{ post.meta('file') }} +
+ {% elseif name == 'benevole' %} +

{{ post.meta('titre_bloc') }}

+
+ + {{ post.meta('paragraphe_bloc') }} +
+ {% endif %} + +
+
+ {% include '/components/buttons/bouton_asso.html.twig' %} +
+
diff --git a/web/app/themes/la_mine/templates/la_benevole_zone.twig b/web/app/themes/la_mine/templates/la_benevole_zone.twig index d5658def..ea5c4bc8 100644 --- a/web/app/themes/la_mine/templates/la_benevole_zone.twig +++ b/web/app/themes/la_mine/templates/la_benevole_zone.twig @@ -3,31 +3,15 @@ {% block content %} {% include 'components/title_page.twig' %} +{% include 'components/sider_left.twig' with { name : 'benevole' } %} -
-
-

{{ post.meta('titre_bloc') }}

-
- - {{ post.meta('paragraphe_bloc') }} + +
+
+

{{ post.meta('texte_chapeau') }}

+
+ {{ post.meta('paragraphe_descriptif') }}
- -
-
-
-

{{ post.meta('texte_chapeau') }}

-
- {{ post.meta('paragraphe_descriptif') }} -
-
-
+
{% endblock %} diff --git a/web/app/themes/la_mine/templates/la_collecte.twig b/web/app/themes/la_mine/templates/la_collecte.twig index db037199..61547ad6 100644 --- a/web/app/themes/la_mine/templates/la_collecte.twig +++ b/web/app/themes/la_mine/templates/la_collecte.twig @@ -2,14 +2,15 @@ {% block content %} {% include 'components/title_page.twig' %} -
-
+{% include 'components/sider_left.twig' %} + +
-

{{post.title}}

+

{{ post.meta('texte_chapeau') }}

- {{post.content}} -
+ {{ post.meta('paragraphe_descriptif') }} +
- -
+ + {% endblock %} diff --git a/web/app/themes/la_mine/templates/les_temps_forts.twig b/web/app/themes/la_mine/templates/les_temps_forts.twig index 32d3b78f..afa25ca0 100644 --- a/web/app/themes/la_mine/templates/les_temps_forts.twig +++ b/web/app/themes/la_mine/templates/les_temps_forts.twig @@ -2,16 +2,38 @@ {% block content %} {% include 'components/title_page.twig'%} - - +{% endfor %} + {% endblock %}