Merge branch '8.x-1.x' into 2.0.x

src/Element/BootstrapDateTime.php

@@ -101,10 +101,14 @@ class BootstrapDateTime extends FormElement {
     $element['#attributes']['class'] = ['form-control'];
 
     // Prefix and Suffix.
-    $element['#prefix'] = "<div class=" . $element['#wrapper_class'] . ">
-    <div class='row'>
-        <div class=" . $element['#column_size_class'] . ">";
-    $element['#suffix'] = "</div></div></div>";
+    if (!isset($element['#prefix'])) {
+      $element['#prefix'] = "<div class=" . $element['#wrapper_class'] . ">
+      <div class='row'>
+          <div class=" . $element['#column_size_class'] . ">";
+    }
+    if (!isset($element['#suffix'])) {
+      $element['#suffix'] = "</div></div></div>";
+    }
 
     // Attach library.
     $complete_form['#attached']['library'][] = 'bootstrap_datetime_picker/datetimepicker';

src/Plugin/Field/FieldWidget/BootstrapDateTimeWidget.php

@@ -292,6 +292,7 @@ class BootstrapDateTimeWidget extends DateTimeWidgetBase {
     $element['value']['#allow_times'] = $this->getSetting('allow_times');
     $element['value']['#disable_days'] = $this->getSetting('disable_days');
     $element['value']['#exclude_date'] = $this->getSetting('exclude_date');
+    $element['value']['#description'] = $this->getFilteredDescription();
     return $element;
   }