diff --git a/web/themes/custom/reha/dist/bundle.js b/web/themes/custom/reha/dist/bundle.js index 251f64e..e73da26 100644 --- a/web/themes/custom/reha/dist/bundle.js +++ b/web/themes/custom/reha/dist/bundle.js @@ -15,7 +15,7 @@ \********************/ /***/ (() => { -eval("/**\n * @file\n * reha behaviors.\n */\n(function (Drupal) {\n\n 'use strict';\n\n Drupal.behaviors.reha = {\n attach: function (context, settings) {\n\n console.log('It works!');\n\n }\n };\n\n \n} (Drupal));\n\njQuery(document).ready(function($){\n\n // menu déroulant\n\n ////////////// contacts ///////\n\n $(\".bouton-contact\").click(function(event) {\n // Fermer .connexion-full s'il est déroulé\n if ($(\".connexion-full\").is(\":visible\")) {\n $(\".connexion-full\").slideUp();\n }\n if ($(\".connected-full\").is(\":visible\")) {\n $(\".connected-full\").slideUp();\n }\n // Ouvrir .contacts-full\n $(\".contacts-full\").slideToggle();\n\n });\n\n////////////// connexion ///////\n\n $(\".bouton-connexion\").click(function(event) {\n // Fermer .contacts-full s'il est déroulé\n if ($(\".contacts-full\").is(\":visible\")) {\n $(\".contacts-full\").slideUp();\n }\n // Ouvrir .connexion-full\n $(\".connexion-full\").slideToggle();\n });\n \n $(\".bouton-connected\").click(function(event) {\n // Fermer .contacts-full s'il est déroulé\n if ($(\".contacts-full\").is(\":visible\")) {\n $(\".contacts-full\").slideUp();\n }\n // Ouvrir .connected-full\n $(\".connected-full\").slideToggle();\n });\n \n $(\".titre\").click(function(event) {\n if ($(\".connected-full\").is(\":visible\")) {\n $(\".connected-full\").slideUp();\n }\n if ($(\".contacts-full\").is(\":visible\")) {\n $(\".contacts-full\").slideUp();\n }\n if ($(\".connexion-full\").is(\":visible\")) {\n $(\".connexion-full\").slideUp();\n }\n // // Ouvrir .connexion-full\n // $(\".connected-full\").slideToggle();\n });\n \n $(\"#edit-field-dossier-de-candidature-0--label\").click(function(event) {\n event.preventDefault();\n // Ouvrir .connexion-full\n $(\"#edit-field-dossier-de-candidature-0--description>ul.main\").slideToggle();\n });\n\n});\n\n\n// slideshow home \n\n(function($, window) {\n console.log('hello slick')\n $(document).ready(function(){\n $('.view-display-id-block_1').slick({\n slidesToShow: 1,\n // slidesToScroll: 1,\n dots: true,\n arrows: true,\n centerMode: true,\n // centerPadding: '100px',\n responsive: [\n {\n breakpoint: 810,\n settings: {\n slidesToShow: 1,\n adaptiveHeight: true,\n arrows: false,\n draggable: true,\n centerMode: true,\n }\n }]\n });\n console.log('salut slick home');\n\n });\n})(jQuery, window);\n\n\n//# sourceURL=webpack://dev.reha.fr/./js/reha.js?"); +eval("/**\n * @file\n * reha behaviors.\n */\n(function (Drupal) {\n\n 'use strict';\n\n Drupal.behaviors.reha = {\n attach: function (context, settings) {\n\n console.log('It works!');\n\n }\n };\n\n \n} (Drupal));\n\njQuery(document).ready(function($){\n\n // menu déroulant\n\n ////////////// contacts ///////\n\n $(\".bouton-contact\").click(function(event) {\n // Fermer .connexion-full s'il est déroulé\n if ($(\".connexion-full\").is(\":visible\")) {\n $(\".connexion-full\").slideUp();\n }\n if ($(\".connected-full\").is(\":visible\")) {\n $(\".connected-full\").slideUp();\n }\n // Ouvrir .contacts-full\n $(\".contacts-full\").slideToggle();\n\n });\n\n////////////// connexion ///////\n\n $(\".bouton-connexion\").click(function(event) {\n // Fermer .contacts-full s'il est déroulé\n if ($(\".contacts-full\").is(\":visible\")) {\n $(\".contacts-full\").slideUp();\n }\n // Ouvrir .connexion-full\n $(\".connexion-full\").slideToggle();\n });\n \n $(\".bouton-connected\").click(function(event) {\n // Fermer .contacts-full s'il est déroulé\n if ($(\".contacts-full\").is(\":visible\")) {\n $(\".contacts-full\").slideUp();\n }\n // Ouvrir .connected-full\n $(\".connected-full\").slideToggle();\n });\n \n $(\".titre\").click(function(event) {\n if ($(\".connected-full\").is(\":visible\")) {\n $(\".connected-full\").slideUp();\n }\n if ($(\".contacts-full\").is(\":visible\")) {\n $(\".contacts-full\").slideUp();\n }\n if ($(\".connexion-full\").is(\":visible\")) {\n $(\".connexion-full\").slideUp();\n }\n // // Ouvrir .connexion-full\n // $(\".connected-full\").slideToggle();\n });\n \n $(\"#edit-field-dossier-de-candidature-0--label\").click(function(event) {\n event.preventDefault();\n // Ouvrir .connexion-full\n $(\"#edit-field-dossier-de-candidature-0--description>ul.main\").slideToggle();\n });\n\n});\n\n\n// slideshow home \n\n(function($, window) {\n console.log('hello slick')\n $(document).ready(function(){\n $('.view-id-sites.view-display-id-block_1').slick({\n slidesToShow: 1,\n // slidesToScroll: 1,\n dots: false,\n arrows: true,\n centerMode: true,\n // centerPadding: '100px',\n responsive: [\n {\n breakpoint: 810,\n settings: {\n slidesToShow: 1,\n adaptiveHeight: true,\n arrows: false,\n draggable: true,\n centerMode: true,\n }\n }]\n });\n console.log('salut slick home');\n\n });\n})(jQuery, window);\n\n\n//# sourceURL=webpack://dev.reha.fr/./js/reha.js?"); /***/ }), diff --git a/web/themes/custom/reha/dist/css/bundle.css b/web/themes/custom/reha/dist/css/bundle.css index c45ea55..5b9795b 100644 --- a/web/themes/custom/reha/dist/css/bundle.css +++ b/web/themes/custom/reha/dist/css/bundle.css @@ -1580,32 +1580,55 @@ html.js body.node-type-operation.node-id-7 div.dialog-off-canvas-main-canvas div width: 70%; margin: auto; display: grid; - grid-template-rows: auto; - grid-template-columns: auto; + grid-template-rows: repeat(12, 1fr); + grid-template-columns: repeat(12, 1fr); } -.home-page-layout-content .block-views-blocksites-block-1 .views-row .node-type-site .field--name-field-image { +.home-page-layout-content .block-views-blocksites-block-1 .views-row .node-type-site .image-site { order: 1; - grid-row: 1/span 4; - grid-column: 1/span 5; + grid-row: 1/span 10; + grid-column: 1/span 9; +} +.home-page-layout-content .block-views-blocksites-block-1 .views-row .node-type-site .image-site img { + width: 100%; + object-fit: cover; } .home-page-layout-content .block-views-blocksites-block-1 .views-row .node-type-site .filtered-content { - border: solid #fdc300 1px; background-color: rgb(255, 255, 255); - width: 30%; + width: 80%; order: 2; display: flex; flex-direction: column; - grid-row: 3/span 6; - grid-column: 3/span 5; + grid-row: 7/span 5; + grid-column: 7/span 12; + padding: 1rem; } .home-page-layout-content .block-views-blocksites-block-1 .views-row .node-type-site .filtered-content h2 { order: 2; + margin: 0; } .home-page-layout-content .block-views-blocksites-block-1 .views-row .node-type-site .filtered-content .field--name-field-numero-site { order: 1; + text-transform: uppercase; + font-size: 2rem; } .home-page-layout-content .block-views-blocksites-block-1 .views-row .node-type-site .filtered-content .field--name-field-adresse-site { order: 3; + font-size: 1.5rem; +} +.home-page-layout-content .block-views-blocksites-block-1 .views-row .node-type-site .filtered-content .field--name-field-adresse-site .address { + margin: 0; + display: inline-flex; +} +.home-page-layout-content .block-views-blocksites-block-1 .views-row .node-type-site .filtered-content .field--name-field-adresse-site .address .postal-code { + order: 2; +} +.home-page-layout-content .block-views-blocksites-block-1 .views-row .node-type-site .filtered-content .field--name-field-adresse-site .address .locality { + order: 1; + text-transform: capitalize; + margin-right: 0.5rem; +} +.home-page-layout-content .block-views-blocksites-block-1 .views-row .node-type-site .filtered-content .field--name-field-adresse-site .address .country { + display: none; } .home-page-layout-content .block-views-blocksites-block-1 .views-row .node-type-site .filtered-content .field--name-field-architecte { order: 4; @@ -1616,7 +1639,8 @@ html.js body.node-type-operation.node-id-7 div.dialog-off-canvas-main-canvas div font-weight: 800; padding: 2rem; margin-right: 1rem; - width: 30%; + width: 20%; + margin-left: 8%; } @media (max-width: 891px) { .home-page-layout-content .block-block-content3d4d153c-9da8-49e2-be7a-d2245f5716ee { @@ -1663,4 +1687,67 @@ html.js body.node-type-operation.node-id-7 div.dialog-off-canvas-main-canvas div } .view-display-id-page_1 .views-row .node-type-site .field--name-field-architecte { order: 5; +} + +.block-views-blockactus-block-1 { + background-color: white; +} +.block-views-blockactus-block-1 h2 { + width: 80%; + margin: auto; + padding-top: 2rem; + padding-bottom: 2rem; +} +.block-views-blockactus-block-1 .view-id-actus { + width: 80%; + margin: auto; + display: flex; + justify-content: space-between; +} +.block-views-blockactus-block-1 .view-id-actus .views-row { + width: 45%; +} +.block-views-blockactus-block-1 .view-id-actus .views-row .node-type-actualite { + width: 100%; + display: flex; + flex-direction: column; +} +.block-views-blockactus-block-1 .view-id-actus .views-row .node-type-actualite p.field__item { + display: none; +} +.block-views-blockactus-block-1 .view-id-actus .views-row .node-type-actualite h2 { + order: 3; + margin: 0; +} +.block-views-blockactus-block-1 .view-id-actus .views-row .node-type-actualite .field--name-field-image { + order: 1; + max-width: 100%; +} +.block-views-blockactus-block-1 .view-id-actus .views-row .node-type-actualite .field--name-field-image img { + max-width: 100%; + object-fit: contain; +} +.block-views-blockactus-block-1 .view-id-actus .views-row .node-type-actualite .field--name-field-numero-site { + order: 3; +} +.block-views-blockactus-block-1 .view-id-actus .views-row .node-type-actualite .field--name-field-adresse-site { + order: 4; +} +.block-views-blockactus-block-1 .view-id-actus .views-row .node-type-actualite .field--name-field-architecte { + order: 4; +} +.block-views-blockactus-block-1 .view-id-actus .views-row .node-type-actualite .field--name-field-type-d-actualite { + order: 2; +} +.block-views-blockactus-block-1 .view-id-actus .views-row .node-type-actualite .field--name-field-site { + order: 3; +} +.block-views-blockactus-block-1 .view-id-actus .views-row .node-type-actualite > div:nth-child(2) > div:nth-child(2) { + display: none; +} + +.block-views-blockhome-block-1 .view-display-id-block_1 { + width: 60%; + margin: auto; + padding-top: 5rem; } \ No newline at end of file diff --git a/web/themes/custom/reha/js/reha.js b/web/themes/custom/reha/js/reha.js index 6aca3d8..ed8fad8 100644 --- a/web/themes/custom/reha/js/reha.js +++ b/web/themes/custom/reha/js/reha.js @@ -84,10 +84,10 @@ jQuery(document).ready(function($){ (function($, window) { console.log('hello slick') $(document).ready(function(){ - $('.view-display-id-block_1').slick({ + $('.view-id-sites.view-display-id-block_1').slick({ slidesToShow: 1, // slidesToScroll: 1, - dots: true, + dots: false, arrows: true, centerMode: true, // centerPadding: '100px', diff --git a/web/themes/custom/reha/reha.theme b/web/themes/custom/reha/reha.theme index f5e582a..1809039 100644 --- a/web/themes/custom/reha/reha.theme +++ b/web/themes/custom/reha/reha.theme @@ -35,10 +35,9 @@ function reha_preprocess_page(&$variables) { function reha_preprocess_node(&$variables) { $node = &$variables['node']; $variables['attributes']['class'][] = 'node-type-' . $node->gettype(); - if ($variables['node']->getType() == 'site') { $fields_to_exclude = [ - 'field--name-field-image', + 'field_image', // Remplacez par le nom machine exact de votre champ image ]; $filtered_content = []; @@ -55,12 +54,58 @@ function reha_preprocess_node(&$variables) { $variables['filtered_content'] = $filtered_content; $variables['image_field_content'] = $image_field_content; } + } +// /** +// * Implements hook_preprocess_HOOK() for node templates. +// */ +// function reha_preprocess_node(&$variables) { +// if ($variables['node']->getType() == 'site') { +// $fields_to_exclude = [ +// 'field--type-image', // Remplacez par le nom machine exact de votre champ image +// ]; + +// $filtered_content = []; +// $image_field_content = ''; + +// foreach ($variables['content'] as $field_name => $field_content) { +// if (!in_array($field_name, $fields_to_exclude)) { +// $filtered_content[$field_name] = $field_content; +// } else { +// $image_field_content = $field_content; +// } +// } + +// $variables['filtered_content'] = $filtered_content; +// $variables['image_field_content'] = $image_field_content; +// } +// } +/** + * Prepares variables for block templates. + * + * Default template: block.html.twig. + * + * Prepares the values passed to the theme_block function to be passed + * into a pluggable template engine. Uses block properties to generate a + * series of template file suggestions. If none are found, the default + * block.html.twig is used. + * + * Most themes use their own copy of block.html.twig. The default is located + * inside "core/modules/block/templates/block.html.twig". Look in there for the + * full list of available variables. + * + * @param array $variables + * An associative array containing: + * - elements: An associative array containing the properties of the element. + * Properties used: #block, #configuration, #children, #plugin_id. + */ + +//https://www.hashbangcode.com/article/drupal-9-programmatically-creating-and-using-urls-and-links function reha_preprocess_block(&$variables) { if ($variables['plugin_id'] === "user_login_block") { @@ -89,6 +134,25 @@ function reha_preprocess_block(&$variables) { } } } + // if ($variables['plugin_id'] == 'actus-block-1') { + // $fields_to_exclude = [ + // 'field_image', // Remplacez par le nom machine exact du champ que vous souhaitez exclure + // ]; + + // $filtered_content = []; + // $excluded_field_content = ''; + + // foreach ($variables['content'] as $field_name => $field_content) { + // if (!in_array($field_name, $fields_to_exclude)) { + // $filtered_content[$field_name] = $field_content; + // } else { + // $excluded_field_content = $field_content; + // } + // } + + // $variables['filtered_content'] = $filtered_content; + // $variables['excluded_field_content'] = $excluded_field_content; + // } } diff --git a/web/themes/custom/reha/scss/pages/home/home-view-actualites.scss b/web/themes/custom/reha/scss/pages/home/home-view-actualites.scss new file mode 100644 index 0000000..02971b1 --- /dev/null +++ b/web/themes/custom/reha/scss/pages/home/home-view-actualites.scss @@ -0,0 +1,59 @@ +.block-views-blockactus-block-1{ + background-color: white; + h2{ + width: 80%; + margin: auto; + padding-top: 2rem; + padding-bottom: 2rem; + } + .view-id-actus{ + width: 80%; + margin: auto; + display: flex; + justify-content: space-between; + + .views-row{ + width: 45%; + .node-type-actualite{ + width: 100%; + display: flex; + flex-direction: column; + p.field__item{ + display: none; + } + h2{ + order: 3; + margin: 0; + } + .field--name-field-image{ + order: 1; + max-width: 100%; + img{ + max-width: 100%; + object-fit: contain; + } + } + .field--name-field-numero-site { + order: 3; + } + .field--name-field-adresse-site{ + order: 4; + } + .field--name-field-architecte{ + order: 4; + } + .field--name-field-type-d-actualite{ + order: 2; + } + .field--name-field-site{ + order: 3; + } + + } + .node-type-actualite > div:nth-child(2) > div:nth-child(2){ + display: none; + } + } + + } +} diff --git a/web/themes/custom/reha/scss/pages/home/home-view-presentation.scss b/web/themes/custom/reha/scss/pages/home/home-view-presentation.scss new file mode 100644 index 0000000..17d0891 --- /dev/null +++ b/web/themes/custom/reha/scss/pages/home/home-view-presentation.scss @@ -0,0 +1,8 @@ +.block-views-blockhome-block-1{ + + .view-display-id-block_1{ + width: 60%; + margin: auto; + padding-top: 5rem; + } +} \ No newline at end of file diff --git a/web/themes/custom/reha/scss/pages/_home-view-sites.scss b/web/themes/custom/reha/scss/pages/home/home-view-sites.scss similarity index 50% rename from web/themes/custom/reha/scss/pages/_home-view-sites.scss rename to web/themes/custom/reha/scss/pages/home/home-view-sites.scss index c8b92d7..d771adb 100644 --- a/web/themes/custom/reha/scss/pages/_home-view-sites.scss +++ b/web/themes/custom/reha/scss/pages/home/home-view-sites.scss @@ -7,30 +7,54 @@ width: 70%; margin: auto; display: grid; - grid-template-rows: auto; - grid-template-columns: auto; - .field--name-field-image{ + grid-template-rows: repeat(12, 1fr); + grid-template-columns: repeat(12, 1fr); + .image-site{ order: 1; - grid-row: 1 /span 4; - grid-column: 1 /span 5; + grid-row: 1/span 10; + grid-column: 1/span 9; + img { + width: 100%; + object-fit: cover; + } } .filtered-content{ - border: solid $yellow-puca 1px; + // border: solid $yellow-puca 1px; background-color: $white-button; - width: 30%; + width: 80%; order: 2; display: flex; flex-direction: column; - grid-row: 3 /span 6; - grid-column: 3 /span 5; + grid-row: 7/span 5; + grid-column: 7/span 12; + padding: 1rem; h2{ order: 2; + margin: 0; } .field--name-field-numero-site { order: 1; + text-transform: uppercase; + font-size: 2rem; } .field--name-field-adresse-site{ order: 3; + font-size: 1.5rem; + .address{ + margin: 0; + display: inline-flex; + .postal-code{ + order: 2; + } + .locality{ + order: 1; + text-transform: capitalize; + margin-right: 0.5rem; + } + .country{ + display: none; + } + } } .field--name-field-architecte{ order: 4; @@ -46,7 +70,8 @@ font-weight: 800; padding: 2rem; margin-right: 1rem; - width: 30%; + width: 20%; + margin-left: 8%; @media(max-width: 891px){ margin-bottom: 1rem; // margin: auto; diff --git a/web/themes/custom/reha/scss/reha.scss b/web/themes/custom/reha/scss/reha.scss index 3fc75bc..40a0b1f 100644 --- a/web/themes/custom/reha/scss/reha.scss +++ b/web/themes/custom/reha/scss/reha.scss @@ -33,5 +33,7 @@ @import "pages/user--edit"; @import "pages/modifier-une-operation"; @import "pages/page--static"; -@import "pages/home-view-sites"; -@import "pages/les-sites-pilotes"; \ No newline at end of file +@import "pages/home/home-view-sites"; +@import "pages/les-sites-pilotes"; +@import "pages/home/home-view-actualites"; +@import "pages/home/home-view-presentation"; \ No newline at end of file diff --git a/web/themes/custom/reha/templates/block--views-block--actus-block-1.html.twig b/web/themes/custom/reha/templates/block--views-block--actus-block-1.html.twig new file mode 100644 index 0000000..ce6603a --- /dev/null +++ b/web/themes/custom/reha/templates/block--views-block--actus-block-1.html.twig @@ -0,0 +1,78 @@ +{# +/** + * @file + * Default theme implementation to display a block. + * + * Available variables: + * - plugin_id: The ID of the block implementation. + * - label: The configured label of the block if visible. + * - configuration: A list of the block's configuration values. + * - label: The configured label for the block. + * - label_display: The display settings for the label. + * - provider: The module or other provider that provided this block plugin. + * - Block plugin specific settings will also be stored here. + * - in_preview: Whether the plugin is being rendered in preview mode. + * - content: The content of this block. + * - attributes: array of HTML attributes populated by modules, intended to + * be added to the main container tag of this template. + * - id: A valid HTML ID and guaranteed unique. + * - title_attributes: Same as attributes, except applied to the main title + * tag that appears in the template. + * - title_prefix: Additional output populated by modules, intended to be + * displayed in front of the main title tag that appears in the template. + * - title_suffix: Additional output populated by modules, intended to be + * displayed after the main title tag that appears in the template. + * + * @see template_preprocess_block() + * + * @ingroup themeable + */ +#} +{% + set classes = [ + 'block', + 'block-' ~ configuration.provider|clean_class, + 'block-' ~ plugin_id|clean_class, + ] +%} + + {{ title_prefix }} + {% if label %} + {{ label }} + {% endif %} + {{ title_suffix }} + {% block content %} + {{ content }} + {% endblock %} + + +{# {% + set classes = [ + 'block', + 'block-' ~ configuration.provider|clean_class, + 'block-' ~ plugin_id|clean_class, + ] +%} + + {{ title_prefix }} + {% if label %} + {{ label }} + {% endif %} + {{ title_suffix }} + + {% block content %} + {# Afficher le contenu exclu séparément #} + {# {% if excluded_field_content %} +
+ {{ excluded_field_content }} +
+ {% endif %} + + {# Afficher le contenu filtré #} + {#
+ {% for field_name, field_content in filtered_content %} + {{ field_content }} + {% endfor %} +
+ {% endblock %} + #} #} #} diff --git a/web/themes/custom/reha/templates/node--site--home-block.html.twig b/web/themes/custom/reha/templates/node--site--home-block.html.twig index da21e28..988e96e 100644 --- a/web/themes/custom/reha/templates/node--site--home-block.html.twig +++ b/web/themes/custom/reha/templates/node--site--home-block.html.twig @@ -94,13 +94,16 @@ #} - + {{ title_prefix }} - {# Champ image affiché séparément #} -
- {{ image_field_content }} -
+ + {# Afficher le champ image séparément #} + {% if image_field_content %} +
+ {{ image_field_content }} +
+ {% endif %} {# Envelopper le titre et tous les autres champs dans une nouvelle div #}