瀏覽代碼

Merge branch 'master' of https://figureslibres.io/gogs/bachir/drupal-reha

ouidade 9 月之前
父節點
當前提交
799fcf3739
共有 30 個文件被更改,包括 642 次插入64 次删除
  1. 30 0
      config/sync/block.block.reha_config_pages_3.yml
  2. 0 1
      config/sync/block.block.reha_navigationprincipale.yml
  3. 17 0
      config/sync/config_pages.type.documents_en_telechargement.yml
  4. 17 0
      config/sync/config_pages.type.fiche_de_synthese_de_tous_les_si.yml
  5. 68 14
      config/sync/content_as_config.block_content.yml
  6. 89 2
      config/sync/content_as_config.menu_link_content.yml
  7. 23 0
      config/sync/core.entity_form_display.config_pages.fiche_de_synthese_de_tous_les_si.default.yml
  8. 24 5
      config/sync/core.entity_form_display.node.ressource.default.yml
  9. 24 0
      config/sync/core.entity_view_display.config_pages.fiche_de_synthese_de_tous_les_si.default.yml
  10. 12 3
      config/sync/core.entity_view_display.node.ressource.default.yml
  11. 2 0
      config/sync/core.entity_view_display.node.ressource.home_block.yml
  12. 12 3
      config/sync/core.entity_view_display.node.ressource.teaser.yml
  13. 1 1
      config/sync/core.entity_view_display.node.site.site_partenaire.yml
  14. 27 0
      config/sync/field.field.config_pages.fiche_de_synthese_de_tous_les_si.field_fichier.yml
  15. 29 0
      config/sync/field.field.node.ressource.field_themes.yml
  16. 27 0
      config/sync/field.storage.config_pages.field_fichier.yml
  17. 24 0
      config/sync/field.storage.node.field_themes.yml
  18. 11 0
      config/sync/language.content_settings.taxonomy_term.theme_ressource.yml
  19. 7 7
      config/sync/page_manager.page_variant.programme-panels_variant-0.yml
  20. 8 0
      config/sync/taxonomy.vocabulary.theme_ressource.yml
  21. 1 2
      config/sync/user.role.admin.yml
  22. 1 0
      config/sync/user.role.anonymous.yml
  23. 1 0
      config/sync/user.role.authenticated.yml
  24. 0 2
      config/sync/user.role.collaborateur.yml
  25. 1 2
      config/sync/user.role.editor.yml
  26. 1 1
      config/sync/views.view.actus.yml
  27. 81 19
      config/sync/views.view.ressources.yml
  28. 21 1
      web/themes/custom/reha/reha.theme
  29. 1 1
      web/themes/custom/reha/templates/block--views-block--current-user-block-block-1.html.twig
  30. 82 0
      web/themes/custom/reha/templates/field--node--field-adresse-site--site.html.twig

+ 30 - 0
config/sync/block.block.reha_config_pages_3.yml

@@ -0,0 +1,30 @@
+uuid: 7c0c250c-f942-45cb-9252-dec859887cf2
+langcode: fr
+status: true
+dependencies:
+  module:
+    - config_pages
+    - node
+  theme:
+    - reha
+id: reha_config_pages_3
+theme: reha
+region: content
+weight: 0
+provider: null
+plugin: config_pages_block
+settings:
+  id: config_pages_block
+  label: 'ConfigPages Block'
+  label_display: '0'
+  provider: config_pages
+  config_page_type: fiche_de_synthese_de_tous_les_si
+  config_page_view_mode: full
+visibility:
+  'entity_bundle:node':
+    id: 'entity_bundle:node'
+    negate: false
+    context_mapping:
+      node: '@node.node_route_context:node'
+    bundles:
+      site: site

+ 0 - 1
config/sync/block.block.reha_navigationprincipale.yml

@@ -5,7 +5,6 @@ dependencies:
   config:
     - system.menu.main
   module:
-    - block_class
     - menu_block
   theme:
     - reha

+ 17 - 0
config/sync/config_pages.type.documents_en_telechargement.yml

@@ -0,0 +1,17 @@
+uuid: 6c0289ef-697f-41b5-801f-ed5db25e942e
+langcode: fr
+status: true
+dependencies: {  }
+id: documents_en_telechargement
+label: 'documents_en_telechargement [OBSOLETE]'
+token: false
+context:
+  show_warning: true
+  group:
+    language: false
+  fallback:
+    language: ''
+menu:
+  path: ''
+  weight: 0
+  description: ''

+ 17 - 0
config/sync/config_pages.type.fiche_de_synthese_de_tous_les_si.yml

@@ -0,0 +1,17 @@
+uuid: dc71e7f6-0e7c-493d-bc6c-b05703cb250f
+langcode: fr
+status: true
+dependencies: {  }
+id: fiche_de_synthese_de_tous_les_si
+label: 'Fiche de synthèse de tous les sites'
+token: true
+context:
+  show_warning: true
+  group:
+    language: false
+  fallback:
+    language: ''
+menu:
+  path: /edit/fichesynthese
+  weight: 0
+  description: ''

+ 68 - 14
config/sync/content_as_config.block_content.yml

@@ -1,7 +1,7 @@
 734a55bb-b11d-4498-bb55-5a6cb1924aa8:
   uuid: 734a55bb-b11d-4498-bb55-5a6cb1924aa8
   id: '4'
-  info: 'Logo Gouv'
+  info: 'Logo gouv'
   langcode: fr
   type: logo_link
   reusable: '1'
@@ -13,11 +13,11 @@
         options: {  }
     field_logo:
       -
-        target_id: '8'
-        alt: Gouvernement
+        target_id: '16'
+        alt: 'Logo gouvernement'
         title: ''
-        width: '390'
-        height: '217'
+        width: '1147'
+        height: '685'
 6aedcd97-72c8-4328-b52d-f4d2a5285b96:
   uuid: 6aedcd97-72c8-4328-b52d-f4d2a5285b96
   id: '5'
@@ -33,8 +33,8 @@
         options: {  }
     field_logo:
       -
-        target_id: '4'
-        alt: 'Programme Reha Héritages'
+        target_id: '17'
+        alt: 'logo reha-héritage'
         title: ''
         width: '3000'
         height: '3000'
@@ -48,16 +48,16 @@ bc48e271-75cf-4c3f-a4aa-ecc3c573c060:
   fields:
     field_lien:
       -
-        uri: 'http://dev.reha.fr'
+        uri: 'https://www.urbanisme-puca.gouv.fr/reha-heritages-rehabiliter-les-heritages-a2785.html'
         title: ''
         options: {  }
     field_logo:
       -
-        target_id: '7'
-        alt: PUCA
+        target_id: '21'
+        alt: 'logo puca'
         title: ''
-        width: '313'
-        height: '181'
+        width: '436'
+        height: '436'
 1ca95211-9fa2-4ef2-a460-8184d1eaf20f:
   uuid: 1ca95211-9fa2-4ef2-a460-8184d1eaf20f
   id: '7'
@@ -96,7 +96,7 @@ bc48e271-75cf-4c3f-a4aa-ecc3c573c060:
   fields:
     field_fichier:
       -
-        target_id: '11'
+        target_id: '65'
         display: '1'
         description: 'Télécharger le cahier des charges'
 259faa3e-f66e-4776-9f4e-9a3aa26e8252:
@@ -109,7 +109,7 @@ bc48e271-75cf-4c3f-a4aa-ecc3c573c060:
   fields:
     field_fichier:
       -
-        target_id: '12'
+        target_id: '69'
         display: '1'
         description: 'Télécharger la fiche candidature'
 5ae07b35-3c0b-48f5-b51b-f0f0e4c1765f:
@@ -142,3 +142,57 @@ e05f593a-38ab-4dba-ad1c-9ae23c1222a9:
         value: '<p>Appel à candidatures</p>'
         summary: ''
         format: wysiwyg
+9e601647-144f-4e8e-b9e1-7d744f9141d7:
+  uuid: 9e601647-144f-4e8e-b9e1-7d744f9141d7
+  id: '14'
+  info: 'Voir tous les sites'
+  langcode: fr
+  type: node_link
+  reusable: '1'
+  fields:
+    field_description: {  }
+    field_node_link:
+      -
+        uri: 'internal:/lessitespilotes'
+        title: 'Voir tous les sites'
+        options: {  }
+3bb825b3-ab84-4861-a4f2-2a5e5eed74de:
+  uuid: 3bb825b3-ab84-4861-a4f2-2a5e5eed74de
+  id: '15'
+  info: 'Phase 2.'
+  langcode: fr
+  type: text
+  reusable: '1'
+  fields:
+    body:
+      -
+        value: '<p>Phase 2.</p><p>Présentation des 12 sites</p>'
+        summary: ''
+        format: wysiwyg
+793e5016-2b96-4802-9f38-1cd3768775b5:
+  uuid: 793e5016-2b96-4802-9f38-1cd3768775b5
+  id: '16'
+  info: 'Le programme link'
+  langcode: fr
+  type: node_link
+  reusable: '1'
+  fields:
+    field_description: {  }
+    field_node_link:
+      -
+        uri: 'internal:/programme'
+        title: 'En savoir plus sur le programme reha héritage'
+        options: {  }
+b5549437-bd2c-4e88-96e3-efef8f518389:
+  uuid: b5549437-bd2c-4e88-96e3-efef8f518389
+  id: '17'
+  info: 'ancres programme'
+  langcode: fr
+  type: text
+  reusable: '1'
+  fields:
+    body:
+      -
+        value: "<ul>\r\n<li><a href=\"#block-667a8e7496725\">Le programme REHA Héritages</a></li>\r\n<li><a href=\"#block-667a8e749918b\">Les partenaires</a></li>\r\n</ul>"
+        summary: ''
+        format: restricted_html

+ 89 - 2
config/sync/content_as_config.menu_link_content.yml

@@ -1,3 +1,39 @@
+6af09942-a538-4c95-beb4-05ef50e8179a:
+  uuid: 6af09942-a538-4c95-beb4-05ef50e8179a
+  menu_name: footer
+  title: Contacts
+  parent: ''
+  link:
+    -
+      uri: 'internal:/contacts'
+      title: ''
+      options:
+        attributes:
+          class:
+            - ''
+  description: ''
+  enabled: '1'
+  expanded: '0'
+  weight: '0'
+  langcode: fr
+26d85489-f033-4f34-b529-52a6cb40bb43:
+  uuid: 26d85489-f033-4f34-b529-52a6cb40bb43
+  menu_name: footer
+  title: 'Mentions légales'
+  parent: ''
+  link:
+    -
+      uri: 'internal:/mentions_legales'
+      title: ''
+      options:
+        attributes:
+          class:
+            - ''
+  description: ''
+  enabled: '1'
+  expanded: '0'
+  weight: '0'
+  langcode: fr
 39762042-305d-41ee-9024-f357eb247b35:
   uuid: 39762042-305d-41ee-9024-f357eb247b35
   menu_name: editor
@@ -214,14 +250,32 @@ fa213d6e-b8d9-4646-9802-02d63c6812a9:
   expanded: '0'
   weight: '-48'
   langcode: fr
+0817b751-fff3-4338-a9b0-7e313cac81b4:
+  uuid: 0817b751-fff3-4338-a9b0-7e313cac81b4
+  menu_name: main
+  title: 'Le programme'
+  parent: ''
+  link:
+    -
+      uri: 'internal:/programme'
+      title: ''
+      options:
+        attributes:
+          class:
+            - ''
+  description: ''
+  enabled: '1'
+  expanded: '0'
+  weight: '0'
+  langcode: fr
 effb8194-cf53-498c-8aeb-15f796ed56cd:
   uuid: effb8194-cf53-498c-8aeb-15f796ed56cd
   menu_name: editor
-  title: 'Contenus en téléchargement'
+  title: 'Fiche de synthèse'
   parent: 'menu_link_content:39762042-305d-41ee-9024-f357eb247b35'
   link:
     -
-      uri: 'internal:/edit/contenusentelechargement'
+      uri: 'internal:/edit/fichesynthese'
       title: ''
       options:
         attributes:
@@ -232,3 +286,36 @@ effb8194-cf53-498c-8aeb-15f796ed56cd:
   expanded: '0'
   weight: '-42'
   langcode: fr
+d65617c9-af85-4c7f-98ba-d7f2c2fce767:
+  uuid: d65617c9-af85-4c7f-98ba-d7f2c2fce767
+  menu_name: editor
+  title: Utilisateurs
+  parent: ''
+  link:
+    -
+      uri: 'internal:/admin/people'
+      title: ''
+      options:
+        attributes:
+          class:
+            - ''
+  description: ''
+  enabled: '1'
+  expanded: '0'
+  weight: '0'
+  langcode: fr
+c1393d5d-a736-4105-ba2a-e18119a9fa96:
+  uuid: c1393d5d-a736-4105-ba2a-e18119a9fa96
+  menu_name: main
+  title: 'Le Saint-Jaumes'
+  parent: 'views_view:views.sites.page_1'
+  link:
+    -
+      uri: 'entity:node/59'
+      title: null
+      options: {  }
+  description: ''
+  enabled: '1'
+  expanded: '0'
+  weight: '2'
+  langcode: fr

+ 23 - 0
config/sync/core.entity_form_display.config_pages.fiche_de_synthese_de_tous_les_si.default.yml

@@ -0,0 +1,23 @@
+uuid: 8ab1f853-3120-4858-a789-b448d6e9172b
+langcode: fr
+status: true
+dependencies:
+  config:
+    - config_pages.type.fiche_de_synthese_de_tous_les_si
+    - field.field.config_pages.fiche_de_synthese_de_tous_les_si.field_fichier
+  module:
+    - file
+id: config_pages.fiche_de_synthese_de_tous_les_si.default
+targetEntityType: config_pages
+bundle: fiche_de_synthese_de_tous_les_si
+mode: default
+content:
+  field_fichier:
+    type: file_generic
+    weight: 0
+    region: content
+    settings:
+      progress_indicator: throbber
+    third_party_settings: {  }
+hidden:
+  label: true

+ 24 - 5
config/sync/core.entity_form_display.node.ressource.default.yml

@@ -10,6 +10,7 @@ dependencies:
     - field.field.node.ressource.field_liens
     - field.field.node.ressource.field_site
     - field.field.node.ressource.field_sous_titre
+    - field.field.node.ressource.field_themes
     - field.field.node.ressource.field_type_de_ressource
     - image.style.thumbnail
     - node.type.ressource
@@ -25,8 +26,9 @@ third_party_settings:
     group_details:
       children:
         - field_site
-        - field_auteur
         - field_type_de_ressource
+        - field_themes
+        - field_auteur
         - status
         - promote
       label: Details
@@ -111,7 +113,7 @@ content:
     third_party_settings: {  }
   field_auteur:
     type: string_textfield
-    weight: 9
+    weight: 11
     region: content
     settings:
       size: 60
@@ -158,7 +160,7 @@ content:
       size: 60
       placeholder: ''
     third_party_settings: {  }
-  field_type_de_ressource:
+  field_themes:
     type: autocomplete_deluxe
     weight: 10
     region: content
@@ -175,16 +177,33 @@ content:
       new_terms: false
       no_empty_message: 'No terms could be found. Please type in order to add a new term.'
     third_party_settings: {  }
+  field_type_de_ressource:
+    type: autocomplete_deluxe
+    weight: 9
+    region: content
+    settings:
+      match_operator: CONTAINS
+      autocomplete_route_name: autocomplete_deluxe.autocomplete
+      size: 60
+      selection_handler: default
+      limit: 10
+      min_length: 0
+      delimiter: ''
+      not_found_message_allow: false
+      not_found_message: "The term '@term' will be added"
+      new_terms: false
+      no_empty_message: 'No terms could be found. Please type in order to add a new term.'
+    third_party_settings: {  }
   promote:
     type: boolean_checkbox
-    weight: 12
+    weight: 13
     region: content
     settings:
       display_label: true
     third_party_settings: {  }
   status:
     type: boolean_checkbox
-    weight: 11
+    weight: 12
     region: content
     settings:
       display_label: true

+ 24 - 0
config/sync/core.entity_view_display.config_pages.fiche_de_synthese_de_tous_les_si.default.yml

@@ -0,0 +1,24 @@
+uuid: e044cd3c-4875-4ec8-85f3-759c5a42c6d6
+langcode: fr
+status: true
+dependencies:
+  config:
+    - config_pages.type.fiche_de_synthese_de_tous_les_si
+    - field.field.config_pages.fiche_de_synthese_de_tous_les_si.field_fichier
+  module:
+    - file
+id: config_pages.fiche_de_synthese_de_tous_les_si.default
+targetEntityType: config_pages
+bundle: fiche_de_synthese_de_tous_les_si
+mode: default
+content:
+  field_fichier:
+    type: file_default
+    label: visually_hidden
+    settings:
+      use_description_as_link_text: true
+    third_party_settings: {  }
+    weight: 0
+    region: content
+hidden:
+  search_api_excerpt: true

+ 12 - 3
config/sync/core.entity_view_display.node.ressource.default.yml

@@ -10,6 +10,7 @@ dependencies:
     - field.field.node.ressource.field_liens
     - field.field.node.ressource.field_site
     - field.field.node.ressource.field_sous_titre
+    - field.field.node.ressource.field_themes
     - field.field.node.ressource.field_type_de_ressource
     - node.type.ressource
   module:
@@ -28,7 +29,7 @@ content:
     label: visually_hidden
     settings: {  }
     third_party_settings: {  }
-    weight: 5
+    weight: 6
     region: content
   field_auteur:
     type: string
@@ -44,7 +45,7 @@ content:
     settings:
       use_description_as_link_text: true
     third_party_settings: {  }
-    weight: 6
+    weight: 7
     region: content
   field_image:
     type: image
@@ -67,7 +68,7 @@ content:
       rel: ''
       target: ''
     third_party_settings: {  }
-    weight: 7
+    weight: 8
     region: content
   field_site:
     type: entity_reference_label
@@ -85,6 +86,14 @@ content:
     third_party_settings: {  }
     weight: 2
     region: content
+  field_themes:
+    type: entity_reference_label
+    label: visually_hidden
+    settings:
+      link: false
+    third_party_settings: {  }
+    weight: 5
+    region: content
   field_type_de_ressource:
     type: entity_reference_label
     label: visually_hidden

+ 2 - 0
config/sync/core.entity_view_display.node.ressource.home_block.yml

@@ -11,6 +11,7 @@ dependencies:
     - field.field.node.ressource.field_liens
     - field.field.node.ressource.field_site
     - field.field.node.ressource.field_sous_titre
+    - field.field.node.ressource.field_themes
     - field.field.node.ressource.field_type_de_ressource
     - node.type.ressource
   module:
@@ -40,6 +41,7 @@ hidden:
   field_image: true
   field_liens: true
   field_site: true
+  field_themes: true
   field_type_de_ressource: true
   langcode: true
   search_api_excerpt: true

+ 12 - 3
config/sync/core.entity_view_display.node.ressource.teaser.yml

@@ -11,6 +11,7 @@ dependencies:
     - field.field.node.ressource.field_liens
     - field.field.node.ressource.field_site
     - field.field.node.ressource.field_sous_titre
+    - field.field.node.ressource.field_themes
     - field.field.node.ressource.field_type_de_ressource
     - image.style.large
     - node.type.ressource
@@ -28,7 +29,7 @@ content:
     settings:
       link_to_entity: false
     third_party_settings: {  }
-    weight: 3
+    weight: 4
     region: content
   field_image:
     type: image
@@ -47,7 +48,7 @@ content:
     settings:
       link: true
     third_party_settings: {  }
-    weight: 4
+    weight: 5
     region: content
   field_sous_titre:
     type: string
@@ -57,6 +58,14 @@ content:
     third_party_settings: {  }
     weight: 2
     region: content
+  field_themes:
+    type: entity_reference_label
+    label: visually_hidden
+    settings:
+      link: false
+    third_party_settings: {  }
+    weight: 3
+    region: content
   field_type_de_ressource:
     type: entity_reference_label
     label: visually_hidden
@@ -68,7 +77,7 @@ content:
   links:
     settings: {  }
     third_party_settings: {  }
-    weight: 5
+    weight: 6
     region: content
 hidden:
   body: true

+ 1 - 1
config/sync/core.entity_view_display.node.site.site_partenaire.yml

@@ -25,7 +25,7 @@ bundle: site
 mode: site_partenaire
 content:
   field_adresse_site:
-    type: address_plain
+    type: address_default
     label: visually_hidden
     settings: {  }
     third_party_settings: {  }

+ 27 - 0
config/sync/field.field.config_pages.fiche_de_synthese_de_tous_les_si.field_fichier.yml

@@ -0,0 +1,27 @@
+uuid: ba6dbde6-c863-4856-8da2-48bfc1bccf17
+langcode: fr
+status: true
+dependencies:
+  config:
+    - config_pages.type.fiche_de_synthese_de_tous_les_si
+    - field.storage.config_pages.field_fichier
+  module:
+    - file
+id: config_pages.fiche_de_synthese_de_tous_les_si.field_fichier
+field_name: field_fichier
+entity_type: config_pages
+bundle: fiche_de_synthese_de_tous_les_si
+label: Fichier
+description: ''
+required: false
+translatable: false
+default_value: {  }
+default_value_callback: ''
+settings:
+  handler: 'default:file'
+  handler_settings: {  }
+  file_directory: '[date:custom:Y]-[date:custom:m]'
+  file_extensions: 'pdf doc docx odt zip'
+  max_filesize: ''
+  description_field: true
+field_type: file

+ 29 - 0
config/sync/field.field.node.ressource.field_themes.yml

@@ -0,0 +1,29 @@
+uuid: 99a16ee1-b3da-4133-86bc-29ebea7c446b
+langcode: fr
+status: true
+dependencies:
+  config:
+    - field.storage.node.field_themes
+    - node.type.ressource
+    - taxonomy.vocabulary.theme_ressource
+id: node.ressource.field_themes
+field_name: field_themes
+entity_type: node
+bundle: ressource
+label: Thèmes
+description: ''
+required: false
+translatable: false
+default_value: {  }
+default_value_callback: ''
+settings:
+  handler: 'default:taxonomy_term'
+  handler_settings:
+    target_bundles:
+      theme_ressource: theme_ressource
+    sort:
+      field: name
+      direction: asc
+    auto_create: true
+    auto_create_bundle: ''
+field_type: entity_reference

+ 27 - 0
config/sync/field.storage.config_pages.field_fichier.yml

@@ -0,0 +1,27 @@
+uuid: cfb8cfa5-64d5-400e-8ed2-a137e6217b21
+langcode: fr
+status: true
+dependencies:
+  module:
+    - config_pages
+    - field_permissions
+    - file
+third_party_settings:
+  field_permissions:
+    permission_type: public
+id: config_pages.field_fichier
+field_name: field_fichier
+entity_type: config_pages
+type: file
+settings:
+  target_type: file
+  display_field: true
+  display_default: true
+  uri_scheme: public
+module: file
+locked: false
+cardinality: -1
+translatable: true
+indexes: {  }
+persist_with_no_fields: false
+custom_storage: false

+ 24 - 0
config/sync/field.storage.node.field_themes.yml

@@ -0,0 +1,24 @@
+uuid: 20a41f10-c80c-42c2-8d17-5b992548a95d
+langcode: fr
+status: true
+dependencies:
+  module:
+    - field_permissions
+    - node
+    - taxonomy
+third_party_settings:
+  field_permissions:
+    permission_type: public
+id: node.field_themes
+field_name: field_themes
+entity_type: node
+type: entity_reference
+settings:
+  target_type: taxonomy_term
+module: core
+locked: false
+cardinality: -1
+translatable: true
+indexes: {  }
+persist_with_no_fields: false
+custom_storage: false

+ 11 - 0
config/sync/language.content_settings.taxonomy_term.theme_ressource.yml

@@ -0,0 +1,11 @@
+uuid: dd1fa500-b60f-4e93-a3aa-78c57570a8f6
+langcode: fr
+status: true
+dependencies:
+  config:
+    - taxonomy.vocabulary.theme_ressource
+id: taxonomy_term.theme_ressource
+target_entity_type_id: taxonomy_term
+target_bundle: theme_ressource
+default_langcode: site_default
+language_alterable: false

+ 7 - 7
config/sync/page_manager.page_variant.programme-panels_variant-0.yml

@@ -6,7 +6,7 @@ dependencies:
     - page_manager.page.programme
     - views.view.home
   content:
-    - 'block_content:text:f6f9f74b-815f-4241-9024-e25d910ab2f3'
+    - 'block_content:text:b5549437-bd2c-4e88-96e3-efef8f518389'
   module:
     - block_content
     - config_pages
@@ -35,19 +35,19 @@ variant_settings:
       uuid: e3b91732-d225-4dbd-b9fc-c7655b4c2a6e
     57614f0f-7ed8-4dea-b1fa-ee06e330e9e5:
       id: 'views_block:home-block_1'
-      label: 'Le programme reha héritage'
+      label: 'Le programme REHA-HÉRITAGES'
       label_display: visible
       provider: views
       context_mapping: {  }
-      views_label: 'Le programme reha héritage'
+      views_label: 'Le programme REHA-HÉRITAGES'
       items_per_page: none
       exposed: {  }
       region: second
       weight: 0
       uuid: 57614f0f-7ed8-4dea-b1fa-ee06e330e9e5
-    22719787-50e2-4409-b8f7-977eeb7c2f1b:
-      id: 'block_content:f6f9f74b-815f-4241-9024-e25d910ab2f3'
-      label: 'Ancres page programme'
+    e27febc6-a1cc-4cee-b94a-56c394155000:
+      id: 'block_content:b5549437-bd2c-4e88-96e3-efef8f518389'
+      label: 'ancres programme'
       label_display: '0'
       provider: block_content
       status: true
@@ -56,7 +56,7 @@ variant_settings:
       context_mapping: {  }
       region: first
       weight: 0
-      uuid: 22719787-50e2-4409-b8f7-977eeb7c2f1b
+      uuid: e27febc6-a1cc-4cee-b94a-56c394155000
   page_title: ''
   layout: layout_twocol
   layout_settings:

+ 8 - 0
config/sync/taxonomy.vocabulary.theme_ressource.yml

@@ -0,0 +1,8 @@
+uuid: aa8b5627-2f03-4ef3-aae4-3c2010174700
+langcode: fr
+status: true
+dependencies: {  }
+name: 'Thème ressource'
+vid: theme_ressource
+description: ''
+weight: 0

+ 1 - 2
config/sync/user.role.admin.yml

@@ -61,7 +61,7 @@ permissions:
   - 'edit any site content'
   - 'edit any static content'
   - 'edit contact config page entity'
-  - 'edit documents_en_telechargement config page entity'
+  - 'edit fiche_de_synthese_de_tous_les_si config page entity'
   - 'edit field_site'
   - 'edit mentions_legales config page entity'
   - 'edit own actualite content'
@@ -96,7 +96,6 @@ permissions:
   - 'view any collaborateur profile'
   - 'view any profile'
   - 'view config_pages entity'
-  - 'view documents_en_telechargement config page entity'
   - 'view field_site'
   - 'view ressource revisions'
   - 'view site revisions'

+ 1 - 0
config/sync/user.role.anonymous.yml

@@ -20,5 +20,6 @@ permissions:
   - 'access devel information'
   - 'use text format restricted_html'
   - 'view contact config page entity'
+  - 'view fiche_de_synthese_de_tous_les_si config page entity'
   - 'view mentions_legales config page entity'
   - 'view partenaires config page entity'

+ 1 - 0
config/sync/user.role.authenticated.yml

@@ -28,6 +28,7 @@ permissions:
   - 'opt-in or out of matomo tracking'
   - 'use text format webform_default'
   - 'view contact config page entity'
+  - 'view fiche_de_synthese_de_tous_les_si config page entity'
   - 'view mentions_legales config page entity'
   - 'view own unpublished content'
   - 'view partenaires config page entity'

+ 0 - 2
config/sync/user.role.collaborateur.yml

@@ -5,7 +5,6 @@ dependencies:
   config:
     - node.type.site
   module:
-    - config_pages
     - field_permissions
     - node
     - profile
@@ -17,6 +16,5 @@ permissions:
   - 'create collaborateur profile'
   - 'edit any site content'
   - 'update own collaborateur profile'
-  - 'view documents_en_telechargement config page entity'
   - 'view field_site'
   - 'view own collaborateur profile'

+ 1 - 2
config/sync/user.role.editor.yml

@@ -47,7 +47,7 @@ permissions:
   - 'edit any site content'
   - 'edit any static content'
   - 'edit contact config page entity'
-  - 'edit documents_en_telechargement config page entity'
+  - 'edit fiche_de_synthese_de_tous_les_si config page entity'
   - 'edit field_site'
   - 'edit mentions_legales config page entity'
   - 'edit own actualite content'
@@ -70,7 +70,6 @@ permissions:
   - 'use text format wysiwyg'
   - 'view actualite revisions'
   - 'view any collaborateur profile'
-  - 'view documents_en_telechargement config page entity'
   - 'view field_site'
   - 'view ressource revisions'
   - 'view site revisions'

+ 1 - 1
config/sync/views.view.actus.yml

@@ -24,7 +24,7 @@ display:
     display_plugin: default
     position: 0
     display_options:
-      title: Actualités
+      title: 'Actualités & événements'
       fields:
         title:
           id: title

+ 81 - 19
config/sync/views.view.ressources.yml

@@ -6,6 +6,7 @@ dependencies:
     - core.entity_view_mode.node.teaser
     - node.type.ressource
     - system.menu.main
+    - taxonomy.vocabulary.theme_ressource
     - taxonomy.vocabulary.type_de_ressource
   module:
     - node
@@ -96,7 +97,7 @@ display:
         type: basic
         options:
           submit_button: Appliquer
-          reset_button: false
+          reset_button: true
           reset_button_label: Réinitialiser
           exposed_sorts_label: 'Trier par'
           expose_sort_order: true
@@ -149,30 +150,30 @@ display:
           plugin_id: bundle
           value:
             ressource: ressource
-        field_site_target_id:
-          id: field_site_target_id
-          table: node__field_site
-          field: field_site_target_id
+          group: 1
+        title:
+          id: title
+          table: node_field_data
+          field: title
           relationship: none
           group_type: group
           admin_label: ''
-          plugin_id: numeric
-          operator: '='
-          value:
-            min: ''
-            max: ''
-            value: ''
+          entity_type: node
+          entity_field: title
+          plugin_id: string
+          operator: contains
+          value: ''
           group: 1
           exposed: true
           expose:
-            operator_id: field_site_target_id_op
-            label: Site
+            operator_id: title_op
+            label: Titre
             description: ''
             use_operator: false
-            operator: field_site_target_id_op
+            operator: title_op
             operator_limit_selection: false
             operator_list: {  }
-            identifier: field_site_target_id
+            identifier: title
             required: false
             remember: false
             multiple: false
@@ -182,8 +183,7 @@ display:
               admin: '0'
               root: '0'
               editor: '0'
-            min_placeholder: ''
-            max_placeholder: ''
+              collaborateur: '0'
             placeholder: ''
           is_grouped: false
           group_info:
@@ -197,6 +197,63 @@ display:
             default_group: All
             default_group_multiple: {  }
             group_items: {  }
+        field_themes_target_id:
+          id: field_themes_target_id
+          table: node__field_themes
+          field: field_themes_target_id
+          relationship: none
+          group_type: group
+          admin_label: ''
+          plugin_id: taxonomy_index_tid
+          operator: or
+          value: {  }
+          group: 1
+          exposed: true
+          expose:
+            operator_id: field_themes_target_id_op
+            label: Thèmes
+            description: ''
+            use_operator: false
+            operator: field_themes_target_id_op
+            operator_limit_selection: false
+            operator_list: {  }
+            identifier: field_themes_target_id
+            required: false
+            remember: false
+            multiple: false
+            remember_roles:
+              authenticated: authenticated
+              anonymous: '0'
+              admin: '0'
+              root: '0'
+              editor: '0'
+              collaborateur: '0'
+            reduce: false
+          is_grouped: false
+          group_info:
+            label: ''
+            description: ''
+            identifier: ''
+            optional: true
+            widget: select
+            multiple: false
+            remember: false
+            default_group: All
+            default_group_multiple: {  }
+            group_items: {  }
+          reduce_duplicates: false
+          vid: theme_ressource
+          type: select
+          hierarchy: false
+          limit: true
+          error_message: true
+          save_lineage: false
+          force_deepest: false
+          parent: null
+          level_labels: ''
+          hierarchy_depth: 0
+          required_depth: 0
+          none_label: '- Please select -'
         field_type_de_ressource_target_id:
           id: field_type_de_ressource_target_id
           table: node__field_type_de_ressource
@@ -220,13 +277,14 @@ display:
             identifier: field_type_de_ressource_target_id
             required: false
             remember: false
-            multiple: true
+            multiple: false
             remember_roles:
               authenticated: authenticated
               anonymous: '0'
               admin: '0'
               root: '0'
               editor: '0'
+              collaborateur: '0'
             reduce: false
           is_grouped: false
           group_info:
@@ -240,7 +298,7 @@ display:
             default_group: All
             default_group_multiple: {  }
             group_items: {  }
-          reduce_duplicates: true
+          reduce_duplicates: false
           vid: type_de_ressource
           type: select
           hierarchy: false
@@ -253,6 +311,10 @@ display:
           hierarchy_depth: 0
           required_depth: 0
           none_label: '- Please select -'
+      filter_groups:
+        operator: AND
+        groups:
+          1: AND
       style:
         type: default
       row:

+ 21 - 1
web/themes/custom/reha/reha.theme

@@ -5,7 +5,7 @@ use Drupal\Core\Url;
 use Drupal\Core\Link;
 use Drupal\Core\Render\Markup;
 use Drupal\Component\Utility\Html;
-
+use Drupal\user\Entity\User;
 
 /**
  * @file
@@ -102,5 +102,25 @@ function reha_preprocess_block(&$variables) {
       }
     }
   }
+
+
+  if ($variables['plugin_id'] === "views_block:current_user_block-block_1") {
+    $user = User::load($variables['user']->id());
+    $prenomnom = $user->get('field_prenom')->getString() . ' ' . $user->get('field_nom')->getString();
+    $variables['content']['#title']['#markup'] = $prenomnom;
+    $variables['label']['#markup'] = $prenomnom;
+  }
+
+
 }
 
+function reha_preprocess_field(&$variables){
+  if($variables['field_name'] === 'field_adresse_site'){
+    foreach($variables['items'] as $index => $adr){
+      $postal_code = $variables['items'][$index]['content']['postal_code']['#value'];
+      $pattern = '/(\d{2})(\d+)/i';
+      $replacement = '($1)';
+      $variables['items'][$index]['content']['postal_code']['#value'] = preg_replace($pattern, $replacement, $postal_code);
+    }
+  }
+}

+ 1 - 1
web/themes/custom/reha/templates/block--views-block--current-user-block-block-1.html.twig

@@ -47,7 +47,7 @@
   <div class="connected">
     <div class="connected-full">
       <section class="titre">
-        <p> Informations personnelles </p>
+        <p>Informations personnelles</p>
       </section> 
 
       {{ content }}

+ 82 - 0
web/themes/custom/reha/templates/field--node--field-adresse-site--site.html.twig

@@ -0,0 +1,82 @@
+{#
+/**
+ * @file
+ * Default theme implementation for a field.
+ *
+ * To override output, copy the "field.html.twig" from the templates directory
+ * to your theme's directory and customize it, just like customizing other
+ * Drupal templates such as page.html.twig or node.html.twig.
+ *
+ * Instead of overriding the theming for all fields, you can also just override
+ * theming for a subset of fields using
+ * @link themeable Theme hook suggestions. @endlink For example,
+ * here are some theme hook suggestions that can be used for a field_foo field
+ * on an article node type:
+ * - field--node--field-foo--article.html.twig
+ * - field--node--field-foo.html.twig
+ * - field--node--article.html.twig
+ * - field--field-foo.html.twig
+ * - field--text-with-summary.html.twig
+ * - field.html.twig
+ *
+ * Available variables:
+ * - attributes: HTML attributes for the containing element.
+ * - label_hidden: Whether to show the field label or not.
+ * - title_attributes: HTML attributes for the title.
+ * - label: The label for the field.
+ * - multiple: TRUE if a field can contain multiple items.
+ * - items: List of all the field items. Each item contains:
+ *   - attributes: List of HTML attributes for each item.
+ *   - content: The field item's content.
+ * - entity_type: The entity type to which the field belongs.
+ * - field_name: The name of the field.
+ * - field_type: The type of the field.
+ * - label_display: The display settings for the label.
+ *
+ * @see template_preprocess_field()
+ *
+ * @ingroup themeable
+ */
+#}
+{%
+  set classes = [
+    'field',
+    'field--name-' ~ field_name|clean_class,
+    'field--type-' ~ field_type|clean_class,
+    'field--label-' ~ label_display,
+    label_display == 'inline' ? 'clearfix',
+  ]
+%}
+{%
+  set title_classes = [
+    label_display == 'visually_hidden' ? 'visually-hidden',
+  ]
+%}
+
+
+{% if label_hidden %}
+  {% if multiple %}
+      <div{{ attributes.addClass(classes, 'field__items') }}>
+      {% for item in items %}
+          <div{{ item.attributes.addClass('field__item') }}>{{ item.content }}</div>
+      {% endfor %}
+    </div>
+  {% else %}
+    {% for item in items %}
+          <div{{ item.attributes.addClass('field__item') }}>{{ item.content }}</div>
+    {% endfor %}
+  {% endif %}
+{% else %}
+    <div{{ attributes.addClass(classes) }}>
+    <div{{ title_attributes.addClass(title_classes) }}>{{ label }}</div>
+    {% if multiple %}
+        <div class="field__items">
+    {% endif %}
+    {% for item in items %}
+        <div{{ item.attributes.addClass('field__item') }}>{{ item.content }}</div>
+    {% endfor %}
+    {% if multiple %}
+      </div>
+    {% endif %}
+  </div>
+{% endif %}