Commit b24d6ba0 authored by Yogesh Pawar's avatar Yogesh Pawar Committed by Yogesh Pawar
Browse files

Issue #2980245 by James Byng, yogeshmpawar, dmkelner: Doesn't show an asterisk... 

Issue #2980245 by James Byng, yogeshmpawar, dmkelner: Doesn't show an asterisk (*) next to title for required fileds
parent 58ea462a

better_field_descriptions.module

+11 −1
Changes for better_field_descriptions.module: 11 added lines, 1 removed line.
Original line number Diff line number Diff line
@@ -47,7 +47,11 @@ function better_field_descriptions_theme($existing, $type, $theme, $path) { 


  return [

    'better_field_descriptions' => [

      'variables' => ['label' => NULL, 'description' => NULL],

      'variables' => [

        'label' => NULL,

        'description' => NULL,

        'required' => NULL,

      ],

      'template' => $template_file,

      'path' => $template_uri,

    ],
@@ -98,6 +102,9 @@ function better_field_descriptions_field_widget_form_alter(&$element, FormStateI 
      // Default label.

      $default_label = Xss::filter($bfd['default_label']);



      // Apply required symbol if the fields is set as required.

      $required = (isset($element['#required']) && $element['#required']) ? TRUE : FALSE;



      // Set position if configured or set default to #suffix.

      $position = isset($data['position']) ? $positions[$data['position']] : '#suffix';
@@ -126,7 +133,9 @@ function better_field_descriptions_field_widget_form_alter(&$element, FormStateI 


          $element['#title_display'] = 'invisible';

          // In some elements, the title is duplicated and must also be hidden.

          if (isset($element['#title'])) {

            better_field_descriptions_hide_duplicate_titles($element, $element['#title']);

          }

          $position = '#prefix';

          if (isset($element['#type']) && $element['#type'] == 'managed_file' && $position == '#prefix') {

            $position = '#field_prefix';
@@ -137,6 +146,7 @@ function better_field_descriptions_field_widget_form_alter(&$element, FormStateI 
        '#theme' => 'better_field_descriptions',

        '#label' => Xss::filter($label),

        '#description' => Xss::filter($description),

        '#required' => Xss::filter($required),

      ];

      $output = \Drupal::service('renderer')->render($output);

templates/better-field-descriptions-fieldset.html.twig

+7 −1
Changes for templates/better-field-descriptions-fieldset.html.twig: 7 added lines, 1 removed line.
Original line number Diff line number Diff line
@@ -9,6 +9,12 @@ 
 */

#}

<details class="collapsible collapsed form-wrapper better-descriptions">

  <summary class="fieldset-legend">{{ label }}</summary>

  <summary class="fieldset-legend">{{ label }}

    {% if required %}

      <legend>

        <span class="fieldset-legend js-form-required form-required"></span>

      </legend>

    {% endif %}

  </summary>

  <div class="details-wrapper">{{ description }}</div>

</details>

templates/better-field-descriptions-text.html.twig

+7 −1
Changes for templates/better-field-descriptions-text.html.twig: 7 added lines, 1 removed line.
Original line number Diff line number Diff line
@@ -8,5 +8,11 @@ 
 * - {{ description }}: The description itself.

 */

#}

<div class="better-descriptions label">{{ label }}</div>

<div class="better-descriptions label">{{ label }}

  {% if required %}

    <legend>

      <span class="fieldset-legend js-form-required form-required"></span>

    </legend>

  {% endif %}

</div>

<div class="better-descriptions description">{{ description }}</div>