commit 56007080d3a62e2b095f5c5a20ec62fdc144dfdb Author: Joel Pittet Date: Mon Mar 18 22:21:54 2013 -0700 toolbar-twig-1898464-17 diff --git a/core/modules/toolbar/templates/toolbar-item.html.twig b/core/modules/toolbar/templates/toolbar-item.html.twig index 9557f8f..f38f9f6 100644 --- a/core/modules/toolbar/templates/toolbar-item.html.twig +++ b/core/modules/toolbar/templates/toolbar-item.html.twig @@ -3,8 +3,9 @@ * Default theme implementation for a toolbar item (tab). * * Available variables: - * - item: The content of the toolbar tab, or NULL if empty. + * - item: The content of the toolbar tab. * + * @see template_preprocess() * @see template_preprocess_toolbar_item() * * @ingroup themeable diff --git a/core/modules/toolbar/templates/toolbar-tab-wrapper.html.twig b/core/modules/toolbar/templates/toolbar-tab-wrapper.html.twig index 1933a55..bc68aff 100644 --- a/core/modules/toolbar/templates/toolbar-tab-wrapper.html.twig +++ b/core/modules/toolbar/templates/toolbar-tab-wrapper.html.twig @@ -5,10 +5,10 @@ * Toolbar tabs have a common styling and placement with the toolbar's bar area. * * Available variables: - * - children: The content of the toolbar tab, or NULL if empty. - * - attributes: An array of HTML attributes to apply to the wrapper - * or NULL if children is empty. + * - children: The content of the toolbar tab. + * - attributes: HTML attributes to apply to the wrapper. * + * @see template_preprocess() * @see template_preprocess_toolbar_tab_wrapper() * * @ingroup themeable diff --git a/core/modules/toolbar/templates/toolbar-tray-wrapper.html.twig b/core/modules/toolbar/templates/toolbar-tray-wrapper.html.twig index 35b76d3..ddcf7a2 100644 --- a/core/modules/toolbar/templates/toolbar-tray-wrapper.html.twig +++ b/core/modules/toolbar/templates/toolbar-tray-wrapper.html.twig @@ -3,14 +3,11 @@ * Default theme implementation for a toolbar tray wrapper. * * Available variables: - * - item: The content of the toolbar tab, or NULL if empty. - * - * Available variables: - * - label: The toolbar tray heading label, or NULL if empty. - * - children: The content of the toolbar tray, or NULL if empty. - * - attributes: An array of HTML attributes to apply to the wrapper - * or NULL if children is empty. + * - label: The toolbar tray heading label. + * - children: The content of the toolbar tray. + * - attributes: HTML attributes to apply to the wrapper. * + * @see template_preprocess() * @see template_preprocess_toolbar_tray_wrapper() * * @ingroup themeable @@ -21,10 +18,10 @@
{% if label %} -

{{ label }}

+

{{ label }}

{% endif %} {{ children }}
{% endspaceless %} -{% endif %} \ No newline at end of file +{% endif %} diff --git a/core/modules/toolbar/templates/toolbar.html.twig b/core/modules/toolbar/templates/toolbar.html.twig index e10d861..c5848bf 100644 --- a/core/modules/toolbar/templates/toolbar.html.twig +++ b/core/modules/toolbar/templates/toolbar.html.twig @@ -3,12 +3,13 @@ * Default theme implementation for the administrative toolbar. * * Available variables: - * - wrapper_attributes: An array of HTML attributes to apply to the wrapper. - * - toolbar_attributes: An array of HTML attributes to apply to the toolbar. + * - wrapper_attributes: HTML attributes for the the wrapper. + * - toolbar_attributes: HTML attributes to apply to the toolbar. * - toolbar_heading: The heading or label for the toolbar. - * - children: An array of renderable items (tabs) for the toolbar. - * - trays: An array of renderable toolbar trays, each associated with a tab. + * - children: Tabs for the toolbar. + * - trays: Toolbar trays, each associated with a tab. * + * @see template_preprocess() * @see template_preprocess_toolbar() * * @ingroup themeable