diff --git a/core/includes/theme.inc b/core/includes/theme.inc index 769e34c..09d119b 100644 --- a/core/includes/theme.inc +++ b/core/includes/theme.inc @@ -575,14 +575,16 @@ function template_preprocess_datetime_wrapper(&$variables) { * - url: (optional) The url object to link to. If omitted, no a tag is * printed out. * - attributes: (optional) Attributes for the anchor, or for the - * tag used in its place if no 'href' is supplied. If element 'class' is + * tag used in its place if no 'url' is supplied. If element 'class' is * included, it must be an array of one or more class names. - * If the 'href' element is supplied, the entire link array is passed to - * l() as its $options parameter. + * If the 'url' element is supplied, any elements from the original link + * array, except 'title' and 'url', are being added to the options already + * present in the URL object, and then the resulting URL object is passed + * into \Drupal::linkGenerator()->generate(). * - attributes: A keyed array of attributes for the UL containing the * list of links. * - set_active_class: (optional) Whether each link should compare the - * route_name + route_parameters or href (path), language and query options + * route_name + route_parameters or url (path), language, and query options * to the current URL, to determine whether the link is "active". If so, an * "active" class will be applied to the list item containing the link, as * well as the link itself. It is important to use this sparingly since it diff --git a/core/modules/system/templates/links.html.twig b/core/modules/system/templates/links.html.twig index 86713b5..bbbe924 100644 --- a/core/modules/system/templates/links.html.twig +++ b/core/modules/system/templates/links.html.twig @@ -7,13 +7,15 @@ * - attributes: Attributes for the UL containing the list of links. * - links: Links to be output. * Each link will have the following elements: - * - title: The link text. - * - href: The link URL. If omitted, the 'title' is shown as a plain text - * item in the links list. If 'href' is supplied, the entire link is passed - * to l() as its $options parameter. - * - attributes: (optional) HTML attributes for the anchor, or for the - * tag if no 'href' is supplied. - * - link_key: The link CSS class. + * - text: The link text. + * - url: The link URL. If omitted, the 'text' element is shown as a plain + * text item in the links list. If this element is supplied, any elements + * from the original link array, except 'title' and 'url', are being added + * to the options already present in the URL object, and then the resulting + * URL object is passed into \Drupal::linkGenerator()->generate(). + * - attributes: (optional) HTML attributes for the list item element. + * - text_attributes: (optional) HTML attributes for the span element if no + * 'url' is supplied. * - heading: (optional) A heading to precede the links. * - text: The heading text. * - level: The heading level (e.g. 'h2', 'h3'). diff --git a/core/themes/classy/templates/navigation/links.html.twig b/core/themes/classy/templates/navigation/links.html.twig index f82f41a..181a4f3 100644 --- a/core/themes/classy/templates/navigation/links.html.twig +++ b/core/themes/classy/templates/navigation/links.html.twig @@ -7,13 +7,15 @@ * - attributes: Attributes for the UL containing the list of links. * - links: Links to be output. * Each link will have the following elements: - * - title: The link text. - * - href: The link URL. If omitted, the 'title' is shown as a plain text - * item in the links list. If 'href' is supplied, the entire link is passed - * to l() as its $options parameter. - * - attributes: (optional) HTML attributes for the anchor, or for the - * tag if no 'href' is supplied. - * - link_key: The link CSS class. + * - text: The link text. + * - url: The link URL. If omitted, the 'text' element is shown as a plain + * text item in the links list. If this element is supplied, any elements + * from the original link array, except 'title' and 'url', are being added + * to the options already present in the URL object, and then the resulting + * URL object is passed into \Drupal::linkGenerator()->generate(). + * - attributes: (optional) HTML attributes for the list item element. + * - text_attributes: (optional) HTML attributes for the span element if no + * 'url' is supplied. * - heading: (optional) A heading to precede the links. * - text: The heading text. * - level: The heading level (e.g. 'h2', 'h3'). diff --git a/core/themes/stable/templates/navigation/links.html.twig b/core/themes/stable/templates/navigation/links.html.twig index f82f41a..181a4f3 100644 --- a/core/themes/stable/templates/navigation/links.html.twig +++ b/core/themes/stable/templates/navigation/links.html.twig @@ -7,13 +7,15 @@ * - attributes: Attributes for the UL containing the list of links. * - links: Links to be output. * Each link will have the following elements: - * - title: The link text. - * - href: The link URL. If omitted, the 'title' is shown as a plain text - * item in the links list. If 'href' is supplied, the entire link is passed - * to l() as its $options parameter. - * - attributes: (optional) HTML attributes for the anchor, or for the - * tag if no 'href' is supplied. - * - link_key: The link CSS class. + * - text: The link text. + * - url: The link URL. If omitted, the 'text' element is shown as a plain + * text item in the links list. If this element is supplied, any elements + * from the original link array, except 'title' and 'url', are being added + * to the options already present in the URL object, and then the resulting + * URL object is passed into \Drupal::linkGenerator()->generate(). + * - attributes: (optional) HTML attributes for the list item element. + * - text_attributes: (optional) HTML attributes for the span element if no + * 'url' is supplied. * - heading: (optional) A heading to precede the links. * - text: The heading text. * - level: The heading level (e.g. 'h2', 'h3').