Merge branch 'B9520ButtonSaveNotInsideFromBorder' into 'develop'

Button is seperated in own div with class row and col-md-12. Now it will be...

See merge request !377

extension/Classes/Core/BuildFormBootstrap.php

@@ -156,7 +156,7 @@ class BuildFormBootstrap extends AbstractBuildForm {
                 $class[] = 'qfq-form-no-title';
             }
         }
-        $html .= "<div " . Support::doAttribute('class', $class) . ">";
+        $html .= "<div " . Support::doAttribute('class', $class) .">";
 
         return $html;
     }
@@ -625,25 +625,6 @@ class BuildFormBootstrap extends AbstractBuildForm {
 
         $formId = $this->getFormId();
 
-        // Button Save at bottom of form - only if there is a button text given.
-        if ($this->formSpec[F_SUBMIT_BUTTON_TEXT] !== '') {
-
-            // Default setzen:
-            $this->fillWrapLabelInputNote($this->formSpec[F_BS_LABEL_COLUMNS], $this->formSpec[F_BS_INPUT_COLUMNS], $this->formSpec[F_BS_NOTE_COLUMNS]);
-
-            $buttonText = $this->formSpec[F_SUBMIT_BUTTON_TEXT];
-
-            $htmlElement = $this->buildButtonCode('save-button', $buttonText, $this->formSpec[F_SUBMIT_BUTTON_TOOLTIP],
-                $this->formSpec[F_SUBMIT_BUTTON_GLYPH_ICON], '', $this->formSpec[F_BUTTON_ON_CHANGE_CLASS],
-                $this->formSpec[F_SUBMIT_BUTTON_CLASS]);
-
-            $html .= $this->wrapItem(WRAP_SETUP_LABEL, '');
-            $html .= $this->wrapItem(WRAP_SETUP_INPUT, $htmlElement);
-            $html .= $this->wrapItem(WRAP_SETUP_NOTE, '');
-
-            $html = $this->wrapItem(WRAP_SETUP_ELEMENT, $html);
-        }
-
         $html .= '</div> <!--class="tab-content" -->';  //  <div class="tab-content">
 //        $html .= '<input type="submit" value="Submit">';
 
@@ -689,6 +670,39 @@ class BuildFormBootstrap extends AbstractBuildForm {
             })
          </script>
 EOF;
+
+        // Button Save at bottom of form - only if there is a button text given.
+        if ($this->formSpec[F_SUBMIT_BUTTON_TEXT] !== '') {
+
+            // Default setzen:
+            $this->fillWrapLabelInputNote($this->formSpec[F_BS_LABEL_COLUMNS], $this->formSpec[F_BS_INPUT_COLUMNS], $this->formSpec[F_BS_NOTE_COLUMNS]);
+
+            $buttonText = $this->formSpec[F_SUBMIT_BUTTON_TEXT];
+
+            $htmlElement = $this->buildButtonCode('save-button', $buttonText, $this->formSpec[F_SUBMIT_BUTTON_TOOLTIP],
+                $this->formSpec[F_SUBMIT_BUTTON_GLYPH_ICON], '', $this->formSpec[F_BUTTON_ON_CHANGE_CLASS],
+                $this->formSpec[F_SUBMIT_BUTTON_CLASS]);
+
+            //New save button style if save button text is given
+            $newButtonStyle = '<div class="row"><div class="col-md-12" style="height: 45px; padding-top: 8px;">';
+            $lastDiv = '</div></div>';
+
+            //finish elements and close tag-form befour wrapping save button
+            $html = $this->wrapItem(WRAP_SETUP_ELEMENT, $html);
+
+            $html .= $newButtonStyle;
+            $html .= $this->wrapItem(WRAP_SETUP_LABEL, '');
+            $html .= $this->wrapItem(WRAP_SETUP_INPUT, $htmlElement);
+            $html .= $this->wrapItem(WRAP_SETUP_NOTE, '');
+            $html .= $lastDiv;
+
+        }
+
+
+
+
+
+
         $html .= '</div>';  //  <div class="container-fluid"> === main <div class=...> around everything
 
         return $html;

less/qfq-bs.css.less

@@ -489,7 +489,6 @@ select.qfq-locked:invalid {
 /* adjust BS padding of input elements: center */
 .form-group {
   padding-top: 5px;
-  padding-bottom: 5px;
   margin-bottom: 0;
 }