commit 357cd85a0cd2250b39ed13f6e7b3b35e3a5d3ad4 Author: Jen Lampton Date: Sat Mar 2 00:02:54 2013 -0800 rename variables diff --git a/core/modules/toolbar/templates/toolbar-tab-wrapper.html.twig b/core/modules/toolbar/templates/toolbar-tab-wrapper.html.twig index 9cfb8ae..1933a55 100644 --- a/core/modules/toolbar/templates/toolbar-tab-wrapper.html.twig +++ b/core/modules/toolbar/templates/toolbar-tab-wrapper.html.twig @@ -6,7 +6,7 @@ * * Available variables: * - children: The content of the toolbar tab, or NULL if empty. - * - wrapper_attributes: An array of HTML attributes to apply to the wrapper + * - attributes: An array of HTML attributes to apply to the wrapper * or NULL if children is empty. * * @see template_preprocess_toolbar_tab_wrapper() @@ -15,5 +15,5 @@ */ #} {% if children %} - {{ children }} + {{ children }} {% endif %} diff --git a/core/modules/toolbar/templates/toolbar-tray-heading-wrapper.html.twig b/core/modules/toolbar/templates/toolbar-tray-heading-wrapper.html.twig index 08ba5b5..449417e 100644 --- a/core/modules/toolbar/templates/toolbar-tray-heading-wrapper.html.twig +++ b/core/modules/toolbar/templates/toolbar-tray-heading-wrapper.html.twig @@ -3,7 +3,7 @@ * Default theme implementation for a toolbar tray heading wrapper. * * Available variables: - * - heading_label: The toolbar tray heading label, or NULL if empty. + * - label: The toolbar tray heading label, or NULL if empty. * - children: The children of the toolbar tray heading, or NULL if empty. * * @see template_preprocess_toolbar_tray_heading_wrapper() @@ -11,7 +11,7 @@ * @ingroup themeable */ #} -

{{ heading_label }}

+

{{ label }}

{% if children %} {{ children }} {% endif %} diff --git a/core/modules/toolbar/templates/toolbar-tray-wrapper.html.twig b/core/modules/toolbar/templates/toolbar-tray-wrapper.html.twig index 89ac692..1245432 100644 --- a/core/modules/toolbar/templates/toolbar-tray-wrapper.html.twig +++ b/core/modules/toolbar/templates/toolbar-tray-wrapper.html.twig @@ -7,7 +7,7 @@ * * Available variables: * - children: The content of the toolbar tray, or NULL if empty. - * - wrapper_attributes: An array of HTML attributes to apply to the wrapper + * - attributes: An array of HTML attributes to apply to the wrapper * or NULL if children is empty. * * @see template_preprocess_toolbar_tray_wrapper() @@ -17,7 +17,7 @@ #} {% if children %} {% spaceless %} - +
{{ children }}
diff --git a/core/modules/toolbar/toolbar.module b/core/modules/toolbar/toolbar.module index d268bb8..94f8c48 100644 --- a/core/modules/toolbar/toolbar.module +++ b/core/modules/toolbar/toolbar.module @@ -377,13 +377,13 @@ function template_preprocess_toolbar_item(&$variables) { * @ingroup themeable */ function template_preprocess_toolbar_tab_wrapper(&$variables) { - $variables['wrapper_attributes'] = $variables['children'] = NULL; + $variables['attributes'] = $variables['children'] = NULL; if (!empty($variables['element']['#children'])) { if (!isset($variables['element']['#wrapper_attributes'])) { $variables['element']['#wrapper_attributes'] = array(); } $variables['element']['#wrapper_attributes']['class'][] = 'tab'; - $variables['wrapper_attributes'] = new Attribute($variables['element']['#wrapper_attributes']); + $variables['attributes'] = new Attribute($variables['element']['#wrapper_attributes']); $variables['children'] = $variables['element']['#children']; } } @@ -405,10 +405,10 @@ function template_preprocess_toolbar_tab_wrapper(&$variables) { * @ingroup themeable */ function template_preprocess_toolbar_tray_wrapper(&$variables) { - $variables['wrapper_attributes'] = $variables['children'] = NULL; + $variables['attributes'] = $variables['children'] = NULL; if (!empty($variables['element']['#children'])) { $element = $variables['element']; - $variables['wrapper_attributes'] = new Attribute($element['#wrapper_attributes']); + $variables['attributes'] = new Attribute($element['#wrapper_attributes']); $variables['children'] = $element['#children']; } } @@ -426,10 +426,10 @@ function template_preprocess_toolbar_tray_wrapper(&$variables) { * @ingroup themeable */ function template_preprocess_toolbar_tray_heading_wrapper(&$variables) { - $variables['heading_label'] = $variables['children'] = NULL; + $variables['label'] = $variables['children'] = NULL; if (!empty($variables['element']['#children'])) { $element = $variables['element']; - $variables['heading_label'] = $element['#heading']; + $variables['label'] = $element['#heading']; $variables['children'] = $element['#children']; } }