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

B6176 / Icon not aligned when error text: Buttons now wrapped in one 'input-group'

parent 33d786c9
......@@ -335,11 +335,9 @@ class HelperFormElement {
// INFO: $showinline =- TRUE ('input' elemente)
if (isset($formElement[FE_INPUT_EXTRA_BUTTON_INFO]) && $showInline) {
$extraButton .= <<<EOF
<div class="input-group-btn">
<button class="btn btn-info" onclick="$('#$id-extra-info').slideToggle('swing')">
$infoSymbolInside
</button>
</div>
<button class="btn btn-info" onclick="$('#$id-extra-info').slideToggle('swing')">
$infoSymbolInside
</button>
EOF;
$value = $formElement[FE_INPUT_EXTRA_BUTTON_INFO];
......@@ -379,12 +377,10 @@ EOF;
$formElement[FE_MODE] = FE_MODE_READONLY;
$extraButton .= <<<EOF
<div class="input-group-btn">
<button class="btn btn-info"
onclick="$('#$id').prop('readonly',!$('#$id').prop('readonly'))">
<span class="glyphicon glyphicon-lock" aria-hidden="true"></span>
</button>
</div>
<button class="btn btn-info"
onclick="$('#$id').prop('readonly',!$('#$id').prop('readonly'))">
<span class="glyphicon glyphicon-lock" aria-hidden="true"></span>
</button>
EOF;
}
......@@ -394,16 +390,14 @@ EOF;
$formElement[FE_TYPE] = 'password';
$extraButton .= <<<EOF
<div class="input-group-btn">
<button class="btn btn-info"
onclick="$('#$id').attr('type',$('#$id').attr('type')==='password' ? 'text': 'password')">
<span class="glyphicon glyphicon-eye-open" aria-hidden="true"></span>
</button>
</div>
<button class="btn btn-info"
onclick="$('#$id').attr('type',$('#$id').attr('type')==='password' ? 'text': 'password')">
<span class="glyphicon glyphicon-eye-open" aria-hidden="true"></span>
</button>
EOF;
}
$formElement[FE_TMP_EXTRA_BUTTON_HTML] = $extraButton;
$formElement[FE_TMP_EXTRA_BUTTON_HTML] = Support::wrapTag('<div class="input-group-btn">', $extraButton, true);
Support::setIfNotSet($formElement, FE_INPUT_EXTRA_BUTTON_INFO);
return $formElement;
......
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