Merge branch 'MDL-55732-master' of git://github.com/damyon/moodle

admin/user/user_bulk_forms.php

@@ -101,10 +101,12 @@ class user_bulk_form extends moodleform {
         $objs = array();
         $objs[] =& $mform->createElement('submit', 'addsel', get_string('addsel', 'bulkusers'));
         $objs[] =& $mform->createElement('submit', 'removesel', get_string('removesel', 'bulkusers'));
+        $grp =& $mform->addElement('group', 'buttonsgrp', get_string('selectedlist', 'bulkusers'), $objs, null, false);
+        $mform->addHelpButton('buttonsgrp', 'selectedlist', 'bulkusers');
+        $objs = array();
         $objs[] =& $mform->createElement('submit', 'addall', get_string('addall', 'bulkusers'));
         $objs[] =& $mform->createElement('submit', 'removeall', get_string('removeall', 'bulkusers'));
-        $grp =& $mform->addElement('group', 'buttonsgrp', get_string('selectedlist', 'bulkusers'), $objs, array(' ', '<br />'), false);
-        $mform->addHelpButton('buttonsgrp', 'selectedlist', 'bulkusers');
+        $grp =& $mform->addElement('group', 'buttonsgrp2', '', $objs, null, false);
 
         $renderer =& $mform->defaultRenderer();
         $template = '<label class="qflabel" style="vertical-align:top">{label}</label> {element}';

lib/form/group.php

@@ -166,6 +166,7 @@ class MoodleQuickForm_group extends HTML_QuickForm_group implements templatable
 
         $elements = [];
         $name = $this->getName();
+        $i = 0;
         foreach ($this->_elements as $key => $element) {
             $elementname = '';
             if ($this->_appendName) {
@@ -186,12 +187,30 @@ class MoodleQuickForm_group extends HTML_QuickForm_group implements templatable
                 $element->accept($renderer);
                 $out = $renderer->toHtml();
             }
-            $elements[] = $out;
+
+            // Replicates the separator logic from 'pear/HTML/QuickForm/Renderer/Default.php'.
+            $separator = '';
+            if ($i > 0) {
+                if (is_array($this->_separator)) {
+                    $separator = $this->_separator[($i - 1) % count($this->_separator)];
+                } else if ($this->_separator === null) {
+                    $separator = ' ';
+                } else {
+                    $separator = (string) $this->_separator;
+                }
+            }
+
+            $elements[] = [
+                'separator' => $separator,
+                'html' => $out
+            ];
+
             // Restore the element's name.
             if ($this->_appendName) {
                 $element->setName($elementname);
             }
 
+            $i++;
         }
 
         $context['elements'] = $elements;

theme/boost/templates/core_form/element-date_selector.mustache

@@ -2,7 +2,8 @@
     {{$element}}
         <div class="fdate_selector">
         {{#element.elements}}
-            {{{.}}}
+            {{{separator}}}
+            {{{html}}}
         {{/element.elements}}
         </div>
     {{/element}}

theme/boost/templates/core_form/element-date_time_selector-inline.mustache

@@ -2,7 +2,8 @@
     {{$element}}
         <div class="fdate_time_selector">
         {{#element.elements}}
-            {{{.}}}
+            {{{separator}}}
+            {{{html}}}
         {{/element.elements}}
         </div>
     {{/element}}

theme/boost/templates/core_form/element-date_time_selector.mustache

@@ -2,7 +2,8 @@
     {{$element}}
         <div class="fdate_time_selector">
         {{#element.elements}}
-            {{{.}}}
+            {{{separator}}}
+            {{{html}}}
         {{/element.elements}}
         </div>
     {{/element}}

theme/boost/templates/core_form/element-group-inline.mustache

@@ -1,7 +1,8 @@
 {{< core_form/element-template-inline }}
     {{$element}}
         {{#element.elements}}
-            {{{.}}}
+            {{{separator}}}
+            {{{html}}}
         {{/element.elements}}
     {{/element}}
 {{/ core_form/element-template-inline }}

theme/boost/templates/core_form/element-group.mustache

@@ -1,7 +1,8 @@
 {{< core_form/element-template }}
     {{$element}}
         {{#element.elements}}
-            {{{.}}}
+            {{{separator}}}
+            {{{html}}}
         {{/element.elements}}
     {{/element}}
 {{/ core_form/element-template }}

theme/boost/templates/core_form/element-select-inline.mustache

@@ -1,9 +1,12 @@
 {{< core_form/element-template-inline }}
     {{$element}}
         {{^element.frozen}}
-    <select class="custom-select {{#error}}form-control-danger{{/error}}" name="{{element.name}}"
+    <select class="{{^element.multiple}}custom-select{{/element.multiple}}
+                   {{#element.multiple}}form-control{{/element.multiple}}
+                   {{#error}}form-control-danger{{/error}}"
+        name="{{element.name}}"
         id="{{element.id}}"
-        {{#element.multiple}}multiple{{/element.multiple}}
+        {{#element.multiple}}multiple size="{{element.size}}"{{/element.multiple}}
         {{#error}}
             autofocus aria-describedby="id_error_{{element.name}}"
         {{/error}}

theme/boost/templates/core_form/element-select.mustache

@@ -1,9 +1,12 @@
 {{< core_form/element-template }}
     {{$element}}
         {{^element.frozen}}
-        <select class="custom-select {{#error}}form-control-danger{{/error}}" name="{{element.name}}"
+        <select class="{{^element.multiple}}custom-select{{/element.multiple}}
+                       {{#element.multiple}}form-control{{/element.multiple}}
+                       {{#error}}form-control-danger{{/error}}"
+            name="{{element.name}}"
             id="{{element.id}}"
-            {{#element.multiple}}multiple{{/element.multiple}}
+            {{#element.multiple}}multiple size="{{element.size}}"{{/element.multiple}}
             {{#error}}
                 autofocus aria-describedby="id_error_{{element.name}}"
             {{/error}}