diff --git a/forms/DatetimeField.php b/forms/DatetimeField.php index 52b4c258e..10a5775c4 100644 --- a/forms/DatetimeField.php +++ b/forms/DatetimeField.php @@ -87,7 +87,7 @@ class DatetimeField extends FormField { public function Field($properties = array()) { Requirements::css(FRAMEWORK_DIR . '/css/DatetimeField.css'); - + $tzField = ($this->getConfig('usertimezone')) ? $this->timezoneField->FieldHolder() : ''; return $this->dateField->FieldHolder() . $this->timeField->FieldHolder() . @@ -236,6 +236,15 @@ class DatetimeField extends FormField { public function getLocale() { return $this->dateField->getLocale(); } + + public function setDescription($description) { + parent::setDescription($description); + + $this->dateField->setDescription($description); + $this->timeField->setDescription($description); + + return $this; + } /** * Note: Use {@link getDateField()} and {@link getTimeField()} diff --git a/forms/PhoneNumberField.php b/forms/PhoneNumberField.php index 93c138bfb..c698e8047 100644 --- a/forms/PhoneNumberField.php +++ b/forms/PhoneNumberField.php @@ -54,6 +54,9 @@ class PhoneNumberField extends FormField { $field->push(new NumericField( $this->name.'[Extension]', 'ext', $extension, 6)); } + $description = $this->getDescription(); + if($description) $fields->getChildren()->First()->setDescription($description); + foreach($fields as $field) { $field->setDisabled($this->isDisabled()); $field->setReadonly($this->isReadonly());