diff --git a/core/modules/contextual/contextual.module b/core/modules/contextual/contextual.module index 10d57b1..03cd17e 100644 --- a/core/modules/contextual/contextual.module +++ b/core/modules/contextual/contextual.module @@ -28,6 +28,7 @@ function contextual_toolbar() { } $tab['contextual'] = array( + '#type' => 'toolbar_item', 'tab' => array( '#type' => 'html_tag', '#tag' => 'button', @@ -38,7 +39,6 @@ function contextual_toolbar() { 'aria-pressed' => 'false', ), ), - '#theme_wrappers' => array('toolbar_tab_wrapper'), '#wrapper_attributes' => array( 'class' => array('hidden', 'contextual-toolbar-tab'), ), diff --git a/core/modules/toolbar/templates/toolbar.html.twig b/core/modules/toolbar/templates/toolbar.html.twig new file mode 100644 index 0000000..728cec6 --- /dev/null +++ b/core/modules/toolbar/templates/toolbar.html.twig @@ -0,0 +1,38 @@ +{# +/** + * Default theme implementation for the administrative toolbar. + * + * Available variables: + * - attributes: HTML attributes for the wrapper. + * - toolbar_attributes: HTML attributes to apply to the toolbar. + * - toolbar_heading: The heading or label for the toolbar. + * - tabs: List of tabs for the toolbar. + * - attributes: HTML Attributes for the tab container. + * - link: Link or button for the menu tab. + * - trays: Toolbar trays, each associated with a tab. + * + * @see template_preprocess_toolbar() + * + * @ingroup themeable + */ +#} + diff --git a/core/modules/toolbar/toolbar.module b/core/modules/toolbar/toolbar.module index 845ea9e..39b441f 100644 --- a/core/modules/toolbar/toolbar.module +++ b/core/modules/toolbar/toolbar.module @@ -45,19 +45,12 @@ function toolbar_permission() { function toolbar_theme($existing, $type, $theme, $path) { $items['toolbar'] = array( 'render element' => 'element', + 'template' => 'toolbar', ); $items['toolbar_item'] = array( 'render element' => 'element', ); - $items['toolbar_tab_wrapper'] = array( - 'render element' => 'element', - ); - $items['toolbar_tray_wrapper'] = array( - 'render element' => 'element', - ); - $items['toolbar_tray_heading_wrapper'] = array( - 'render element' => 'element', - ); + return $items; } @@ -94,13 +87,10 @@ function toolbar_element_info() { ); // A toolbar item is wrapped in markup for common styling. The 'tray' - // property contains a renderable array. theme_toolbar_tab() is a light - // wrapper around the l() function. The contents of tray are rendered in - // theme_toolbar_tab(). + // property contains a renderable array. $elements['toolbar_item'] = array( '#pre_render' => array('toolbar_pre_render_item'), '#theme' => 'toolbar_item', - '#theme_wrappers' => array('toolbar_tab_wrapper'), 'tab' => array( '#type' => 'link', '#title' => NULL, @@ -215,24 +205,53 @@ function ($object) { } /** - * Returns HTML that wraps the administration toolbar. + * Prepares variables for administration toolbar templates. + * + * Default template: toolbar.html.twig. * * @param array $variables * An associative array containing: * - element: An associative array containing the properties and children of * the tray. Properties used: #children, #attributes and #bar. */ -function theme_toolbar(&$variables) { - if (!empty($variables['element']['#children'])) { - $element = $variables['element']; - $trays = ''; - foreach (element_children($element) as $key) { - $trays .= drupal_render($element[$key]['tray']); +function template_preprocess_toolbar(&$variables) { + $element = $variables['element']; + + // Prepare the toolbar attributes. + $variables['attributes'] = $element['#attributes']; + $variables['toolbar_attributes'] = new Attribute($element['#bar']['#attributes']); + $variables['toolbar_heading'] = $element['#bar']['#heading']; + + // Prepare the trays and tabs for each toolbar item. + $variables['trays'] = array(); + $variables['tabs'] = array(); + foreach (element_children($element) as $key) { + // Add the tray. + if (isset($element[$key]['tray'])) { + $variables['trays'][$key] = array( + 'links' => $element[$key]['tray'], + 'attributes' => new Attribute($element[$key]['tray']['#wrapper_attributes']), + ); + if (array_key_exists('#heading', $element[$key]['tray'])) { + $variables['trays'][$key]['label'] = $element[$key]['tray']['#heading']; + } + unset($element[$key]['tray']); + } + + // Pass the wrapper attributes along. + if (array_key_exists('#wrapper_attributes', $element[$key])) { + $element[$key]['#wrapper_attributes']['class'][] = 'toolbar-tab'; + $attributes = $element[$key]['#wrapper_attributes']; + } + else { + $attributes = array('class' => array('toolbar-tab')); } - return ''; + + // Add the tab. + $variables['tabs'][$key] = array( + 'link' => $element[$key]['tab'], + 'attributes' => new Attribute($attributes), + ); } } @@ -284,103 +303,12 @@ function toolbar_pre_render_item($element) { } $element['tray']['#wrapper_attributes'] += $attributes; $element['tray']['#wrapper_attributes']['class'][] = 'toolbar-tray'; - - if (!isset($element['tray']['#theme_wrappers'])) { - $element['tray']['#theme_wrappers'] = array(); - } - // Add the standard theme_wrapper for trays. - array_unshift($element['tray']['#theme_wrappers'], 'toolbar_tray_wrapper'); - // Add the theme wrapper for the tray heading. - array_unshift($element['tray']['#theme_wrappers'], 'toolbar_tray_heading_wrapper'); } return $element; } /** - * Implements template_preprocess_HOOK(). - */ -function template_preprocess_toolbar_tab_wrapper(&$variables) { - if (!isset($variables['element']['#wrapper_attributes'])) { - $variables['element']['#wrapper_attributes'] = array(); - } - $variables['element']['#wrapper_attributes']['class'][] = 'toolbar-tab'; -} - -/** - * Returns HTML for a toolbar item. - * - * This theme function only renders the tab portion of the toolbar item. The - * tray portion will be rendered later. - * - * @param array $variables - * An associative array containing: - * - element: An associative array containing the properties and children of - * the tray. Property used: tab. - * - * @see toolbar_pre_render_item(). - * @see theme_toolbar(). - */ -function theme_toolbar_item(&$variables) { - return drupal_render($variables['element']['tab']); -} - -/** - * Returns HTML for wrapping a toolbar tab. - * - * Toolbar tabs have a common styling and placement with the toolbar's bar area. - * - * @param array $variables - * An associative array containing: - * - element: An associative array containing the properties and children of - * the tray. Properties used: #children and #attributes. - */ -function theme_toolbar_tab_wrapper(&$variables) { - if (!empty($variables['element']['#children'])) { - $element = $variables['element']; - return '