From 4b021492d6a0fbfae914eb3704f118b9ba3b58aa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Massart?= <fred@fmcorz.net>
Date: Mon, 10 Oct 2016 16:08:26 +0200
Subject: [PATCH] MDL-55732 theme_boost: Bulk user actions form adjustments

- The 'add' and 'remove' buttons consistently wrap on two lines
- Multiple select fields use the size attribute to set the options seen
---
 admin/user/user_bulk_forms.php                             | 6 ++++--
 .../templates/core_form/element-select-inline.mustache     | 7 +++++--
 theme/boost/templates/core_form/element-select.mustache    | 7 +++++--
 3 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/admin/user/user_bulk_forms.php b/admin/user/user_bulk_forms.php
index dd410f446c0..ee71a22f253 100644
--- a/admin/user/user_bulk_forms.php
+++ b/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}';
diff --git a/theme/boost/templates/core_form/element-select-inline.mustache b/theme/boost/templates/core_form/element-select-inline.mustache
index 155f101b769..b4efcd2df71 100644
--- a/theme/boost/templates/core_form/element-select-inline.mustache
+++ b/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}}
diff --git a/theme/boost/templates/core_form/element-select.mustache b/theme/boost/templates/core_form/element-select.mustache
index 4ac65602434..7d479ce67ba 100644
--- a/theme/boost/templates/core_form/element-select.mustache
+++ b/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}}