Merge pull request #3495 from jordanpagewhite/RHDX-248--add-to-assemb…

…ly-layout-options [RHDX-248] Update Layout: 2 Column assembly type display
redhat-developer · Feb 7, 2020 · 09ecb42 · 09ecb42
2 parents ef73ce7 + 95d19e1
commit 09ecb42
Show file tree

Hide file tree

Showing 6 changed files with 195 additions and 127 deletions.
diff --git a/.../drupal-filesystem/web/config/sync/assembly.assembly_type.layout_two_col_left_sidebar.yml b/.../drupal-filesystem/web/config/sync/assembly.assembly_type.layout_two_col_left_sidebar.yml
@@ -3,7 +3,7 @@ langcode: en
 status: true
 dependencies: {  }
 id: layout_two_col_left_sidebar
-label: 'Layout: Two Column with Left Sidebar'
-description: ''
-visual_styles: ''
+label: 'Layout: Two Column'
+description: 'This is a layout assembly type that will "wrap" other assemblies to provide various, 2 column layout options.'
+visual_styles: "left-sidebar|Left sidebar|Displays column 1 content in a left sidebar and column 2 spans the remaining space.\r\nright-sidebar|Right sidebar|Displays column 2 content in a right sidebar and column 1 spans the remaining space."
 new_revision: true
diff --git a/...web/config/sync/core.entity_form_display.assembly.layout_two_col_left_sidebar.default.yml b/...web/config/sync/core.entity_form_display.assembly.layout_two_col_left_sidebar.default.yml
@@ -66,12 +66,17 @@ content:
     third_party_settings: {  }
   status:
     type: boolean_checkbox
-    weight: 1
+    weight: 4
     region: content
     settings:
       display_label: true
     third_party_settings: {  }
+  visual_styles:
+    type: options_select
+    weight: 1
+    region: content
+    settings: {  }
+    third_party_settings: {  }
 hidden:
   langcode: true
   user_id: true
-  visual_styles: true
diff --git a/...web/config/sync/core.entity_view_display.assembly.layout_two_col_left_sidebar.default.yml b/...web/config/sync/core.entity_view_display.assembly.layout_two_col_left_sidebar.default.yml
@@ -28,7 +28,7 @@ content:
     third_party_settings:
       fences:
         fences_field_tag: div
-        fences_field_classes: 'pf-l-grid__item pf-m-12-col pf-m-4-col-on-lg pf-m-3-col-on-xl'
+        fences_field_classes: pf-l-grid__item
         fences_field_item_tag: none
         fences_field_item_classes: ''
         fences_label_tag: none
@@ -44,7 +44,7 @@ content:
     third_party_settings:
       fences:
         fences_field_tag: div
-        fences_field_classes: 'pf-l-grid__item pf-m-12-col pf-m-8-col-on-lg pf-m-9-col-on-xl'
+        fences_field_classes: pf-l-grid__item
         fences_field_item_tag: none
         fences_field_item_classes: ''
         fences_label_tag: none

diff --git a/...ystem/web/config/sync/field.field.assembly.layout_two_col_left_sidebar.field_column_1.yml b/...ystem/web/config/sync/field.field.assembly.layout_two_col_left_sidebar.field_column_1.yml
@@ -4,8 +4,17 @@ status: true
 dependencies:
   config:
     - assembly.assembly_type.compact_dynamic_article_list
+    - assembly.assembly_type.content_with_image
+    - assembly.assembly_type.dynamic_content_feed
+    - assembly.assembly_type.events_hero
+    - assembly.assembly_type.hero
     - assembly.assembly_type.layout_two_col_left_sidebar
+    - assembly.assembly_type.product_download_hero
+    - assembly.assembly_type.product_try_it_hero
     - assembly.assembly_type.rich_text
+    - assembly.assembly_type.sign_up_hero
+    - assembly.assembly_type.static_content_band
+    - assembly.assembly_type.video_hero
     - field.storage.assembly.field_column_1
 id: assembly.layout_two_col_left_sidebar.field_column_1
 field_name: field_column_1
@@ -22,7 +31,16 @@ settings:
   handler_settings:
     target_bundles:
       compact_dynamic_article_list: compact_dynamic_article_list
+      static_content_band: static_content_band
+      dynamic_content_feed: dynamic_content_feed
+      events_hero: events_hero
+      hero: hero
+      product_download_hero: product_download_hero
+      product_try_it_hero: product_try_it_hero
       rich_text: rich_text
+      content_with_image: content_with_image
+      sign_up_hero: sign_up_hero
+      video_hero: video_hero
     sort:
       field: _none
     auto_create: false

diff --git a/...ystem/web/config/sync/field.field.assembly.layout_two_col_left_sidebar.field_column_2.yml b/...ystem/web/config/sync/field.field.assembly.layout_two_col_left_sidebar.field_column_2.yml
@@ -3,6 +3,7 @@ langcode: en
 status: true
 dependencies:
   config:
+    - assembly.assembly_type.compact_dynamic_article_list
     - assembly.assembly_type.content_with_image
     - assembly.assembly_type.dynamic_content_feed
     - assembly.assembly_type.events_hero
@@ -29,6 +30,7 @@ settings:
   handler: 'default:assembly'
   handler_settings:
     target_bundles:
+      compact_dynamic_article_list: compact_dynamic_article_list
       static_content_band: static_content_band
       dynamic_content_feed: dynamic_content_feed
       events_hero: events_hero