commit fcf34d678dae0aa106744223e0200bf319ad5977 Author: Jen Lampton Date: Sun Jul 21 15:36:26 2013 -0700 removed toolbar-item.html.twig diff --git a/core/modules/toolbar/templates/toolbar-item.html.twig b/core/modules/toolbar/templates/toolbar-item.html.twig deleted file mode 100644 index 9ac988a..0000000 --- a/core/modules/toolbar/templates/toolbar-item.html.twig +++ /dev/null @@ -1,13 +0,0 @@ -{# -/** - * Default theme implementation for a toolbar item (tab). - * - * Available variables: - * - item: The content of the toolbar tab. - * - * @see template_preprocess_toolbar_item() - * - * @ingroup themeable - */ -#} -{{ item }} diff --git a/core/modules/toolbar/templates/toolbar.html.twig b/core/modules/toolbar/templates/toolbar.html.twig index d48144a..0e48a40 100644 --- a/core/modules/toolbar/templates/toolbar.html.twig +++ b/core/modules/toolbar/templates/toolbar.html.twig @@ -16,14 +16,12 @@ * @ingroup themeable */ #} -{% if children %} - - -

{{ toolbar_heading }}

- {% for tab in tabs %} -
{{ tab.link }}
- {% endfor %} - - {{ trays }} - -{% endif %} + + +

{{ toolbar_heading }}

+ {% for tab in tabs %} +
{{ tab.link }}
+ {% endfor %} + + {{ trays }} + diff --git a/core/modules/toolbar/toolbar.module b/core/modules/toolbar/toolbar.module index 51db39e..3a855b2 100644 --- a/core/modules/toolbar/toolbar.module +++ b/core/modules/toolbar/toolbar.module @@ -229,8 +229,6 @@ function template_preprocess_toolbar(&$variables) { $variables['toolbar_attributes'] = new Attribute($element['#bar']['#attributes']); $variables['toolbar_heading'] = $element['#bar']['#heading']; - $variables['children'] = $element['#children']; - // Prepaare the trays and tabs for each toolbar item. $variables['trays'] = array(); $variables['tabs'] = array(); @@ -258,10 +256,6 @@ function template_preprocess_toolbar(&$variables) { } } -function theme_toolbar_item(&$variables) { - return drupal_render($variables['element']['tab']); -} - /** * Provides markup for associating a tray trigger with a tray element. * @@ -319,26 +313,6 @@ function toolbar_pre_render_item($element) { } /** - * Prepares variables for toolbar item templates. - * - * Default template: toolbar-item.html.twig. - * - * This template 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 template_preprocess_toolbar_item(&$variables) { - $variables['item'] = $variables['element']['tab']; -} - -/** * Prepares variables for toolbar tray wrapper templates. * * Default template: toolbar-tray-wrapper.html.twig.