Merge branch 'F6653-save-button-class-for-submit' into 'master'

Feature #6653 - Add save button class/glyphicon/tooltip for submit button

See merge request !85

extension/qfq/qfq/BuildFormBootstrap.php

@@ -591,7 +591,9 @@ class BuildFormBootstrap extends AbstractBuildForm {
 
             $buttonText = $this->formSpec[F_SUBMIT_BUTTON_TEXT];
 
-            $htmlElement = $this->buildButtonCode('save-button', $buttonText, $buttonText, '', '', $this->formSpec[F_BUTTON_ON_CHANGE_CLASS], 'btn btn-default');
+            $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);

extension/qfq/qfq/Constants.php

@@ -889,6 +889,11 @@ const F_SAVE_BUTTON_TEXT = SYSTEM_SAVE_BUTTON_TEXT;
 const F_SAVE_BUTTON_TOOLTIP = SYSTEM_SAVE_BUTTON_TOOLTIP;
 const F_SAVE_BUTTON_CLASS = SYSTEM_SAVE_BUTTON_CLASS;
 const F_SAVE_BUTTON_GLYPH_ICON = SYSTEM_SAVE_BUTTON_GLYPH_ICON;
+// the following submitButton variables are only for internal use;
+// externally they are defined by the saveButton variables
+const F_SUBMIT_BUTTON_CLASS = 'submitButtonClass';
+const F_SUBMIT_BUTTON_GLYPH_ICON = 'submitButtonGlyphIcon';
+const F_SUBMIT_BUTTON_TOOLTIP = 'submitButtonToolTip';
 
 const F_CLOSE_BUTTON_TEXT = SYSTEM_CLOSE_BUTTON_TEXT;
 const F_CLOSE_BUTTON_TOOLTIP = SYSTEM_CLOSE_BUTTON_TOOLTIP;

extension/qfq/qfq/QuickFormQuery.php

@@ -865,6 +865,13 @@ class QuickFormQuery {
         $parameterLanguageFieldName = $this->store->getVar(SYSTEM_PARAMETER_LANGUAGE_FIELD_NAME, STORE_SYSTEM);
         $formSpec = HelperFormElement::setLanguage($formSpec, $parameterLanguageFieldName);
 
+        if (!empty($formSpec[F_SUBMIT_BUTTON_TEXT])) {
+            // set defaults for submit button (different from save button defaults)
+            $formSpec[F_SUBMIT_BUTTON_CLASS] = $formSpec[F_SAVE_BUTTON_CLASS] ?? 'btn btn-default';
+            $formSpec[F_SUBMIT_BUTTON_GLYPH_ICON] = $formSpec[F_SAVE_BUTTON_GLYPH_ICON] ?? '';
+            $formSpec[F_SUBMIT_BUTTON_TOOLTIP] = $formSpec[F_SAVE_BUTTON_TOOLTIP] ?? $formSpec[F_SUBMIT_BUTTON_TEXT];
+        }
+
         $formSpec = $this->syncSystemFormConfig($formSpec);
         $formSpec = $this->initForm($formSpec, $recordId);