FEATURE Add conditional template part for 'analyses-etudes' post type

archive-analyses-etudes.php

@@ -36,7 +36,7 @@
 
 	<!-- #### INFOLETTRE #### -->
 	<?php get_template_part('template-parts/compositions/infolettre'); ?>
-	?>
+
 </main>
 
 <?php

resources/css/blocks/content-box.css

@@ -4,25 +4,26 @@
 
 .content-box {
   @apply relative px-4 md:px-8;
+
   &--variant-framed {
     @apply border border-carhop-green-600;
   }
 
   &--variant-backgrounded {
-    @apply py-16;
     background-color: var(--content-box-background-color, transparent);
   }
   &--variant-framed-backgrounded {
-    @apply py-16;
     @apply border border-carhop-green-600;
     background-color: var(--content-box-background-color, transparent);
   }
+
   &--shape-straight {
     @apply py-16;
     background-color: var(--content-box-background-color, transparent);
   }
   &--shapeA,
-  &--shapeB {
+  &--shapeB,
+  &--shapeC {
     @apply !relative;
     background-color: transparent !important;
 
@@ -30,35 +31,33 @@
       @apply z-10 relative;
     }
   }
-
   .content-box__shape {
     @apply top-0 left-0 w-full h-full absolute;
   }
 
   @apply py-16;
   background-color: var(--content-box-background-color, transparent);
-}
 
-&.alignwide,
-&.aligncontained {
+  &.alignwide,
+  &.aligncontained {
     @apply !mx-auto;
-}
-&.aligncontained {
+  }
+  &.aligncontained {
     @apply !max-w-screen-lg;
-}
-/* &.alignwide {
+  }
+  /* &.alignwide {
     @apply max-w-screen-lg;
   } */
 
-.wp-block-group {
-}
+  .wp-block-group {
+  }
 
-&--bg-light {
+  &--bg-light {
     --content-box-text-color: var(--wp--preset--color--carhop-green);
     --advised-text-color: var(--wp--preset--color--carhop-green, inherit);
-}
+  }
 
-&--bg-dark {
+  &--bg-dark {
     --content-box-text-color: #fff;
     --advised-text-color: #fff;
 
@@ -81,24 +80,24 @@
         background-image: url('../resources/img/carhop-fleche-lien-externe-full--white.svg');
       }
     }
-}
+  }
 
-&__innerblocks {
+  &__innerblocks {
     @apply mx-auto px-4 md:px-8;
     > :not(.alignwide):not(.alignfull) {
       @apply max-w-screen-lg mx-auto;
     }
-}
-&.alignwide .content-box__innerblocks {
+  }
+  &.alignwide .content-box__innerblocks {
     > :not(.alignfull) {
       @apply max-w-screen-xl mx-auto;
     }
-}
-h3 {
+  }
+  h3 {
     /* @apply title-small font-bold; */
-}
+  }
 
-/* h1.wp-block-heading {
+  /* h1.wp-block-heading {
     @apply !text-4xl mb-12;
   }
 
@@ -108,15 +107,15 @@ h3 {
   h4.wp-block-heading {
     @apply !text-2xl uppercase nunito font-medium tracking-widest pb-1;
   } */
-ul + h3,
-p + h3 {
+  ul + h3,
+  p + h3 {
     @apply mt-12;
-}
+  }
 
-h3 + p {
+  h3 + p {
     @apply !mt-3;
-}
-/* p > a {
+  }
+  /* p > a {
     transition: all 0.3s ease-out;
     @apply underline underline-offset-8;
     text-decoration-thickness: 1px;
@@ -124,14 +123,15 @@ h3 + p {
     @apply underlined-link underlined-link--white;
   } */
 
-ul {
+  ul {
     list-style: disc;
-}
-> ul {
+  }
+  > ul {
     padding-left: 1.5rem;
-}
-.carhop-heading:not(:first-child) {
+  }
+  .carhop-heading:not(:first-child) {
     @apply pt-32;
+  }
 }
 
 main > .content-box:first-child {
@@ -166,7 +166,7 @@ body.wp-admin.post-type-articles .content-box,
 body.single-activites .content-box,
 body.wp-admin.post-type-page .content-box,
 body.page .content-box {
-  /* @apply py-16; */
+  @apply py-16;
   color: var(--content-box-text-color);
 
   .carhop-heading p {
@@ -207,3 +207,29 @@ body.page .content-box {
   ) {
   @apply !mb-0;
 }
+
+.wp-block-carhop-blocks-content-box.alignfull + .alignfull {
+  @apply !mt-0;
+}
+
+.wp-block-carhop-blocks-content-box.alignfull:has(+ .alignfull) {
+  @apply !mb-0;
+}
+
+.page-single:has(
+  .content-wrapper[data-active-tab='post']
+    .post-content.entry-content
+    > .content-box.alignfull:last-child
+) {
+  .content-wrapper + .alignfull {
+    @apply !-mb-12;
+  }
+  .content-wrapper + .alignfull {
+    /* @apply !bg-red-500 opacity-40; */
+    margin-top: -70px !important;
+  }
+}
+
+.content-box--variant-backgrounded.content-box--shapeC.alignfull + .alignfull {
+  @apply !-mt-5;
+}

resources/img/covers/carhop-page-expositions-cover.svg

@@ -0,0 +1,6 @@
+<svg width="311" height="298" viewBox="0 0 311 298" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M162 298C244.29 298 311 231.29 311 149C311 66.7096 244.29 0 162 0C79.7096 0 13 66.7096 13 149C13 231.29 79.7096 298 162 298Z" fill="#FFA630"/>
+<rect y="13" width="77.6812" height="75.0026" fill="white"/>
+<path d="M35.2053 32.7837H18.5156V49.816H35.2053V32.7837Z" stroke="#136F63" stroke-width="2"/>
+<path d="M59.4865 49.8159H42.7969V71.4933H59.4865V49.8159Z" stroke="#136F63" stroke-width="2"/>
+</svg>

resources/img/covers/carhop-page-outils-pedagogiques-cover.svg

@@ -0,0 +1,16 @@
+<svg width="311" height="298" viewBox="0 0 311 298" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M162 298C244.29 298 311 231.29 311 149C311 66.7096 244.29 0 162 0C79.7096 0 13 66.7096 13 149C13 231.29 79.7096 298 162 298Z" fill="#FFA630"/>
+<rect y="13" width="77.6812" height="75.0026" fill="white"/>
+<g clip-path="url(#clip0_3915_16926)">
+<path d="M53.8121 53.4077H24.0156V72.7901H53.8121V53.4077Z" stroke="#136F63" stroke-width="2"/>
+<path d="M56.7708 43.7769H21.2344V53.4077H56.7708V43.7769Z" stroke="#136F63" stroke-width="2"/>
+<path d="M38.9062 36.7233V28" stroke="#136F63" stroke-width="2"/>
+<path d="M49.9062 38.526L56.1759 32.3556" stroke="#136F63" stroke-width="2"/>
+<path d="M27.8947 38.4535L21.625 32.283" stroke="#136F63" stroke-width="2"/>
+</g>
+<defs>
+<clipPath id="clip0_3915_16926">
+<rect width="38" height="46" fill="white" transform="translate(20 28)"/>
+</clipPath>
+</defs>
+</svg>

single.php

@@ -37,6 +37,9 @@ $postType = get_post_type();
 			</div>
 		<?php endwhile; ?>
 	<?php endif; ?>
+	<?php if ($postType === 'analyses-etudes') : ?>
+		<?php get_template_part('template-parts/compositions/formulaire-commande-etude'); ?>
+	<?php endif; ?>
 	<?php echo do_blocks('<!-- wp:carhop-blocks/see-also /-->'); ?>
 	<?php echo do_blocks('<!-- wp:carhop-blocks/explore-tags /-->'); ?>
 </div>

template-parts/components/posts/post-tags.php

@@ -2,6 +2,8 @@
 $postID = get_the_ID();
 $etiquettes = get_the_terms($postID, 'etiquettes');
 
+$current_post_type = get_post_type($postID);
+
 if (empty($etiquettes)) return;
 ?>
 
@@ -11,7 +13,7 @@ if (empty($etiquettes)) return;
 		<ul class="tags-list">
 			<?php foreach ($etiquettes as $etiquette) : ?>
 				<li class="post-tag">
-					<a href="<?php echo add_query_arg('etiquette', $etiquette->slug, get_post_type_archive_link('analyses-etudes')); ?>"><?php echo $etiquette->name; ?></a>
+					<a href="<?php echo add_query_arg('etiquette', $etiquette->slug, get_post_type_archive_link($current_post_type)); ?>"><?php echo $etiquette->name; ?></a>
 				</li>
 			<?php endforeach; ?>
 		</ul>

template-parts/compositions/formulaire-commande-etude.php

@@ -0,0 +1,9 @@
+	<!-- #### FORMATION SUR DEMANDE #### -->
+	<?php
+	$composition_id = 1777;
+	$formulaire_commande_etude_content = get_post_field('post_content', $composition_id);
+
+	if ($formulaire_commande_etude_content) {
+		echo do_blocks($formulaire_commande_etude_content);
+	}
+	?>

template-parts/post-types/expositions/archive-header.php

@@ -3,7 +3,7 @@
 	'subtitle' => 'Découvrez nos expositions thématiques',
 	'description' => 'Le CARHOP conçoit et diffuse des expositions ancrées dans l’histoire sociale, en lien étroit avec le monde du travail, les luttes collectives et les réalités contemporaines. Pensées comme des outils de transmission et de sensibilisation, elles rendent visibles des récits, des archives et des parcours souvent absents des discours dominants.',
 	'cover' => array(
-		'url' => get_stylesheet_directory_uri() . '/resources/img/covers/carhop-page-analyses-etudes-cover.svg',
+		'url' => get_stylesheet_directory_uri() . '/resources/img/covers/carhop-page-expositions-cover.svg',
 		'alt' => 'Revues'
 	),
 	'has_overlap' => true,

template-parts/post-types/outils-pedagogiques/archive-header.php

@@ -3,8 +3,8 @@
 	'subtitle' => 'Transmettre l’histoire sociale autrement',
 	'description' => 'Le CARHOP développe des outils pédagogiques à partir de ses recherches, de ses archives et de ses expositions. Pensés pour les enseignant·es, formateur·rices, animateur·rices et publics variés, ces supports facilitent l’appropriation de l’histoire sociale et ouvrent le débat sur les enjeux d’hier et d’aujourd’hui.',
 	'cover' => array(
-		'url' => get_stylesheet_directory_uri() . '/resources/img/covers/carhop-page-analyses-etudes-cover.svg',
-		'alt' => 'Revues'
+		'url' => get_stylesheet_directory_uri() . '/resources/img/covers/carhop-page-outils-pedagogiques-cover.svg',
+		'alt' => 'Outils pédagogiques'
 	),
 	'has_overlap' => true,
 	'background_style' => 'sliced',