Commit f9de6490 authored by David Snopek's avatar David Snopek
Browse files

Issue #3305598: Split the categories and create buttons into separate lists on... 

Issue #3305598: Split the categories and create buttons into separate lists on the "Choose block" dialog to make theming easier
parent e22e5969

modules/panopoly/panopoly_magic/css/panopoly_magic.preview.choose_block_or_layout.css

+4 −4
Original line number Diff line number Diff line
@@ -26,13 +26,13 @@ 
  padding-top: .5em;

}



.panopoly-magic-choose-block ul.panopoly-magic-choose-block-categories,

.panopoly-magic-choose-layout ul.panopoly-magic-choose-layout-categories {

.panopoly-magic-choose-block .panopoly-magic-choose-block-categories,

.panopoly-magic-choose-layout .panopoly-magic-choose-layout-categories {

  margin: 0;

}



.panopoly-magic-choose-block ul.panopoly-magic-choose-block-categories > li,

.panopoly-magic-choose-layout ul.panopoly-magic-choose-layout-categories > li {

.panopoly-magic-choose-block .panopoly-magic-choose-block-categories li,

.panopoly-magic-choose-layout .panopoly-magic-choose-layout-categories li {

  list-style-type: none;

  padding: 0;

  margin: 0;

modules/panopoly/panopoly_magic/src/Controller/LayoutBuilderChooseBlockController.php

+12 −4
Original line number Diff line number Diff line
@@ -148,11 +148,14 @@ class LayoutBuilderChooseBlockController implements ContainerInjectionInterface 
    }



    $block_categories['categories'] = [

      '#theme' => 'item_list',

      '#list_type' => 'ul',

      '#type' => 'container',

      '#attributes' => [

        'class' => ['panopoly-magic-choose-block-categories'],

      ],

    ];

    $block_categories['categories']['categories'] = [

      '#theme' => 'item_list',

      '#list_type' => 'ul',

      '#items' => [],

    ];

    foreach (array_keys($grouped_definitions) as $category) {
@@ -176,12 +179,17 @@ class LayoutBuilderChooseBlockController implements ContainerInjectionInterface 
      if ($current_category === $category) {

        $category_element['#wrapper_attributes']['class'][] = 'panopoly-magic-choose-block-current-category';

      }

      $block_categories['categories']['#items'][] = $category_element;

      $block_categories['categories']['categories']['#items'][] = $category_element;

    }



    if (!empty($custom_blocks)) {

      $block_categories['categories']['custom'] = [

        '#theme' => 'item_list',

        '#list_type' => 'ul',

        '#items' => [],

      ];

      foreach ($custom_blocks as $block_id => $block) {

        $block_categories['categories']['#items'][] = [

        $block_categories['categories']['custom']['#items'][] = [

          '#type' => 'link',

          '#url' => Url::fromRoute('layout_builder.add_block', [

            'section_storage_type' => $section_storage->getStorageType(),