Replace buttons with button groups

main/exercice/multiple_answer.class.php

@@ -141,17 +141,17 @@ class MultipleAnswer extends Question
 
         $form->add_multiple_required_rule($boxes_names, get_lang('ChooseAtLeastOneCheckbox'), 'multiple_required');
 
+        $buttonGroup = [];
+
         global $text, $class;
         if ($obj_ex->edit_exercise_in_lp == true) {
             // setting the save button here and not in the question class.php
-            $form->addButtonDelete(get_lang('LessAnswer'), 'lessAnswers');
-            $form->addButtonCreate(get_lang('PlusAnswer'), 'moreAnswers');
-            $form->addButtonSave($text, 'submitQuestion');
+            $buttonGroup[] = $form->addButtonDelete(get_lang('LessAnswer'), 'lessAnswers', true);
+            $buttonGroup[] = $form->addButtonCreate(get_lang('PlusAnswer'), 'moreAnswers', true);
+            $buttonGroup[] = $form->addButtonSave($text, 'submitQuestion', true);
         }
 
-        $renderer->setElementTemplate('<div class="form-group"><div class="col-sm-offset-2">{element}', 'lessAnswers');
-        $renderer->setElementTemplate('{element}', 'moreAnswers');
-        $renderer->setElementTemplate('{element}</div></div>', 'submitQuestion');
+        $form->addGroup($buttonGroup);
 
         $defaults['correct'] = $correct;
 

main/exercice/multiple_answer_combination.class.php

@@ -153,23 +153,35 @@ class MultipleAnswerCombination extends Question
         global $text, $class;
         //ie6 fix
         if ($obj_ex->edit_exercise_in_lp == true) {
+            $buttonGroup = [];
+
             if ($navigator_info['name'] == 'Internet Explorer' && $navigator_info['version'] == '6') {
-                $form->addElement('submit', 'lessAnswers', get_lang('LessAnswer'), 'class="btn minus"');
-                $form->addElement('submit', 'moreAnswers', get_lang('PlusAnswer'), 'class="btn plus"');
-                $form->addElement('submit', 'submitQuestion', $text, 'class="' . $class . '"');
+                $buttonGroup[] = $form->createElement(
+                    'submit',
+                    'lessAnswers',
+                    get_lang('LessAnswer'),
+                    'class="btn minus"'
+                );
+                $buttonGroup[] = $form->createElement(
+                    'submit',
+                    'moreAnswers',
+                    get_lang('PlusAnswer'),
+                    'class="btn plus"'
+                );
+                $buttonGroup[] = $form->createElement(
+                    'submit',
+                    'submitQuestion',
+                    $text,
+                    'class="' . $class . '"'
+                );
             } else {
                 // setting the save button here and not in the question class.php
-                $form->addButtonDelete(get_lang('LessAnswer'), 'lessAnswers');
-                $form->addButtonCreate(get_lang('PlusAnswer'), 'moreAnswers');
-                $form->addButtonSave($text, 'submitQuestion');
+                $buttonGroup[] = $form->addButtonDelete(get_lang('LessAnswer'), 'lessAnswers', true);
+                $buttonGroup[] = $form->addButtonCreate(get_lang('PlusAnswer'), 'moreAnswers', true);
+                $buttonGroup[] = $form->addButtonSave($text, 'submitQuestion', true);
             }
 
-            $renderer->setElementTemplate(
-                '<div class="form-group"><div class="col-sm-offset-2 col-sm-10">{element}',
-                'lessAnswers'
-            );
-            $renderer->setElementTemplate('{element}', 'moreAnswers');
-            $renderer->setElementTemplate('{element}</div></div>', 'submitQuestion');
+            $form->addGroup($buttonGroup);
         }
 
         $defaults['correct'] = $correct;

main/exercice/unique_answer.class.php

@@ -265,38 +265,32 @@ class UniqueAnswer extends Question
 
         global $text, $class;
 
+        $buttonGroup = [];
         //ie6 fix
         if ($obj_ex->edit_exercise_in_lp == true) {
             if ($navigator_info['name'] == 'Internet Explorer' && $navigator_info['version'] == '6') {
-                $form->addElement(
+                $buttonGroup[] = $form->createElement(
                     'submit',
                     'lessAnswers',
                     get_lang('LessAnswer'),
                     'class="btn btn-primary"'
                 );
-                $form->addElement(
+                $buttonGroup[] = $form->createElement(
                     'submit',
                     'moreAnswers',
                     get_lang('PlusAnswer'),
                     'class="btn btn-primary"'
                 );
-                $form->addElement(
-                    'submit',
-                    'submitQuestion',
-                    $text,
-                    'class="' . $class . '"'
-                );
+                $buttonGroup[] = $form->createElement('submit', 'submitQuestion', $text, 'class="' . $class . '"');
             } else {
                 //setting the save button here and not in the question class.php
-                $form->addButtonDelete(get_lang('LessAnswer'), 'lessAnswers');
-                $form->addButtonCreate(get_lang('PlusAnswer'), 'moreAnswers');
-                $form->addButtonSave($text, 'submitQuestion');
+                $buttonGroup[] = $form->addButtonDelete(get_lang('LessAnswer'), 'lessAnswers', true);
+                $buttonGroup[] = $form->addButtonCreate(get_lang('PlusAnswer'), 'moreAnswers', true);
+                $buttonGroup[] = $form->addButtonSave($text, 'submitQuestion', true);
             }
-        }
 
-        $renderer->setElementTemplate('<div class="form-group"><div class="col-sm-offset-2">{element}', 'lessAnswers');
-        $renderer->setElementTemplate('{element}', 'moreAnswers');
-        $renderer->setElementTemplate('{element}</div></div>', 'submitQuestion');
+            $form->addGroup($buttonGroup);
+        }
 
         // We check the first radio button to be sure a radio button will be check
         if ($correct == 0) {