Verified Commit d48ba57b authored by Andrei Mateescu's avatar Andrei Mateescu
Browse files

task: #3584303 Rename Gin variables and form element names 

By: quietone
By: smustgrave
By: poker10
(cherry picked from commit a50f2889)
parent 5b744138

core/themes/default_admin/migration/css/layout/top_bar.css

+1 −1
Original line number Diff line number Diff line
@@ -154,7 +154,7 @@ 
  }

}



body:has(.gin--navigation-top-bar .gin-sticky-form-actions) :where(#gin_sidebar) {

body:has(.gin--navigation-top-bar .gin-sticky-form-actions) :where(#default_admin_sidebar) {

  inset-block-start: 4rem !important;

  height: calc(100% - 4rem) !important;

}

core/themes/default_admin/migration/css/layout/top_bar.pcss.css

+1 −1
Original line number Diff line number Diff line
@@ -144,7 +144,7 @@ 
  }

}



body:has(.gin--navigation-top-bar .gin-sticky-form-actions) :where(#gin_sidebar) {

body:has(.gin--navigation-top-bar .gin-sticky-form-actions) :where(#default_admin_sidebar) {

  inset-block-start: 64px !important;

  height: calc(100% - 64px) !important;

}

core/themes/default_admin/migration/js/sidebar.js

+2 −2
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ 
  const storageDesktop = 'Drupal.gin.sidebarExpanded.desktop';

  const storageWidth = "Drupal.gin.sidebarWidth";

  const reSizer = document.getElementById('gin-sidebar-draggable');

  const resizable = document.getElementById('gin_sidebar');

  const resizable = document.getElementById('default_admin_sidebar');

  let isResizing = false;

  let startX, startWidth;
@@ -19,7 +19,7 @@ 


  Drupal.ginSidebar = {

    init: function (context) {

      once('ginSidebarInit', '#gin_sidebar', context).forEach(() => {

      once('ginSidebarInit', '#default_admin_sidebar', context).forEach(() => {

        // If variable does not exist, create it, default being to show sidebar.

        if (!localStorage.getItem(storageDesktop)) {

          localStorage.setItem(storageDesktop, 'true');

core/themes/default_admin/src/Hook/FormHooks.php

+14 −14
Original line number Diff line number Diff line
@@ -639,7 +639,7 @@ public function stickyActionButtonsAndSidebar(array &$form, FormStateInterface $ 
    // sticky action container for the top bar.

    if (isset($form['actions']) && (self::useStickyActionButtons($is_content_form) || $is_content_form)) {

      // Sticky action container.

      $form['gin_sticky_actions'] = [

      $form['default_admin_sticky_actions'] = [

        '#type' => 'container',

        '#weight' => -1,

        '#multilingual' => TRUE,
@@ -665,7 +665,7 @@ public function stickyActionButtonsAndSidebar(array &$form, FormStateInterface $ 
      $form['#attributes']['class'][] = 'gin--has-sticky-form-actions';



      // Assign status to gin_actions.

      $form['gin_sticky_actions']['status'] = [

      $form['default_admin_sticky_actions']['status'] = [

        '#type' => 'container',

        '#weight' => -1,

        '#multilingual' => TRUE,
@@ -688,7 +688,7 @@ public function stickyActionButtonsAndSidebar(array &$form, FormStateInterface $ 
      }



      // Helper item to move focus to sticky header.

      $form['gin_move_focus_to_sticky_bar'] = [

      $form['default_admin_move_focus_to_sticky_bar'] = [

        '#markup' => '<a href="#" class="visually-hidden" role="button" gin-move-focus-to-sticky-bar>Moves focus to sticky header actions</a>',

        '#weight' => 999,

      ];
@@ -719,14 +719,14 @@ public function stickyActionButtonsAndSidebar(array &$form, FormStateInterface $ 


    // Add sidebar toggle.

    $hide_panel = $this->t('Hide sidebar panel');

    $form['gin_sticky_actions']['gin_sidebar_toggle'] = [

      '#markup' => '<a href="#toggle-sidebar" class="meta-sidebar__trigger trigger" role="button" title="' . $hide_panel . '" aria-controls="gin_sidebar"><span class="visually-hidden">' . $hide_panel . '</span></a>',

    $form['default_admin_sticky_actions']['default_admin_sidebar_toggle'] = [

      '#markup' => '<a href="#toggle-sidebar" class="meta-sidebar__trigger trigger" role="button" title="' . $hide_panel . '" aria-controls="default_admin_sidebar"><span class="visually-hidden">' . $hide_panel . '</span></a>',

      '#weight' => 1000,

    ];

    $form['#attached']['library'][] = 'default_admin/sidebar';



    // Create gin_sidebar group.

    $form['gin_sidebar'] = [

    // Create default_admin_sidebar group.

    $form['default_admin_sidebar'] = [

      '#group' => 'meta',

      '#type' => 'container',

      '#weight' => 99,
@@ -738,15 +738,15 @@ public function stickyActionButtonsAndSidebar(array &$form, FormStateInterface $ 
      ],

    ];

    // Copy footer over.

    $form['gin_sidebar']['footer'] = ($form['footer']) ?? [];

    $form['default_admin_sidebar']['footer'] = ($form['footer']) ?? [];



    // Sidebar close button.

    $close_sidebar_translation = $this->t('Close sidebar panel');

    $form['gin_sidebar']['gin_sidebar_close'] = [

    $form['default_admin_sidebar']['default_admin_sidebar_close'] = [

      '#markup' => '<a href="#close-sidebar" class="meta-sidebar__close trigger" role="button" title="' . $close_sidebar_translation . '"><span class="visually-hidden">' . $close_sidebar_translation . '</span></a>',

    ];



    $form['gin_sidebar_overlay'] = [

    $form['default_admin_sidebar_overlay'] = [

      '#markup' => '<div class="meta-sidebar__overlay trigger"></div>',

    ];
@@ -816,7 +816,7 @@ public static function formAfterBuild(array $form): array { 


        $navigation_enabled = \Drupal::service('module_handler')->moduleExists('navigation');

        if ($navigation_enabled) {

          $form['gin_sticky_actions']['actions'][$key] = $button;

          $form['default_admin_sticky_actions']['actions'][$key] = $button;

        }



        // The media_type_add_form form is a special case.
@@ -831,14 +831,14 @@ public static function formAfterBuild(array $form): array { 


          // Add the button to the form actions array.

          if (!empty($button['#gin_action_item']) || $navigation_enabled || in_array($key, $includes, TRUE)) {

            $form['gin_sticky_actions']['actions'][$key] = $button;

            $form['default_admin_sticky_actions']['actions'][$key] = $button;

          }

        }

      }

    }



    Helper::formActions($form['gin_sticky_actions'] ?? NULL);

    unset($form['gin_sticky_actions']);

    Helper::formActions($form['default_admin_sticky_actions'] ?? NULL);

    unset($form['default_admin_sticky_actions']);



    return $form;

  }

core/themes/default_admin/src/Hook/PreprocessHooks.php

+7 −7
Original line number Diff line number Diff line
@@ -1024,12 +1024,12 @@ public function preprocessPage(array &$variables): void { 
    // Get form actions.

    if ($form_actions = Helper::formActions()) {

      if ($this->moduleHandler->moduleExists('navigation')) {

        $variables['gin_form_actions'] = '';

        $variables['default_admin_form_actions'] = '';

      }

      else {

        $variables['gin_form_actions'] = $form_actions;

        $variables['default_admin_form_actions'] = $form_actions;

      }

      $variables['gin_form_actions_class'] = 'gin-sticky-form-actions--preprocessed';

      $variables['default_admin_form_actions_class'] = 'gin-sticky-form-actions--preprocessed';

    }

  }
@@ -1311,20 +1311,20 @@ public function preprocessTopBar(array &$variables): void { 
    // Get local actions.

    $plugin_block = $this->blockManager->createInstance('local_actions_block', []);

    $block_content = $plugin_block->build();

    $variables['gin_local_actions'] = $this->renderer->render($block_content);

    $variables['default_admin_local_actions'] = $this->renderer->render($block_content);

    $variables['#attached']['library'][] = 'default_admin/top_bar';



    // Get form actions.

    if ($form_actions = Helper::formActions()) {

      $variables['gin_form_actions'] = $form_actions;

      $variables['gin_form_actions_class'] = 'gin-sticky-form-actions--preprocessed';

      $variables['default_admin_form_actions'] = $form_actions;

      $variables['default_admin_form_actions_class'] = 'gin-sticky-form-actions--preprocessed';

      $variables['#attached']['library'][] = 'default_admin/top_bar';

    }



    // Get breadcrumb.

    $plugin_block = $this->blockManager->createInstance('system_breadcrumb_block', []);

    $block_content = $plugin_block->build();

    $variables['gin_breadcrumbs'] = $this->renderer->render($block_content);

    $variables['default_admin_breadcrumbs'] = $this->renderer->render($block_content);

    $variables['#attached']['library'][] = 'default_admin/top_bar';

  }