Merge branch 'develop' into monitoring-OPS-9765

UN-OCHA · Dec 21, 2023 · 02effec · 02effec
2 parents 878ab04 + fbafa37
commit 02effec
Show file tree

Hide file tree

Showing 20 changed files with 1,094 additions and 463 deletions.
diff --git a/composer.lock b/composer.lock
diff --git a/composer.patches.json b/composer.patches.json
@@ -17,9 +17,6 @@
         "drupal/entity_browser": {
             "expects parameter 1 to be array": "PATCHES/entity_browser/entity_browser-key-2914385-6.patch"
         },
-        "drupal/features": {
-            "features patch for deprication warning": "PATCHES/features/3375425-deprication-warning-features.patch"
-        },
         "drupal/google_tag": {
             "Error during cache rebuild when assets are stored on NFS": "PATCHES/google_tag/3250315-google-tag-nfs-locks-5.patch"
         },

diff --git a/config/block.block.breadcrumbs_4.yml b/config/block.block.breadcrumbs_4.yml
@@ -3,6 +3,7 @@ langcode: en
 status: true
 dependencies:
   module:
+    - block_class
     - node
     - system
   theme:
@@ -26,3 +27,7 @@ visibility:
       node: '@node.node_route_context:node'
     bundles:
       blog_entry: blog_entry
+  request_path:
+    id: request_path
+    negate: true
+    pages: '/content*'
diff --git a/config/block.block.custombot.yml b/config/block.block.custombot.yml
@@ -0,0 +1,41 @@
+uuid: 9f019cee-c403-4ddb-8923-af200b182c9d
+langcode: en
+status: true
+dependencies:
+  content:
+    - 'block_content:basic:2097942c-6b8b-44f2-82a5-988b4dcc6d97'
+  module:
+    - block_class
+    - block_content
+    - node
+    - system
+  theme:
+    - gms_ocha_common
+id: custombot
+theme: gms_ocha_common
+region: footer_navigation
+weight: 0
+provider: null
+plugin: 'block_content:2097942c-6b8b-44f2-82a5-988b4dcc6d97'
+settings:
+  id: 'block_content:2097942c-6b8b-44f2-82a5-988b4dcc6d97'
+  label: 'Custom Bot'
+  label_display: '0'
+  provider: block_content
+  status: true
+  info: ''
+  view_mode: full
+visibility:
+  request_path:
+    id: request_path
+    negate: true
+    pages: "<front>\r\n/content/gms-blog\r\n/content/contact-information\r\n/content/terms-and-conditions-use\r\n/content/privacy-statement"
+  'entity_bundle:node':
+    id: 'entity_bundle:node'
+    negate: false
+    context_mapping:
+      node: '@node.node_route_context:node'
+    bundles:
+      duel_reference: duel_reference
+      page: page
+      static_page: static_page
diff --git a/config/block.block.pagetitleblog_4.yml b/config/block.block.pagetitleblog_4.yml
@@ -3,7 +3,9 @@ langcode: en
 status: true
 dependencies:
   module:
+    - block_class
     - gms_ocha
+    - node
     - system
   theme:
     - gms_ocha_common
@@ -22,4 +24,12 @@ visibility:
   request_path:
     id: request_path
     negate: true
-    pages: "/content/home\r\n<front>\r\n/content/cerf\r\n/content/cbpf\r\n/content/gms-one"
+    pages: "/content/home\r\n<front>\r\n/content/cerf\r\n/content/cbpf\r\n/content/gms-one\r\n/content/gms-blog"
+  'entity_bundle:node':
+    id: 'entity_bundle:node'
+    negate: false
+    context_mapping:
+      node: '@node.node_route_context:node'
+    bundles:
+      page: page
+      static_page: static_page
diff --git a/config/block.block.resourcecentersupport.yml b/config/block.block.resourcecentersupport.yml
@@ -0,0 +1,31 @@
+uuid: ffa5c0d4-d06b-492f-b304-a7ce7209debd
+langcode: en
+status: true
+dependencies:
+  content:
+    - 'block_content:basic:e4e97808-1028-4931-a55c-c955a5e2d3d5'
+  module:
+    - block_class
+    - block_content
+    - system
+  theme:
+    - gms_ocha_common
+id: resourcecentersupport
+theme: gms_ocha_common
+region: fluid_content
+weight: 0
+provider: null
+plugin: 'block_content:e4e97808-1028-4931-a55c-c955a5e2d3d5'
+settings:
+  id: 'block_content:e4e97808-1028-4931-a55c-c955a5e2d3d5'
+  label: 'Resource Center Support'
+  label_display: '0'
+  provider: block_content
+  status: true
+  info: ''
+  view_mode: full
+visibility:
+  request_path:
+    id: request_path
+    negate: false
+    pages: /content/gms-one
diff --git a/config/block.block.rightsidecerfmenu.yml b/config/block.block.rightsidecerfmenu.yml
@@ -3,7 +3,6 @@ langcode: en
 status: true
 dependencies:
   module:
-    - block_class
     - condition_query
     - gms_ocha
     - node

diff --git a/config/block.block.rightsidemenu.yml b/config/block.block.rightsidemenu.yml
@@ -3,7 +3,6 @@ langcode: en
 status: true
 dependencies:
   module:
-    - block_class
     - condition_query
     - gms_ocha
     - node

diff --git a/config/block.block.views_block__blog_recent_post_block_1_2.yml b/config/block.block.views_block__blog_recent_post_block_1_2.yml
@@ -5,14 +5,15 @@ dependencies:
   config:
     - views.view.blog_recent_post
   module:
+    - block_class
     - node
     - system
     - views
   theme:
     - gms_ocha_common
 id: views_block__blog_recent_post_block_1_2
 theme: gms_ocha_common
-region: sidebar_first
+region: sidebar_second
 weight: -21
 provider: null
 plugin: 'views_block:blog_recent_post-block_1'

diff --git a/config/block.block.views_block__blog_taxonomy_view_block_1.yml b/config/block.block.views_block__blog_taxonomy_view_block_1.yml
@@ -5,6 +5,7 @@ dependencies:
   config:
     - views.view.blog_taxonomy_view
   module:
+    - block_class
     - node
     - system
     - views
@@ -35,4 +36,4 @@ visibility:
   request_path:
     id: request_path
     negate: true
-    pages: "/access-denied\r\n/page-not-found\r\n/content/gms-one"
+    pages: "/access-denied\r\n/page-not-found\r\n/content/gms-one\r\n/content/gms-blog\r\n/content*"
diff --git a/config/block.block.views_block__blog_taxonomy_view_block_2.yml b/config/block.block.views_block__blog_taxonomy_view_block_2.yml
@@ -5,6 +5,7 @@ dependencies:
   config:
     - views.view.blog_taxonomy_view
   module:
+    - block_class
     - node
     - system
     - views
@@ -35,4 +36,4 @@ visibility:
   request_path:
     id: request_path
     negate: true
-    pages: "/access-denied\r\n/page-not-found\r\n/content/gms-one"
+    pages: "/access-denied\r\n/page-not-found\r\n/content/gms-one\r\n/content/gms-blog\r\n/content*"
diff --git a/config/block.block.views_block__blog_view_blog_listing_block.yml b/config/block.block.views_block__blog_view_blog_listing_block.yml
@@ -5,6 +5,7 @@ dependencies:
   config:
     - views.view.blog_view
   module:
+    - block_class
     - system
     - views
   theme:
@@ -17,10 +18,10 @@ provider: null
 plugin: 'views_block:blog_view-blog_listing_block'
 settings:
   id: 'views_block:blog_view-blog_listing_block'
-  label: ''
-  label_display: '0'
+  label: 'Featured Posts'
+  label_display: visible
   provider: views
-  views_label: ''
+  views_label: 'Featured Posts'
   items_per_page: none
 visibility:
   request_path:

diff --git a/config/editor.editor.full_html.yml b/config/editor.editor.full_html.yml
@@ -48,10 +48,10 @@ settings:
   plugins:
     ckeditor5_alignment:
       enabled_alignments:
-        - left
         - center
-        - right
         - justify
+        - left
+        - right
     ckeditor5_codeBlock:
       languages:
         -

diff --git a/config/page_specific_class.settings.yml b/config/page_specific_class.settings.yml
@@ -1,3 +1,3 @@
 _core:
   default_config_hash: WKPJoaS0nZiIboNwD58sBSpxmtib3XbeyMWgbExqsnE
-url_with_class: "/content/gms-one|onegms-home-pg\r\n/content/cbpf|cbpf-section\r\n/content/cerf|cerf-section\r\n/glossary/*|glossary-pg\r\n/searchpage|search-pg"
+url_with_class: "/content/gms-one|onegms-home-pg\r\n/content/cbpf|cbpf-section\r\n/content/cerf|cerf-section\r\n/glossary/*|glossary-pg\r\n/searchpage|search-pg\r\n/content/gms-one|onegms-support-pg"
diff --git a/config/views.view.blog_recent_post.yml b/config/views.view.blog_recent_post.yml
@@ -34,8 +34,8 @@ display:
           label: ''
           exclude: false
           alter:
-            alter_text: false
-            text: ''
+            alter_text: true
+            text: '<img alt="Blog" data-entity-type="file" src="../../themes/custom/gms_ocha_common/img/blog-icon.png"> {{ title }}'
             make_link: false
             path: ''
             absolute: false
@@ -64,7 +64,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