Merge branch 'master' into B8091CheckBoxRequired

Documentation/License.rst

@@ -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

extension/Classes/Core/Helper/HelperFormElement.php

@@ -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;