Commit 25447b34 authored by Carsten  Rose's avatar Carsten Rose
Browse files

Merge branch 'master' into B8091CheckBoxRequired

parents 4ce1908a 08437f5e
......@@ -39,4 +39,5 @@ Software distributed together with QFQ
* TinyMCE - https://github.com/tinymce/tinymce
* Twig - https://twig.symfony.com
* Twitter typeahead JS - https://twitter.github.io/typeahead.js/
* bootstrap-validator.js - https://github.com/1000hz/bootstrap-validator
* Event Emitter - https://git.io/ee
\ No newline at end of file
......@@ -382,7 +382,7 @@ class HelperFormElement {
// INFO: $showinline =- TRUE ('input' elemente)
if (isset($formElement[FE_INPUT_EXTRA_BUTTON_INFO]) && $showInline) {
$extraButton .= <<<EOF
<button class="btn btn-info" onclick="$('#$id-extra-info').slideToggle('swing')">
<button type="button" class="btn btn-info" onclick="$('#$id-extra-info').slideToggle('swing')">
$infoSymbolInside
</button>
EOF;
......@@ -446,7 +446,8 @@ EOF;
EOF;
}
$formElement[FE_TMP_EXTRA_BUTTON_HTML] = Support::wrapTag('<div class="input-group-btn" style="font-size: 1em;">', $extraButton, true);
// $formElement[FE_TMP_EXTRA_BUTTON_HTML] = Support::wrapTag('<div class="input-group-btn" style="font-size: 1em;">', $extraButton, true);
$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