diff --git a/web/themes/custom/reha/dist/bundle.js b/web/themes/custom/reha/dist/bundle.js index d6b827c..be4cec9 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 ////////////// tiroir fichiers ///////\n\n // $(\".profile--type--collaborateur\").click(function(event) {\n // // Ouvrir .tiroir fichiers\n // $(\".layout-sidebar-second\").animate({translate:'90%'},350);\n // });\n // $(\"#block-reha-views-block-current-user-doc-profile-block-1 > h2\").click(function(event) {\n // // Ouvrir .tiroir fichiers\n // $(\".layout-sidebar-second\").animate({translate:'0%'},350);\n // });\n $(document).ready(function() {\n // Vérifier l'état initial depuis sessionStorage\n if (sessionStorage.getItem('asideOpened') === 'true') {\n $(\".layout-sidebar-second\").addClass('close');\n }\n\n $(\".profile--type--collaborateur\").click(function(event) {\n // Ouvrir .tiroir fichiers\n $(\".layout-sidebar-second\").addClass('close');\n sessionStorage.setItem('asideOpened', 'true');\n });\n\n $(\"#block-reha-views-block-current-user-doc-profile-block-1 > h2\").click(function(event) {\n // Fermer .tiroir fichiers\n $(\".layout-sidebar-second\").removeClass('close');\n sessionStorage.setItem('asideOpened', 'false');\n });\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 adaptiveHeight: 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\n $(document).ready(function(){\n $('.view-id-actus.view-display-id-block_1').slick({\n slidesToShow: 3,\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('slick actu');\n });\n $(document).ready(function(){\n $('.page-node-site .node-type-site .field--name-field-image > div:nth-child(2)').slick({\n slidesToShow: 1,\n slidesToScroll: 1,\n dots: true,\n arrows: false,\n adaptiveHeight: 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('slick actu');\n });\n\n\n \n\n// /////////////////\n//// ancre dans texte au click parragraphe correspondant arrive en dessous du header \n\n\n// (function($, window) {\n// var adjustAnchor = function() {\n// var $anchor = $('.block-region-first'),\n// fixedElementHeight = 500;\n// if ($anchor.length > 0) {\n// $('html, body').stop().animate({scrollTop: $anchor.offset().top - fixedElementHeight }, 0);\n// }\n// };\n\n// $(window).on('hashchange', function() {\n// adjustAnchor();\n// });\n// }); \n\n\n})(jQuery, window);\n\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 ////////////// tiroir fichiers ///////\n\n // $(\".profile--type--collaborateur\").click(function(event) {\n // // Ouvrir .tiroir fichiers\n // $(\".layout-sidebar-second\").animate({translate:'90%'},350);\n // });\n // $(\"#block-reha-views-block-current-user-doc-profile-block-1 > h2\").click(function(event) {\n // // Ouvrir .tiroir fichiers\n // $(\".layout-sidebar-second\").animate({translate:'0%'},350);\n // });\n $(document).ready(function() {\n // Vérifier l'état initial depuis sessionStorage\n if (sessionStorage.getItem('asideOpened') === 'true') {\n $(\".layout-sidebar-second\").addClass('close');\n $(\"h2\").addClass('__close');\n }\n\n $(\".profile--type--collaborateur\").click(function(event) {\n // Ouvrir .tiroir fichiers\n $(\".layout-sidebar-second\").addClass('close');\n $(\"h2\").addClass('__close');\n sessionStorage.setItem('asideOpened', 'true');\n });\n\n $(\"#block-reha-views-block-current-user-doc-profile-block-1 > h2\").click(function(event) {\n // Fermer .tiroir fichiers\n $(\".layout-sidebar-second\").removeClass('close');\n $(\"h2\").removeClass('__close');\n sessionStorage.setItem('asideOpened', 'false');\n });\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 adaptiveHeight: 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\n $(document).ready(function(){\n $('.view-id-actus.view-display-id-block_1').slick({\n slidesToShow: 3,\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('slick actu');\n });\n $(document).ready(function(){\n $('.page-node-site .node-type-site .field--name-field-image > div:nth-child(2)').slick({\n slidesToShow: 1,\n slidesToScroll: 1,\n dots: true,\n arrows: false,\n adaptiveHeight: 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('slick actu');\n });\n\n\n \n\n// /////////////////\n//// ancre dans texte au click parragraphe correspondant arrive en dessous du header \n\n\n// (function($, window) {\n// var adjustAnchor = function() {\n// var $anchor = $('.block-region-first'),\n// fixedElementHeight = 500;\n// if ($anchor.length > 0) {\n// $('html, body').stop().animate({scrollTop: $anchor.offset().top - fixedElementHeight }, 0);\n// }\n// };\n\n// $(window).on('hashchange', function() {\n// adjustAnchor();\n// });\n// }); \n\n\n})(jQuery, window);\n\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 3b52c04..a8b79b1 100644 --- a/web/themes/custom/reha/dist/css/bundle.css +++ b/web/themes/custom/reha/dist/css/bundle.css @@ -939,10 +939,20 @@ h4 { } aside.layout-sidebar-second { + box-shadow: rgba(99, 99, 99, 0.2) 0px 2px 8px 4px; overflow: scroll; padding-top: 110px; z-index: 100; padding-left: 2rem; + transform: translateX(0%); + transition: transform 0.35s; +} +aside.layout-sidebar-second.close { + transform: translateX(85%); /* Par défaut ouvert */ + transition: transform 0.35s; +} +aside.layout-sidebar-second.close:hover { + background-color: #fdc300; } aside.layout-sidebar-second h2 { transform: translateX(-48%) translateY(25vh) rotate(-90deg); @@ -957,6 +967,10 @@ aside.layout-sidebar-second h2::before { display: inline-block; transform: translateY(5px) rotate(90deg); } +aside.layout-sidebar-second h2.__close::before { + content: url("../../dist/images/noun-arrow-1569918-black.svg"); + display: inline-block; +} aside.layout-sidebar-second .view-current-user-doc-profile { margin: 0 6rem; display: flex; @@ -1035,19 +1049,6 @@ aside.layout-sidebar-second footer.view-footer :hover { background-color: #fdc300; } -aside.layout-sidebar-second.close { - transform: translateX(85%); /* Par défaut ouvert */ - transition: transform 0.35s; -} -aside.layout-sidebar-second.close:hover { - background-color: #fdc300; -} - -aside.layout-sidebar-second { - transform: translateX(0%); - transition: transform 0.35s; -} - /* Slider */ .slick-loading .slick-list { background: #fff url("./ajax-loader.gif") center center no-repeat; @@ -2652,7 +2653,7 @@ html.js body.node-type-operation.node-id-7 div.dialog-off-canvas-main-canvas div .page-node-site .region-content #block-reha-prevnextblock { display: flex; flex-direction: row; - grid-column: 4/span 6; + grid-column: 2/span 8; grid-row: 2; z-index: 97; height: fit-content; @@ -2674,7 +2675,7 @@ html.js body.node-type-operation.node-id-7 div.dialog-off-canvas-main-canvas div } .page-node-site .region-content #block-reha-contenudelapageprincipale { grid-column: 1/span 8; - grid-row: 1/span 10; + grid-row: 2/span 10; } .page-node-site .region-content #block-reha-contenudelapageprincipale .node-type-site { margin: auto; diff --git a/web/themes/custom/reha/js/reha.js b/web/themes/custom/reha/js/reha.js index 9feeca2..791727c 100644 --- a/web/themes/custom/reha/js/reha.js +++ b/web/themes/custom/reha/js/reha.js @@ -91,17 +91,20 @@ jQuery(document).ready(function($){ // Vérifier l'état initial depuis sessionStorage if (sessionStorage.getItem('asideOpened') === 'true') { $(".layout-sidebar-second").addClass('close'); + $("h2").addClass('__close'); } $(".profile--type--collaborateur").click(function(event) { // Ouvrir .tiroir fichiers $(".layout-sidebar-second").addClass('close'); + $("h2").addClass('__close'); sessionStorage.setItem('asideOpened', 'true'); }); $("#block-reha-views-block-current-user-doc-profile-block-1 > h2").click(function(event) { // Fermer .tiroir fichiers $(".layout-sidebar-second").removeClass('close'); + $("h2").removeClass('__close'); sessionStorage.setItem('asideOpened', 'false'); }); }); diff --git a/web/themes/custom/reha/scss/pages/node-site.scss b/web/themes/custom/reha/scss/pages/node-site.scss index a86026a..b5e045c 100644 --- a/web/themes/custom/reha/scss/pages/node-site.scss +++ b/web/themes/custom/reha/scss/pages/node-site.scss @@ -18,7 +18,7 @@ #block-reha-prevnextblock{ display: flex; flex-direction: row; - grid-column: 4 /span 6; + grid-column: 2 /span 8; grid-row: 2; z-index: 97; height: fit-content; @@ -46,7 +46,7 @@ } #block-reha-contenudelapageprincipale{ grid-column: 1 /span 8; - grid-row: 1 /span 10; + grid-row: 2 /span 10; .node-type-site{ margin: auto; display: flex; diff --git a/web/themes/custom/reha/scss/partials/_aside.scss b/web/themes/custom/reha/scss/partials/_aside.scss index ddea971..037f01a 100644 --- a/web/themes/custom/reha/scss/partials/_aside.scss +++ b/web/themes/custom/reha/scss/partials/_aside.scss @@ -1,5 +1,7 @@ .layout-sidebar-first{ + + #block-reha-phase1{ border: solid $yellow-puca 1px; font-weight: 800; @@ -35,121 +37,121 @@ ////// tiroirs fichers + aside.layout-sidebar-second{ + box-shadow: rgba(99, 99, 99, 0.2) 0px 2px 8px 4px; overflow: scroll; padding-top: $header-height; z-index: 100; padding-left: 2rem; - // #block-reha-views-block-current-user-doc-profile-block-1{ - h2{ - transform: translateX(-48%) translateY(25vh) rotate(-90deg); - text-transform: uppercase; - font-weight: 400; - cursor: pointer; - padding-top: 2rem; - padding-bottom: 2rem; - &::before{ - content: url('../../dist/images/noun-arrow-1569918-black.svg'); - display: inline-block; - transform: translateY(5px) rotate(90deg); + transform: translateX(0%); + transition: transform 0.35s; + &.close { + transform: translateX(85%); /* Par défaut ouvert */ + transition: transform 0.35s; + &:hover{ + background-color: $yellow-puca; + } + } + h2{ + transform: translateX(-48%) translateY(25vh) rotate(-90deg); + text-transform: uppercase; + font-weight: 400; + cursor: pointer; + padding-top: 2rem; + padding-bottom: 2rem; + &::before{ + content: url('../../dist/images/noun-arrow-1569918-black.svg'); + display: inline-block; + transform: translateY(5px) rotate(90deg); + } + + } + h2.__close{ + &::before{ + content: url('../../dist/images/noun-arrow-1569918-black.svg'); + display: inline-block; + + } + } + .view-current-user-doc-profile{ + margin: 0 6rem ; + display: flex; + flex-direction: column; + top: -60px; + position: relative; + } + + .profile--type--collaborateur{ + .field--name-field-site{ + font-size: 2rem; + font-weight: 900; + display: flex; + margin-bottom: 3rem; + &::after{ + content: url(../images/noun-cross-1151731.svg); + cursor: pointer; + padding-left: 2rem; } } - .view-current-user-doc-profile{ - margin: 0 6rem ; + .field--name-field-dossier-de-pilotage, + .field--name-field-dossier-evenement{ + text-transform: uppercase; display: flex; flex-direction: column; - top: -60px; - position: relative; - } - - .profile--type--collaborateur{ - .field--name-field-site{ - font-size: 2rem; - font-weight: 900; + > div:nth-child(1){ display: flex; - margin-bottom: 3rem; - &::after{ - content: url(../images/noun-cross-1151731.svg); - cursor: pointer; - padding-left: 2rem; - } + align-items: center; + flex-direction: row; } - .field--name-field-dossier-de-pilotage, - .field--name-field-dossier-evenement{ - text-transform: uppercase; - display: flex; - flex-direction: column; - > div:nth-child(1){ - display: flex; - align-items: center; - flex-direction: row; - } - - > div:nth-child(1)::before{ - content: url('../../dist/images/noun-file-6880430.svg'); - display: inline-flex; - width: 70px; - height: auto; - padding-right: 1rem; - align-items: center; - } - .field__item{ - // align-self: flex-end; - // padding-right: 2rem; - // padding-left: 3rem; - .paragraph--type--dossier{ - padding-left: 25%; - .field--name-field-fichiers{ - text-transform: none; - border: none; - padding-left: 10%; - span:nth-of-type(2){ - display: none; - } + + > div:nth-child(1)::before{ + content: url('../../dist/images/noun-file-6880430.svg'); + display: inline-flex; + width: 70px; + height: auto; + padding-right: 1rem; + align-items: center; + } + .field__item{ + // align-self: flex-end; + // padding-right: 2rem; + // padding-left: 3rem; + .paragraph--type--dossier{ + padding-left: 25%; + .field--name-field-fichiers{ + text-transform: none; + border: none; + padding-left: 10%; + span:nth-of-type(2){ + display: none; } } } } - } - - footer.view-footer{ - margin-top: 3rem; - text-transform: uppercase; - border: solid black 1px; - background-color: $white-button; - font-size: 0.9rem; - width: fit-content; - font-weight: 400; - padding-top: 0; - align-self: left; - margin-left: 1rem; + } + } - @media (max-width:891px) { - font-size: 1rem; - } - p{margin: 0; - padding: 0.3rem;} - :hover{ - background-color: $yellow-puca; + footer.view-footer{ + margin-top: 3rem; + text-transform: uppercase; + border: solid black 1px; + background-color: $white-button; + font-size: 0.9rem; + width: fit-content; + font-weight: 400; + padding-top: 0; + align-self: left; + margin-left: 1rem; + + @media (max-width:891px) { + font-size: 1rem; } - - } - - - // } - - + p{margin: 0; + padding: 0.3rem;} + :hover{ + background-color: $yellow-puca; + } + } } -aside.layout-sidebar-second.close { - transform: translateX(85%); /* Par défaut ouvert */ - transition: transform 0.35s; - &:hover{ - background-color: $yellow-puca; - } - -} -aside.layout-sidebar-second { - transform: translateX(0%); - transition: transform 0.35s; -} \ No newline at end of file diff --git a/web/themes/custom/reha/templates/node--site.html.twig b/web/themes/custom/reha/templates/node--site.html.twig index 82f4018..861aedb 100644 --- a/web/themes/custom/reha/templates/node--site.html.twig +++ b/web/themes/custom/reha/templates/node--site.html.twig @@ -97,16 +97,8 @@ {{ title_prefix }} - - {# 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 #} -
+
+

{{ node.label }}

{% if label and not page %} @@ -127,6 +119,13 @@ {% endif %}
+ {% if image_field_content %} +
+ {{ image_field_content }} +
+ {% endif %} + +
{% if body_field_content is defined or files_field_content is defined %}
{% if body_field_content is defined %}