commit 5eac487961da4c86770e45b24850db1c3ad91fd5 Author: Shane Auckland Date: Thu Apr 11 21:01:46 2013 +0100 1898464-new_changes diff --git a/core/modules/toolbar/templates/toolbar-tab-wrapper.html.twig b/core/modules/toolbar/templates/toolbar-tab-wrapper.html.twig index bc68aff..c2407d1 100644 --- a/core/modules/toolbar/templates/toolbar-tab-wrapper.html.twig +++ b/core/modules/toolbar/templates/toolbar-tab-wrapper.html.twig @@ -2,7 +2,8 @@ /** * Default theme implementation for a toolbar tab wrapper. * - * Toolbar tabs have a common styling and placement with the toolbar's bar area. + * Toolbar tabs have a common styling and placement within the toolbar's bar + * area. * * Available variables: * - children: The content of the toolbar tab. diff --git a/core/modules/toolbar/templates/toolbar.html.twig b/core/modules/toolbar/templates/toolbar.html.twig index c5848bf..6da024d 100644 --- a/core/modules/toolbar/templates/toolbar.html.twig +++ b/core/modules/toolbar/templates/toolbar.html.twig @@ -3,7 +3,7 @@ * Default theme implementation for the administrative toolbar. * * Available variables: - * - wrapper_attributes: HTML attributes for the the wrapper. + * - wrapper_attributes: HTML attributes for the wrapper. * - toolbar_attributes: HTML attributes to apply to the toolbar. * - toolbar_heading: The heading or label for the toolbar. * - children: Tabs for the toolbar. diff --git a/core/modules/toolbar/toolbar.module b/core/modules/toolbar/toolbar.module index 2b6d397..c0370c7 100644 --- a/core/modules/toolbar/toolbar.module +++ b/core/modules/toolbar/toolbar.module @@ -251,15 +251,13 @@ function ($object) { /** * Prepares variables for the administration toolbar. + * + * 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. - * - * @see toolbar.html.twig - * - * @ingroup themeable */ function template_preprocess_toolbar(&$variables) { if (!empty($variables['element']['#children'])) { @@ -335,9 +333,11 @@ function toolbar_pre_render_item($element) { } /** - * Prepares variables for toolbar-item.html.twig and variant templates. + * Prepares variables for toolbar item templates. + * + * Prepares the tab portion of the toolbar item, tray portion is rendered later. * - * Prepares the tab portion of the toolbar item. Tray portion is rendered later. + * Default template: toolbar-item.html.twig. * * @param array $variables * An associative array containing: @@ -345,9 +345,6 @@ function toolbar_pre_render_item($element) { * the tray. Property used: tab. * * @see toolbar_pre_render_item() - * @see toolbar-item.html.twig - * - * @ingroup themeable */ function template_preprocess_toolbar_item(&$variables) { $variables['item'] = $variables['element']['tab']; @@ -358,14 +355,12 @@ function template_preprocess_toolbar_item(&$variables) { * * Toolbar tabs have a common styling and placement with the toolbar's bar area. * + * Default template: toolbar-tab-wrapper.html.twig. + * * @param array $variables * An associative array containing: * - element: An associative array containing the properties and children of * the tray. Properties used: #children and #attributes. - * - * @see toolbar-tab-wrapper.html.twig - * - * @ingroup themeable */ function template_preprocess_toolbar_tab_wrapper(&$variables) { $variables['attributes'] = $variables['children'] = NULL; @@ -385,15 +380,13 @@ function template_preprocess_toolbar_tab_wrapper(&$variables) { * Used in combination with template_preprocess_toolbar_tab() to create an * association between a link tag in the administration bar and a tray. * + * Default template: toolbar-tray-wrapper.html.twig. + * * @param array $variables * An associative array containing: * - element: An associative array containing the properties and children of * the tray. Properties used: #children, #toolbar_identifier and * #attributes. - * - * @see toolbar-tray-wrapper.html.twig - * - * @ingroup themeable */ function template_preprocess_toolbar_tray_wrapper(&$variables) { $variables['label'] = $variables['children'] = NULL;