armansansd 3 years ago
parent
commit
a7e799de0d
30 changed files with 914 additions and 65 deletions
  1. 2 2
      config/sync/block.block.head.yml
  2. 40 0
      config/sync/block.block.head_2.yml
  3. 34 0
      config/sync/block.block.logosfooter.yml
  4. 40 0
      config/sync/block.block.pieddepage.yml
  5. 2 2
      config/sync/block.block.views_block__programmes_block_2.yml
  6. 6 6
      config/sync/block.block.views_block__programmes_block_2_2.yml
  7. 2 2
      config/sync/block.block.views_block__programmes_block_3.yml
  8. 33 0
      config/sync/block.block.views_block__programmes_block_3_2.yml
  9. 7 1
      config/sync/core.menu.static_menu_link_overrides.yml
  10. 1 1
      config/sync/field.field.node.programme.field_fichier.yml
  11. 29 5
      config/sync/page_manager.page_variant.home-panels_variant-0.yml
  12. 12 0
      config/sync/page_manager.page_variant.home-panels_variant-1.yml
  13. 76 15
      config/sync/structure_sync.data.yml
  14. 66 0
      config/sync/views.view.content.yml
  15. 259 0
      config/sync/views.view.home_themes.yml
  16. 173 4
      config/sync/views.view.programmes.yml
  17. 14 4
      config/sync/views.view.villes.yml
  18. 6 4
      config/sync/views.view.villes_map.yml
  19. 3 0
      web/sites/development.services.yml
  20. 28 8
      web/themes/custom/popsu/css/styles.css
  21. 0 0
      web/themes/custom/popsu/css/styles.css.map
  22. BIN
      web/themes/custom/popsu/images/popsu-home-logo.png
  23. 0 0
      web/themes/custom/popsu/js/main.js
  24. 10 1
      web/themes/custom/popsu/lib/script.js
  25. 2 4
      web/themes/custom/popsu/partials/header.html.twig
  26. 1 1
      web/themes/custom/popsu/popsu.info.yml
  27. 17 1
      web/themes/custom/popsu/popsu.theme
  28. 43 3
      web/themes/custom/popsu/sass/setup/_globals.scss
  29. 1 1
      web/themes/custom/popsu/templates/blocks/block--menu-block.html.twig
  30. 7 0
      web/themes/custom/popsu/templates/regions/region--header-top-right.html.twig

+ 2 - 2
config/sync/block.block.head.yml

@@ -1,6 +1,6 @@
 uuid: 6eac2aee-ee11-439c-9c6b-62058216adb7
 langcode: fr
-status: true
+status: false
 dependencies:
   config:
     - system.menu.head
@@ -11,7 +11,7 @@ dependencies:
     - popsu
 id: head
 theme: popsu
-region: header_top_rigth
+region: header_top_left
 weight: -3
 provider: null
 plugin: 'menu_block:head'

+ 40 - 0
config/sync/block.block.head_2.yml

@@ -0,0 +1,40 @@
+uuid: 63cb2144-dcbb-4ca3-9a29-10038c11f840
+langcode: fr
+status: true
+dependencies:
+  config:
+    - system.menu.head
+  module:
+    - context
+    - menu_block
+  theme:
+    - popsu
+id: head_2
+theme: popsu
+region: header_top_right
+weight: 0
+provider: null
+plugin: 'menu_block:head'
+settings:
+  id: 'menu_block:head'
+  label: Head
+  provider: menu_block
+  label_display: '0'
+  follow: false
+  follow_parent: child
+  level: 1
+  depth: 0
+  expand_all_items: false
+  parent: 'head:'
+  suggestion: head
+  label_type: block
+  label_link: false
+visibility:
+  view_inclusion:
+    id: view_inclusion
+    negate: null
+    view_inclusion: {  }
+  request_path_exclusion:
+    id: request_path_exclusion
+    pages: ''
+    negate: null

+ 34 - 0
config/sync/block.block.logosfooter.yml

@@ -0,0 +1,34 @@
+uuid: 9d86f6b2-fe7b-4558-84c5-9aef6ac0a291
+langcode: fr
+status: true
+dependencies:
+  content:
+    - 'block_content:custom:d61049b4-1d02-41f9-b590-07d2488190a6'
+  module:
+    - block_content
+    - context
+  theme:
+    - popsu
+id: logosfooter
+theme: popsu
+region: footer_bottom_left
+weight: 0
+provider: null
+plugin: 'block_content:d61049b4-1d02-41f9-b590-07d2488190a6'
+settings:
+  id: 'block_content:d61049b4-1d02-41f9-b590-07d2488190a6'
+  label: 'Logos footer'
+  provider: block_content
+  label_display: '0'
+  status: true
+  info: ''
+  view_mode: full
+visibility:
+  view_inclusion:
+    id: view_inclusion
+    negate: null
+    view_inclusion: {  }
+  request_path_exclusion:
+    id: request_path_exclusion
+    pages: ''
+    negate: null

+ 40 - 0
config/sync/block.block.pieddepage.yml

@@ -0,0 +1,40 @@
+uuid: 7ae59ba3-e16a-43df-8b39-e6eaa6e92de8
+langcode: fr
+status: true
+dependencies:
+  config:
+    - system.menu.footer
+  module:
+    - context
+    - menu_block
+  theme:
+    - popsu
+id: pieddepage
+theme: popsu
+region: footer_bottom_middle
+weight: 0
+provider: null
+plugin: 'menu_block:footer'
+settings:
+  id: 'menu_block:footer'
+  label: 'Pied de page'
+  provider: menu_block
+  label_display: '0'
+  follow: false
+  follow_parent: child
+  level: 1
+  depth: 0
+  expand_all_items: false
+  parent: 'footer:'
+  suggestion: footer
+  label_type: block
+  label_link: false
+visibility:
+  view_inclusion:
+    id: view_inclusion
+    negate: null
+    view_inclusion: {  }
+  request_path_exclusion:
+    id: request_path_exclusion
+    pages: ''
+    negate: null

+ 2 - 2
config/sync/block.block.views_block__programmes_block_2.yml

@@ -1,6 +1,6 @@
 uuid: d6ba8f39-2444-4730-9ecd-bbe0e6b0d8de
 langcode: fr
-status: true
+status: false
 dependencies:
   config:
     - views.view.programmes
@@ -11,7 +11,7 @@ dependencies:
     - popsu
 id: views_block__programmes_block_2
 theme: popsu
-region: header_top_rigth
+region: header_top_left
 weight: -2
 provider: null
 plugin: 'views_block:programmes-block_2'

+ 6 - 6
config/sync/block.block.views_block__footer_block_1.yml → config/sync/block.block.views_block__programmes_block_2_2.yml

@@ -1,22 +1,22 @@
-uuid: b67846aa-2ab2-484b-97cd-cbea7824ff53
+uuid: 64500a3f-9b35-4547-a1d5-3a03011fec86
 langcode: fr
 status: true
 dependencies:
   config:
-    - views.view.footer
+    - views.view.programmes
   module:
     - context
     - views
   theme:
     - popsu
-id: views_block__footer_block_1
+id: views_block__programmes_block_2_2
 theme: popsu
-region: footer_bottom_middle
+region: header_top_right
 weight: 0
 provider: null
-plugin: 'views_block:footer-block_1'
+plugin: 'views_block:programmes-block_2'
 settings:
-  id: 'views_block:footer-block_1'
+  id: 'views_block:programmes-block_2'
   label: ''
   provider: views
   label_display: visible

+ 2 - 2
config/sync/block.block.views_block__programmes_block_3.yml

@@ -1,6 +1,6 @@
 uuid: 5f5de85d-0e73-486e-8b4e-f524a258b647
 langcode: fr
-status: true
+status: false
 dependencies:
   config:
     - views.view.programmes
@@ -11,7 +11,7 @@ dependencies:
     - popsu
 id: views_block__programmes_block_3
 theme: popsu
-region: header_top_rigth
+region: header_top_left
 weight: -1
 provider: null
 plugin: 'views_block:programmes-block_3'

+ 33 - 0
config/sync/block.block.views_block__programmes_block_3_2.yml

@@ -0,0 +1,33 @@
+uuid: b0d6ad7c-1b39-4272-bb1c-c528bc6a0495
+langcode: fr
+status: true
+dependencies:
+  config:
+    - views.view.programmes
+  module:
+    - context
+    - views
+  theme:
+    - popsu
+id: views_block__programmes_block_3_2
+theme: popsu
+region: header_top_right
+weight: 0
+provider: null
+plugin: 'views_block:programmes-block_3'
+settings:
+  id: 'views_block:programmes-block_3'
+  label: ''
+  provider: views
+  label_display: visible
+  views_label: ''
+  items_per_page: none
+visibility:
+  view_inclusion:
+    id: view_inclusion
+    negate: null
+    view_inclusion: {  }
+  request_path_exclusion:
+    id: request_path_exclusion
+    pages: ''
+    negate: null

+ 7 - 1
config/sync/core.menu.static_menu_link_overrides.yml

@@ -1,4 +1,10 @@
-definitions: {  }
+definitions:
+  contact__site_page:
+    weight: -46
+    menu_name: footer
+    parent: ''
+    enabled: true
+    expanded: false
 _core:
   default_config_hash: jdY7AU0tU-QsjmiOw3W8vwpYMb-By--_MSFgbqKUTYM
 langcode: fr

+ 1 - 1
config/sync/field.field.node.programme.field_fichier.yml

@@ -19,7 +19,7 @@ default_value: {  }
 default_value_callback: ''
 settings:
   file_directory: '[date:custom:Y]-[date:custom:m]'
-  file_extensions: 'txt pdf doc docx obs'
+  file_extensions: 'txt pdf doc docx obs png jpg'
   max_filesize: ''
   description_field: true
   handler: 'default:file'

+ 29 - 5
config/sync/page_manager.page_variant.home-panels_variant-0.yml

@@ -5,6 +5,8 @@ dependencies:
   config:
     - page_manager.page.home
     - views.view.home_blocks
+    - views.view.home_themes
+    - views.view.programmes
     - views.view.villes
   module:
     - panels
@@ -22,7 +24,7 @@ variant_settings:
       views_label: ''
       items_per_page: none
       region: content
-      weight: -1
+      weight: -2
       uuid: e5f452c9-14a6-49a2-b5ab-028e1246ec29
       context_mapping: {  }
     c460a8dc-20aa-4d12-8382-48d03a96eae3:
@@ -33,7 +35,7 @@ variant_settings:
       views_label: ''
       items_per_page: none
       region: content
-      weight: 0
+      weight: -1
       uuid: c460a8dc-20aa-4d12-8382-48d03a96eae3
       context_mapping: {  }
     323f250e-52aa-455a-be5b-82737e7558a4:
@@ -44,20 +46,42 @@ variant_settings:
       views_label: ''
       items_per_page: none
       region: content
-      weight: 2
+      weight: 3
       uuid: 323f250e-52aa-455a-be5b-82737e7558a4
       context_mapping: {  }
     4535e216-697e-4f0e-922b-9f49f755001c:
       id: 'views_block:villes-block_1'
       label: ''
       provider: views
-      label_display: visible
+      label_display: '0'
       views_label: ''
       items_per_page: none
       region: content
-      weight: 1
+      weight: 0
       uuid: 4535e216-697e-4f0e-922b-9f49f755001c
       context_mapping: {  }
+    02736330-658c-4ab2-8bdb-bd164841a070:
+      id: 'views_block:home_themes-block_1'
+      label: ''
+      provider: views
+      label_display: '0'
+      views_label: ''
+      items_per_page: none
+      region: content
+      weight: 1
+      uuid: 02736330-658c-4ab2-8bdb-bd164841a070
+      context_mapping: {  }
+    04cbbff9-0519-47e7-8eba-9376abe616ef:
+      id: 'views_block:programmes-block_4'
+      label: ''
+      provider: views
+      label_display: '0'
+      views_label: ''
+      items_per_page: none
+      region: content
+      weight: 2
+      uuid: 04cbbff9-0519-47e7-8eba-9376abe616ef
+      context_mapping: {  }
   id: panels_variant
   uuid: 3093fbf1-47e3-46ba-9bf2-84a715779a13
   label: null

+ 12 - 0
config/sync/page_manager.page_variant.home-panels_variant-1.yml

@@ -5,6 +5,7 @@ dependencies:
   config:
     - page_manager.page.home
     - views.view.home_blocks
+    - views.view.home_themes
     - views.view.villes_map
   module:
     - panels
@@ -58,6 +59,17 @@ variant_settings:
       weight: 0
       uuid: d0cd9c9e-c467-4ca1-899b-cfea07f2036d
       context_mapping: {  }
+    9ed6afe1-e1c4-49ca-b072-72fe5cd42571:
+      id: 'views_block:home_themes-block_1'
+      label: ''
+      provider: views
+      label_display: visible
+      views_label: ''
+      items_per_page: none
+      region: content
+      weight: 0
+      uuid: 9ed6afe1-e1c4-49ca-b072-72fe5cd42571
+      context_mapping: {  }
   id: panels_variant
   uuid: 97a77f17-da25-4ab7-9698-ca27f74a36bc
   label: null

+ 76 - 15
config/sync/structure_sync.data.yml

@@ -1,4 +1,80 @@
+log: 1
+blocks:
+  -
+    info: 'Logos footer'
+    langcode: fr
+    uuid: d61049b4-1d02-41f9-b590-07d2488190a6
+    bundle: custom
+    revision_id: null
+    rev_id_current: null
+    fields:
+      body:
+        -
+          value: "<a href=\"#\" class=\"logo-gouv\">logo gouv</a>\r\n<a href=\"#\" class=\"logo-puca\">logo puca</a>"
+          summary: ''
+          format: wysiwyg
+  -
+    info: 'Retrouvez-nous sur les réseaux sociaux :'
+    langcode: fr
+    uuid: e0c66a5a-bc7a-4f4a-b6f1-7bec4b77ad78
+    bundle: custom
+    revision_id: null
+    rev_id_current: null
+    fields:
+      body:
+        -
+          value: "<p><a href=\"https://twitter.com\">https://twitter.com</a></p>\r\n\r\n<p><a href=\"https://fr.linkedin.com/\">https://fr.linkedin.com/</a></p>\r\n\r\n<p><a href=\"https://youtube.fr\">https://youtube.fr</a></p>\r\n"
+          summary: ''
+          format: wysiwyg
 menus:
+  -
+    menu_name: footer
+    title: Accueil
+    parent: null
+    uri: 'internal:/'
+    link_title: ''
+    description: null
+    enabled: '1'
+    expanded: '0'
+    weight: '-50'
+    langcode: fr
+    uuid: 39680dd3-ea89-403e-8cee-8d08a0e5fbb1
+  -
+    menu_name: footer
+    title: 'Qu''est-ce popsu?'
+    parent: null
+    uri: 'internal:/node/215'
+    link_title: ''
+    description: null
+    enabled: '1'
+    expanded: '0'
+    weight: '-49'
+    langcode: fr
+    uuid: 7adf411e-dd23-402e-9cd6-a66e6acac295
+  -
+    menu_name: footer
+    title: Gouvernance
+    parent: null
+    uri: 'internal:/node/218'
+    link_title: ''
+    description: null
+    enabled: '1'
+    expanded: '0'
+    weight: '-48'
+    langcode: fr
+    uuid: c5f90586-8537-4a7a-826e-46bf9a20b81a
+  -
+    menu_name: footer
+    title: 'L''équipe'
+    parent: null
+    uri: 'internal:/node/657'
+    link_title: ''
+    description: null
+    enabled: '1'
+    expanded: '0'
+    weight: '-47'
+    langcode: fr
+    uuid: 998f9dd2-c0c7-4e82-9953-e5a36da046a1
   -
     menu_name: head
     title: 'Qu''est-ce popsu?'
@@ -47,18 +123,3 @@ menus:
     weight: '0'
     langcode: fr
     uuid: 7249712f-fe65-40d3-a8ee-8047420bc88a
-log: 1
-blocks:
-  -
-    info: 'Retrouvez-nous sur les réseaux sociaux :'
-    langcode: fr
-    uuid: e0c66a5a-bc7a-4f4a-b6f1-7bec4b77ad78
-    bundle: custom
-    revision_id: null
-    rev_id_current: null
-    fields:
-      body:
-        -
-          value: "<p><a href=\"https://twitter.com\">https://twitter.com</a></p>\r\n\r\n<p><a href=\"https://fr.linkedin.com/\">https://fr.linkedin.com/</a></p>\r\n\r\n<p><a href=\"https://youtube.fr\">https://youtube.fr</a></p>\r\n"
-          summary: ''
-          format: wysiwyg

+ 66 - 0
config/sync/views.view.content.yml

@@ -218,6 +218,70 @@ display:
           hide_alter_empty: true
           plugin_id: node_bulk_form
           entity_type: node
+        field_diaporama:
+          id: field_diaporama
+          table: node__field_diaporama
+          field: field_diaporama
+          relationship: none
+          group_type: group
+          admin_label: ''
+          label: Diaporama
+          exclude: false
+          alter:
+            alter_text: false
+            text: ''
+            make_link: false
+            path: ''
+            absolute: false
+            external: false
+            replace_spaces: false
+            path_case: none
+            trim_whitespace: false
+            alt: ''
+            rel: ''
+            link_class: ''
+            prefix: ''
+            suffix: ''
+            target: ''
+            nl2br: false
+            max_length: 0
+            word_boundary: true
+            ellipsis: true
+            more_link: false
+            more_link_text: ''
+            more_link_path: ''
+            strip_tags: false
+            trim: false
+            preserve_tags: ''
+            html: false
+          element_type: ''
+          element_class: ''
+          element_label_type: ''
+          element_label_class: ''
+          element_label_colon: true
+          element_wrapper_type: ''
+          element_wrapper_class: ''
+          element_default_classes: true
+          empty: ''
+          hide_empty: false
+          empty_zero: false
+          hide_alter_empty: true
+          click_sort_column: target_id
+          type: image
+          settings:
+            image_style: thumbnail
+            image_link: content
+          group_column: ''
+          group_columns: {  }
+          group_rows: true
+          delta_limit: 1
+          delta_offset: 0
+          delta_reversed: false
+          delta_first_last: false
+          multi_type: separator
+          separator: ', '
+          field_api_classes: false
+          plugin_id: field
         title:
           id: title
           table: node_field_data
@@ -658,6 +722,7 @@ display:
       max-age: 0
       tags:
         - 'config:field.storage.node.field_actif'
+        - 'config:field.storage.node.field_diaporama'
   page_1:
     display_options:
       path: admin/content/programme
@@ -893,6 +958,7 @@ display:
       max-age: 0
       tags:
         - 'config:field.storage.node.field_actif'
+        - 'config:field.storage.node.field_diaporama'
   page_2:
     display_options:
       path: admin/content/themes

+ 259 - 0
config/sync/views.view.home_themes.yml

@@ -0,0 +1,259 @@
+uuid: ec928185-216e-489c-ab54-6e65c7c6bc09
+langcode: fr
+status: true
+dependencies:
+  config:
+    - field.storage.node.field_image
+    - image.style.medium
+    - node.type.theme
+  module:
+    - image
+    - node
+    - user
+id: home_themes
+label: 'home themes'
+module: views
+description: ''
+tag: ''
+base_table: node_field_data
+base_field: nid
+display:
+  default:
+    display_plugin: default
+    id: default
+    display_title: Master
+    position: 0
+    display_options:
+      access:
+        type: perm
+        options:
+          perm: 'access content'
+      cache:
+        type: tag
+        options: {  }
+      query:
+        type: views_query
+        options:
+          disable_sql_rewrite: false
+          distinct: false
+          replica: false
+          query_comment: ''
+          query_tags: {  }
+      exposed_form:
+        type: basic
+        options:
+          submit_button: Apply
+          reset_button: false
+          reset_button_label: Reset
+          exposed_sorts_label: 'Sort by'
+          expose_sort_order: true
+          sort_asc_label: Asc
+          sort_desc_label: Desc
+      pager:
+        type: none
+        options:
+          items_per_page: 0
+          offset: 0
+      style:
+        type: default
+      row:
+        type: fields
+      fields:
+        title:
+          id: title
+          table: node_field_data
+          field: title
+          entity_type: node
+          entity_field: title
+          label: ''
+          alter:
+            alter_text: false
+            make_link: false
+            absolute: false
+            trim: false
+            word_boundary: false
+            ellipsis: false
+            strip_tags: false
+            html: false
+          hide_empty: false
+          empty_zero: false
+          settings:
+            link_to_entity: true
+          plugin_id: field
+          relationship: none
+          group_type: group
+          admin_label: ''
+          exclude: false
+          element_type: ''
+          element_class: ''
+          element_label_type: ''
+          element_label_class: ''
+          element_label_colon: true
+          element_wrapper_type: ''
+          element_wrapper_class: ''
+          element_default_classes: true
+          empty: ''
+          hide_alter_empty: true
+          click_sort_column: value
+          type: string
+          group_column: value
+          group_columns: {  }
+          group_rows: true
+          delta_limit: 0
+          delta_offset: 0
+          delta_reversed: false
+          delta_first_last: false
+          multi_type: separator
+          separator: ', '
+          field_api_classes: false
+        field_image:
+          id: field_image
+          table: node__field_image
+          field: field_image
+          relationship: none
+          group_type: group
+          admin_label: ''
+          label: ''
+          exclude: false
+          alter:
+            alter_text: false
+            text: ''
+            make_link: false
+            path: ''
+            absolute: false
+            external: false
+            replace_spaces: false
+            path_case: none
+            trim_whitespace: false
+            alt: ''
+            rel: ''
+            link_class: ''
+            prefix: ''
+            suffix: ''
+            target: ''
+            nl2br: false
+            max_length: 0
+            word_boundary: true
+            ellipsis: true
+            more_link: false
+            more_link_text: ''
+            more_link_path: ''
+            strip_tags: false
+            trim: false
+            preserve_tags: ''
+            html: false
+          element_type: ''
+          element_class: ''
+          element_label_type: ''
+          element_label_class: ''
+          element_label_colon: false
+          element_wrapper_type: ''
+          element_wrapper_class: ''
+          element_default_classes: true
+          empty: ''
+          hide_empty: false
+          empty_zero: false
+          hide_alter_empty: true
+          click_sort_column: target_id
+          type: image
+          settings:
+            image_style: medium
+            image_link: content
+          group_column: ''
+          group_columns: {  }
+          group_rows: true
+          delta_limit: 0
+          delta_offset: 0
+          delta_reversed: false
+          delta_first_last: false
+          multi_type: separator
+          separator: ', '
+          field_api_classes: false
+          plugin_id: field
+      filters:
+        status:
+          value: '1'
+          table: node_field_data
+          field: status
+          plugin_id: boolean
+          entity_type: node
+          entity_field: status
+          id: status
+          expose:
+            operator: ''
+            operator_limit_selection: false
+            operator_list: {  }
+          group: 1
+        type:
+          id: type
+          table: node_field_data
+          field: type
+          value:
+            theme: theme
+          entity_type: node
+          entity_field: type
+          plugin_id: bundle
+          expose:
+            operator_limit_selection: false
+            operator_list: {  }
+      sorts:
+        created:
+          id: created
+          table: node_field_data
+          field: created
+          order: DESC
+          entity_type: node
+          entity_field: created
+          plugin_id: date
+          relationship: none
+          group_type: group
+          admin_label: ''
+          exposed: false
+          expose:
+            label: ''
+          granularity: second
+      title: 'home themes'
+      header:
+        result:
+          id: result
+          table: views
+          field: result
+          relationship: none
+          group_type: group
+          admin_label: ''
+          empty: false
+          content: '@total thèmes abordés'
+          plugin_id: result
+      footer: {  }
+      empty: {  }
+      relationships: {  }
+      arguments: {  }
+      display_extenders: {  }
+    cache_metadata:
+      max-age: -1
+      contexts:
+        - 'languages:language_content'
+        - 'languages:language_interface'
+        - 'user.node_grants:view'
+        - user.permissions
+      tags:
+        - 'config:field.storage.node.field_image'
+  block_1:
+    display_plugin: block
+    id: block_1
+    display_title: 'Block home themes'
+    position: 1
+    display_options:
+      display_extenders:
+        views_ef_fieldset: {  }
+      display_description: ''
+      block_category: 'Home (Views)'
+    cache_metadata:
+      max-age: -1
+      contexts:
+        - 'languages:language_content'
+        - 'languages:language_interface'
+        - 'user.node_grants:view'
+        - user.permissions
+      tags:
+        - 'config:field.storage.node.field_image'

+ 173 - 4
config/sync/views.view.programmes.yml

@@ -3,8 +3,11 @@ langcode: fr
 status: true
 dependencies:
   config:
+    - field.storage.node.field_diaporama
+    - image.style.medium
     - node.type.programme
   module:
+    - image
     - node
     - user
 id: programmes
@@ -60,9 +63,6 @@ display:
           id: title
           table: node_field_data
           field: title
-          settings:
-            link_to_entity: true
-          plugin_id: field
           relationship: none
           group_type: group
           admin_label: ''
@@ -99,7 +99,7 @@ display:
           element_class: ''
           element_label_type: ''
           element_label_class: ''
-          element_label_colon: true
+          element_label_colon: false
           element_wrapper_type: ''
           element_wrapper_class: ''
           element_default_classes: true
@@ -109,6 +109,8 @@ display:
           hide_alter_empty: true
           click_sort_column: value
           type: string
+          settings:
+            link_to_entity: true
           group_column: value
           group_columns: {  }
           group_rows: true
@@ -119,6 +121,7 @@ display:
           multi_type: separator
           separator: ', '
           field_api_classes: false
+          plugin_id: field
       filters:
         status:
           value: '1'
@@ -220,6 +223,7 @@ display:
       display_extenders:
         views_ef_fieldset: {  }
       display_description: ''
+      block_category: 'Nav (Views)'
     cache_metadata:
       max-age: -1
       contexts:
@@ -240,6 +244,7 @@ display:
       title: 'Nos Programmes en cours'
       defaults:
         title: false
+      block_category: 'Nav (Views)'
     cache_metadata:
       max-age: -1
       contexts:
@@ -330,6 +335,7 @@ display:
         groups:
           1: AND
       title: 'Nos Programmes précédents'
+      block_category: 'Nav (Views)'
     cache_metadata:
       max-age: -1
       contexts:
@@ -338,3 +344,166 @@ display:
         - 'user.node_grants:view'
         - user.permissions
       tags: {  }
+  block_4:
+    display_plugin: block
+    id: block_4
+    display_title: 'Block Home Progs actifs'
+    position: 1
+    display_options:
+      display_extenders:
+        views_ef_fieldset: {  }
+      display_description: ''
+      title: 'Programmes actifs'
+      defaults:
+        title: false
+        header: false
+        fields: false
+      block_category: 'home (Views)'
+      header:
+        result:
+          id: result
+          table: views
+          field: result
+          relationship: none
+          group_type: group
+          admin_label: ''
+          empty: false
+          content: '@total programmes actifs'
+          plugin_id: result
+      fields:
+        title:
+          id: title
+          table: node_field_data
+          field: title
+          relationship: none
+          group_type: group
+          admin_label: ''
+          label: ''
+          exclude: false
+          alter:
+            alter_text: false
+            text: ''
+            make_link: false
+            path: ''
+            absolute: false
+            external: false
+            replace_spaces: false
+            path_case: none
+            trim_whitespace: false
+            alt: ''
+            rel: ''
+            link_class: ''
+            prefix: ''
+            suffix: ''
+            target: ''
+            nl2br: false
+            max_length: 0
+            word_boundary: true
+            ellipsis: true
+            more_link: false
+            more_link_text: ''
+            more_link_path: ''
+            strip_tags: false
+            trim: false
+            preserve_tags: ''
+            html: false
+          element_type: ''
+          element_class: ''
+          element_label_type: ''
+          element_label_class: ''
+          element_label_colon: false
+          element_wrapper_type: ''
+          element_wrapper_class: ''
+          element_default_classes: true
+          empty: ''
+          hide_empty: false
+          empty_zero: false
+          hide_alter_empty: true
+          click_sort_column: value
+          type: string
+          settings:
+            link_to_entity: true
+          group_column: value
+          group_columns: {  }
+          group_rows: true
+          delta_limit: 0
+          delta_offset: 0
+          delta_reversed: false
+          delta_first_last: false
+          multi_type: separator
+          separator: ', '
+          field_api_classes: false
+          plugin_id: field
+        field_diaporama:
+          id: field_diaporama
+          table: node__field_diaporama
+          field: field_diaporama
+          relationship: none
+          group_type: group
+          admin_label: ''
+          label: ''
+          exclude: false
+          alter:
+            alter_text: false
+            text: ''
+            make_link: false
+            path: ''
+            absolute: false
+            external: false
+            replace_spaces: false
+            path_case: none
+            trim_whitespace: false
+            alt: ''
+            rel: ''
+            link_class: ''
+            prefix: ''
+            suffix: ''
+            target: ''
+            nl2br: false
+            max_length: 0
+            word_boundary: true
+            ellipsis: true
+            more_link: false
+            more_link_text: ''
+            more_link_path: ''
+            strip_tags: false
+            trim: false
+            preserve_tags: ''
+            html: false
+          element_type: ''
+          element_class: ''
+          element_label_type: ''
+          element_label_class: ''
+          element_label_colon: false
+          element_wrapper_type: ''
+          element_wrapper_class: ''
+          element_default_classes: true
+          empty: ''
+          hide_empty: false
+          empty_zero: false
+          hide_alter_empty: true
+          click_sort_column: target_id
+          type: image
+          settings:
+            image_style: medium
+            image_link: content
+          group_column: ''
+          group_columns: {  }
+          group_rows: true
+          delta_limit: 1
+          delta_offset: 0
+          delta_reversed: false
+          delta_first_last: false
+          multi_type: separator
+          separator: ', '
+          field_api_classes: false
+          plugin_id: field
+    cache_metadata:
+      max-age: -1
+      contexts:
+        - 'languages:language_content'
+        - 'languages:language_interface'
+        - 'user.node_grants:view'
+        - user.permissions
+      tags:
+        - 'config:field.storage.node.field_diaporama'

+ 14 - 4
config/sync/views.view.villes.yml

@@ -67,7 +67,7 @@ display:
           height: '600'
           height_unit: px
           hide_empty_map: false
-          disable_wheel: false
+          disable_wheel: true
           fullscreen_control: true
           gesture_handling: false
           reset_map:
@@ -267,8 +267,18 @@ display:
             operator_limit_selection: false
             operator_list: {  }
       sorts: {  }
-      title: Villes
-      header: {  }
+      title: 'Territoires étudiés'
+      header:
+        result:
+          id: result
+          table: views
+          field: result
+          relationship: none
+          group_type: group
+          admin_label: ''
+          empty: false
+          content: '@total territoires étudiés'
+          plugin_id: result
       footer: {  }
       empty: {  }
       relationships: {  }
@@ -290,7 +300,7 @@ display:
     display_options:
       display_extenders:
         views_ef_fieldset: {  }
-      block_category: 'Villes (views)'
+      block_category: 'Home (Views)'
       display_description: ''
       block_description: map-villes
     cache_metadata:

+ 6 - 4
config/sync/views.view.villes_map.yml

@@ -82,8 +82,8 @@ display:
           height: '400'
           height_unit: px
           hide_empty_map: false
-          disable_wheel: false
-          fullscreen_control: true
+          disable_wheel: true
+          fullscreen_control: false
           gesture_handling: false
           reset_map:
             control: false
@@ -523,8 +523,8 @@ display:
           relationship: none
           group_type: group
           admin_label: ''
-          empty: false
-          content: 'Affichage de @start à @end sur @total'
+          empty: true
+          content: '@total territoires étudiés'
           plugin_id: result
       footer: {  }
       empty: {  }
@@ -551,6 +551,7 @@ display:
       display_extenders:
         views_ef_fieldset: {  }
       group_by: false
+      title: 'Territoires étudiés'
     cache_metadata:
       max-age: -1
       contexts:
@@ -571,6 +572,7 @@ display:
       display_extenders:
         views_ef_fieldset: {  }
       display_description: ''
+      block_category: 'Home (Views)'
     cache_metadata:
       max-age: -1
       contexts:

+ 3 - 0
web/sites/development.services.yml

@@ -4,6 +4,9 @@
 # 'example.settings.local.php' file, which sits next to this file.
 parameters:
   http.response.debug_cacheability_headers: true
+  twig.config:
+    debug: true
+    cache: false
 services:
   cache.backend.null:
     class: Drupal\Core\Cache\NullBackendFactory

+ 28 - 8
web/themes/custom/popsu/css/styles.css

@@ -1162,30 +1162,50 @@ main h2 {
 a {
   color: inherit; }
 
-#header-top-right .header_top_rigth_container {
+.close-block, .open-block {
+  background: red;
+  cursor: pointer; }
+
+.header_top_left_container {
+  height: 3rem; }
+  .header_top_left_container #block-identitedusite {
+    height: 100%; }
+    .header_top_left_container #block-identitedusite a[rel~='home'] {
+      height: 100%;
+      display: block;
+      color: transparent;
+      background: left/contain no-repeat url(../images/popsu-home-logo.png); }
+
+.header_top_middle_container {
+  background: red; }
+  .header_top_middle_container .views-row {
+    display: inline-block;
+    width: auto; }
+
+#header-top-right .header_top_right_container {
   position: absolute;
   top: 0;
   left: 0;
   width: 100%;
   background: #a1a1a1;
-  display: grid;
+  display: none;
   grid-template-columns: 5% 30% 30% 30% 5%;
   padding: 1rem 0;
   z-index: 100;
   line-height: 2; }
-  #header-top-right .header_top_rigth_container nav {
+  #header-top-right .header_top_right_container nav {
     grid-column-start: 2; }
-  #header-top-right .header_top_rigth_container a {
+  #header-top-right .header_top_right_container a {
     text-decoration: none;
     font-weight: 400; }
-    #header-top-right .header_top_rigth_container a:hover {
+    #header-top-right .header_top_right_container a:hover {
       text-decoration: underline; }
-  #header-top-right .header_top_rigth_container h2 {
+  #header-top-right .header_top_right_container h2 {
     font-weight: 100;
     margin-bottom: .3rem; }
-  #header-top-right .header_top_rigth_container .is-active {
+  #header-top-right .header_top_right_container .is-active {
     font-weight: 800; }
-  #header-top-right .header_top_rigth_container #block-views-block-programmes-block-2 .views-row {
+  #header-top-right .header_top_right_container #block-views-block-programmes-block-2-2 .views-row {
     width: 100%; }
 
 footer * {

File diff suppressed because it is too large
+ 0 - 0
web/themes/custom/popsu/css/styles.css.map


BIN
web/themes/custom/popsu/images/popsu-home-logo.png


File diff suppressed because it is too large
+ 0 - 0
web/themes/custom/popsu/js/main.js


+ 10 - 1
web/themes/custom/popsu/lib/script.js

@@ -4,5 +4,14 @@ $(function(){
 	console.log("$ ready !!");
 	$('.last-news').slick();
 	$('.last-ressources').slick();
+
+	$('.close-block').click(function(){
+		$(this).parent().fadeOut();
+	});
+	$('.open-block').click(function(){
+		$(this).prev().fadeIn();
+	});
+
 	
-});
+});
+

+ 2 - 4
web/themes/custom/popsu/partials/header.html.twig

@@ -1,5 +1,5 @@
 <header role="banner" class="columns small-12">
-    <section id="header-top" class="row">
+    <section id="header-top" class="row align-middle">
       <div id="header-top-left" class="columns small-2">
         {{ page.header_top_left }}
       </div>
@@ -7,9 +7,7 @@
         {{ page.header_top_middle }}
       </div>
       <div id="header-top-right" class="columns small-1">
-        <div class="button_burger">
-        </div>
-        {{ page.header_top_rigth }}
+        {{ page.header_top_right }}
       </div>
     </section>
     <section id="header-bottom">

+ 1 - 1
web/themes/custom/popsu/popsu.info.yml

@@ -13,7 +13,7 @@ libraries:
 regions:
   header_top_left: 'Header top left'
   header_top_middle: 'Header top middle'
-  header_top_rigth: 'Header top right'
+  header_top_right: 'Header top right'
   header_bottom: 'Header Bottom'
   help: Help
   page_top: 'Page top'

+ 17 - 1
web/themes/custom/popsu/popsu.theme

@@ -6,6 +6,13 @@
 
 use Drupal\Core\Template\Attribute;
 
+/* implements template_preprocess_views_view() */
+
+// function popsu_preprocess_views_view(&$vars) {
+//   $view = $vars['view'];
+//   kint($view);die();
+// }
+
 
 /* implements template_preprocess_views_view_unformatted() */
 
@@ -43,4 +50,13 @@ function popsu_preprocess_region(&$variables) {
     $variables['attributes']['class'][] = $variables['region'].'_container';
     
   }
-}
+}
+
+
+// function popsu_theme_suggestions_views_view_alter(array &$suggestions, array $variables) {
+//   $elem = $variables;
+//   //$suggestions[] = 'views_view__headerView';
+//     /*if($variables['elements']['#id'] == 'customsearchform'){
+//         $suggestions[] = 'block__custom_search_form';
+//     }*/
+// }

+ 43 - 3
web/themes/custom/popsu/sass/setup/_globals.scss

@@ -14,15 +14,55 @@ main{
 a{
 	color:inherit;
 }
+.close-block, .open-block{
+	background: red;
+	cursor:pointer;
+}
+
 //header
+
+.header_top_left_container{
+	height: 3rem;
+	#block-identitedusite{
+		height: 100%;
+		// max-height: 5rem;
+		a[rel~='home']{
+			height: 100%;
+			display: block;
+			color: transparent;
+			background: left / contain no-repeat url(../images/popsu-home-logo.png);
+		}
+		
+	}
+}
+
+.header_top_middle_container{
+	background: red;
+
+
+	// div{
+	// 	div{
+	// 		div:first-child{
+	// 			display: grid;
+	// 			grid-template-columns: repeat(3, 1fr);
+	// 		}
+	// 	}
+	// }
+	//how to access the view js id
+	.views-row{
+		display: inline-block;
+		width: auto;
+	}
+}
+
 #header-top-right{
-	.header_top_rigth_container{
+	.header_top_right_container{
 		position: absolute;
 		top: 0;
 		left: 0;
 		width: 100%;
 		background: rgb(161, 161, 161);
-		display: grid;
+		display: none;
 		grid-template-columns: 5% 30% 30% 30% 5%;
 		padding: 1rem 0;
 		z-index: 100;
@@ -45,7 +85,7 @@ a{
 		.is-active{
 			font-weight: 800;
 		}
-		#block-views-block-programmes-block-2{
+		#block-views-block-programmes-block-2-2{
 			.views-row{
 				width: 100%;
 			}

+ 1 - 1
web/themes/custom/popsu/templates/blocks/block--menu-block.html.twig

@@ -48,4 +48,4 @@
   {% block content %}
     {{ content }}
   {% endblock %}
-</nav>
+</nav>

+ 7 - 0
web/themes/custom/popsu/templates/regions/region--header-top-rigth.html.twig → web/themes/custom/popsu/templates/regions/region--header-top-right.html.twig

@@ -17,5 +17,12 @@
 {% if content %}
   <div{{ attributes }}>
     {{ content }}
+    <div class="close-block" >
+      close
+    </div>
   </div>
+  <div class="open-block" >
+      open
+  </div>
+    
 {% endif %}

Some files were not shown because too many files changed in this diff