Merge branch 'MDL-63573-master' of https://github.com/lucaboesch/moodle

moodle · Jan 22, 2019 · eca13fd · eca13fd
2 parents 3f64d5b + 8df785f
commit eca13fd
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 7 deletions.
diff --git a/lang/en/moodle.php b/lang/en/moodle.php
@@ -2166,8 +2166,6 @@
 $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
@@ -262,7 +262,7 @@
 }
 
 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 @@
         }
     }
 
-    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();