Commit df6c448f authored by Carsten  Rose's avatar Carsten Rose
Browse files

#3773 / Button: Info / Unlock / ShowPassword

Fixed bad wrapping with character count and help text. Still open: info button goes down after help text displayed.
parent 0c1f6a76
......@@ -921,8 +921,7 @@ abstract class AbstractBuildForm {
$json = $this->getFormElementForJson($htmlFormElementName, $value, $formElement);
$input = "$htmlTag $attribute>$textarea";
$input = "$htmlTag $attribute>$textarea" . $this->getHelpBlock();
if ($extraButton !== '') {
......@@ -931,13 +930,18 @@ abstract class AbstractBuildForm {
} else {
$input = Support::wrapTag('<div class="input-group">', $input . $extraButton);
}
}
$input .= $elementCharacterCount;
if ($extraButton !== '') {
if (!empty($formElement[FE_INPUT_EXTRA_BUTTON_INFO])) {
$input .= $formElement[FE_INPUT_EXTRA_BUTTON_INFO];
}
}
return $input . $elementCharacterCount . $this->getHelpBlock();
return $input;
}
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment