Loading gin_toolbar.module +12 −12 Original line number Diff line number Diff line Loading @@ -8,12 +8,10 @@ use Drupal\Component\Utility\Html; use Drupal\Core\Entity\EntityInterface; use Drupal\Core\Routing\RouteMatchInterface; use Drupal\gin\GinSettings; use Drupal\gin\GinNavigation; use Drupal\gin\GinSettings; use Drupal\gin\GinUserPicture; use Drupal\gin\NavigationSectionManager; use Drupal\gin_toolbar\Render\Element\GinToolbar; use Drupal\Core\Cache\CacheBackendInterface; /** * Implements hook_preprocess_HOOK() for html. Loading Loading @@ -45,16 +43,12 @@ function gin_toolbar_preprocess_html(&$variables) { return; } // Check for new Drupal navigation // Check for new Drupal navigation. if ($toolbar === 'new') { // Activate navigation. // unset($variables['page_top']['toolbar']); // Get navigation items. /** @var \Drupal\gin\GinNavigaton $navigation */ $navigation = \Drupal::classResolver(GinNavigation::class); // Set menus. // Get navigation items. $menu['top']['bookmarks'] = $navigation->getNavigationBookmarksMenuItems(); $menu['middle']['content'] = $navigation->getNavigationContentMenuItems(); $menu['middle']['admin'] = $navigation->getNavigationAdminMenuItems(); Loading Loading @@ -84,7 +78,8 @@ function gin_toolbar_preprocess_html(&$variables) { // Set toolbar class. $variables['attributes']['class'][] = 'gin--navigation'; } else { } else { // Set toolbar class. $variables['attributes']['class'][] = 'gin--' . $toolbar . '-toolbar'; } Loading Loading @@ -419,7 +414,12 @@ function gin_toolbar_theme() { $items['menu_region__middle'] = [ 'base hook' => 'menu', 'variables' => ['menu_name' => NULL, 'items' => [], 'attributes' => [], 'title' => NULL], 'variables' => [ 'menu_name' => NULL, 'items' => [], 'attributes' => [], 'title' => NULL, ], ]; $items['menu_region__top'] = [ Loading Loading
gin_toolbar.module +12 −12 Original line number Diff line number Diff line Loading @@ -8,12 +8,10 @@ use Drupal\Component\Utility\Html; use Drupal\Core\Entity\EntityInterface; use Drupal\Core\Routing\RouteMatchInterface; use Drupal\gin\GinSettings; use Drupal\gin\GinNavigation; use Drupal\gin\GinSettings; use Drupal\gin\GinUserPicture; use Drupal\gin\NavigationSectionManager; use Drupal\gin_toolbar\Render\Element\GinToolbar; use Drupal\Core\Cache\CacheBackendInterface; /** * Implements hook_preprocess_HOOK() for html. Loading Loading @@ -45,16 +43,12 @@ function gin_toolbar_preprocess_html(&$variables) { return; } // Check for new Drupal navigation // Check for new Drupal navigation. if ($toolbar === 'new') { // Activate navigation. // unset($variables['page_top']['toolbar']); // Get navigation items. /** @var \Drupal\gin\GinNavigaton $navigation */ $navigation = \Drupal::classResolver(GinNavigation::class); // Set menus. // Get navigation items. $menu['top']['bookmarks'] = $navigation->getNavigationBookmarksMenuItems(); $menu['middle']['content'] = $navigation->getNavigationContentMenuItems(); $menu['middle']['admin'] = $navigation->getNavigationAdminMenuItems(); Loading Loading @@ -84,7 +78,8 @@ function gin_toolbar_preprocess_html(&$variables) { // Set toolbar class. $variables['attributes']['class'][] = 'gin--navigation'; } else { } else { // Set toolbar class. $variables['attributes']['class'][] = 'gin--' . $toolbar . '-toolbar'; } Loading Loading @@ -419,7 +414,12 @@ function gin_toolbar_theme() { $items['menu_region__middle'] = [ 'base hook' => 'menu', 'variables' => ['menu_name' => NULL, 'items' => [], 'attributes' => [], 'title' => NULL], 'variables' => [ 'menu_name' => NULL, 'items' => [], 'attributes' => [], 'title' => NULL, ], ]; $items['menu_region__top'] = [ Loading