From 8df785f9e9c65ef7eafc644cb62f1e0c97f8dbf6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Luca=20B=C3=B6sch?= <luca.boesch@bfh.ch>
Date: Mon, 8 Oct 2018 10:26:20 +0200
Subject: [PATCH] MDL-63573 core_user: remove 'With selected users...' help
 icon.

---
 lang/en/moodle.php |  2 --
 user/index.php     | 11 ++++++-----
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/lang/en/moodle.php b/lang/en/moodle.php
index 9e42a4336b9..7d3dab18667 100644
--- a/lang/en/moodle.php
+++ b/lang/en/moodle.php
@@ -2166,8 +2166,6 @@ $string['withchosenfiles'] = 'With chosen files';
 $string['withdisablednote'] = '{$a} (disabled)';
 $string['withoutuserdata'] = 'without user data';
 $string['withselectedusers'] = 'With selected users...';
-$string['withselectedusers_help'] = '* Send message - For sending a message to one or more participants
-* Add a new note - For adding a note to a selected participant';
 $string['withuserdata'] = 'with user data';
 $string['wordforstudent'] = 'Your word for Student';
 $string['wordforstudenteg'] = 'eg Student, Participant etc';
diff --git a/user/index.php b/user/index.php
index e7e05b22035..0d65fd8cb38 100644
--- a/user/index.php
+++ b/user/index.php
@@ -262,7 +262,7 @@ if ($perpage == SHOW_ALL_PAGE_SIZE && $participanttable->totalrows > DEFAULT_PAG
 }
 
 if ($bulkoperations) {
-    echo '<br /><div class="buttons">';
+    echo '<br /><div class="buttons"><div class="form-inline">';
 
     if ($participanttable->get_page_size() < $participanttable->totalrows) {
         $perpageurl = clone($baseurl);
@@ -337,15 +337,16 @@ if ($bulkoperations) {
         }
     }
 
-    echo $OUTPUT->help_icon('withselectedusers');
-    echo html_writer::tag('label', get_string("withselectedusers"), array('for' => 'formactionid'));
-    echo html_writer::select($displaylist, 'formaction', '', array('' => 'choosedots'), array('id' => 'formactionid'));
+    echo html_writer::tag('div', html_writer::tag('label', get_string("withselectedusers"),
+        array('for' => 'formactionid', 'class' => 'col-form-label d-inline')) .
+        html_writer::select($displaylist, 'formaction', '', array('' => 'choosedots'), array('id' => 'formactionid')),
+        array('class' => 'ml-2'));
 
     echo '<input type="hidden" name="id" value="'.$course->id.'" />';
     echo '<noscript style="display:inline">';
     echo '<div><input type="submit" value="'.get_string('ok').'" /></div>';
     echo '</noscript>';
-    echo '</div></div>';
+    echo '</div></div></div>';
     echo '</form>';
 
     $options = new stdClass();