MDL-11553, reducing the number of bulk user selection buttons and lang changes

diff --git a/admin/user/user_bulk_form.php b/admin/user/user_bulk_form.php
index bb8d4e02c41e1148fa7a29265046ebc334a2511b..6dd37892fb081c01c4b57d1e730d48bec3aa6f45 100644 (file)
--- a/admin/user/user_bulk_form.php
+++ b/admin/user/user_bulk_form.php
@@ -34,8 +34,6 @@ class user_bulk_form extends moodleform {
         $objs = array();
         $objs[] =& $mform->createElement('submit', 'addone', get_string('addsel', 'bulkusers'));
         $objs[] =& $mform->createElement('submit', 'addall', get_string('addall', 'bulkusers'));
-        $objs[] =& $mform->createElement('submit', 'removesel', get_string('removesel', 'bulkusers'));
-        $objs[] =& $mform->createElement('submit', 'removeall', get_string('removeall', 'bulkusers'));
         $objs[] =& $mform->createElement('submit', 'deletesel', get_string('deletesel', 'bulkusers'));
         $objs[] =& $mform->createElement('submit', 'deleteall', get_string('deleteall', 'bulkusers'));
         $grp =& $mform->addElement('group', 'buttonsgrp', get_string('selectedlist', 'bulkusers'), $objs, array(' ', '<br />'), false);
@@ -92,14 +90,6 @@ class user_bulk_form extends moodleform {
             if(!empty($data->ausers)) {
                 $SESSION->bulk_susers = array_merge($SESSION->bulk_susers, array_values($data->ausers));
             }
-        } else if(@$data->removeall) {
-            if(!empty($SESSION->bulk_ausers)) {
-                $SESSION->bulk_susers = array_diff($SESSION->bulk_susers, $SESSION->bulk_ausers);
-            }
-        } else if(@$data->removesel) {
-            if(!empty($data->susers)) {
-                $SESSION->bulk_susers = array_diff($SESSION->bulk_susers, array_values($data->susers));
-            }
         } else if(@$data->deletesel) {
             if(!empty($data->susers)) {
                 $SESSION->bulk_susers = array_diff($SESSION->bulk_susers, array_values($data->susers));

diff --git a/lang/en_utf8/bulkusers.php b/lang/en_utf8/bulkusers.php
index e77d74effb47842a6865faa785fba180af2e3973..97ba9dea9103d1e1647a14c08931281fa3cdede4 100644 (file)
--- a/lang/en_utf8/bulkusers.php
+++ b/lang/en_utf8/bulkusers.php
@@ -1,9 +1,7 @@
 <?php //$Id$
 $string['usersinlist'] = 'Users in list';
-$string['addall'] = 'Add all available users';
-$string['addsel'] = 'Add selected available users';
-$string['removeall'] = 'Remove all available users';
-$string['removesel'] = 'Remove selected users';
+$string['addall'] = 'Add all to selection';
+$string['addsel'] = 'Add to selection';
 $string['deleteall'] = 'Clear all users';
 $string['deletesel'] = 'Clear selected users';
 $string['available'] = 'Available';

diff --git a/lang/en_utf8/help/bulkusers/selectedlist.html b/lang/en_utf8/help/bulkusers/selectedlist.html
index d63f9fee8498a4f3f544deec7468703292ca78a1..606176763b7e8e0f027158f441ec752839e68d7f 100644 (file)
--- a/lang/en_utf8/help/bulkusers/selectedlist.html
+++ b/lang/en_utf8/help/bulkusers/selectedlist.html
@@ -1,11 +1,8 @@
 <h2>Selected user list...</h2>
 
 <ul>
-<li>Add selected available users - adds selected users from the Available list (on the left) to the Selected list (on the right).</li>
-<li>Add all available users - adds all users from the Available list (on the left) to the Selected list (on the right).</li>
-<li>Remove selected users - removes selected users from the Selected list (on the right).</li>
-<li>Remove all available users - removes all users from the Available list (on the left) from the Selected list (on the right).</li>
-<li>Clear selected users - removes selected users from the Selected list (on the right).</li>
-<li>Clear all users - removes all users from the Selected list (on the right).</li>
-
+<li>Add to selection - adds selected users from the Available list to the Selected list. Multiple users can be selected by holding down the Apple or Ctrl key whilst clicking on the users' names.</li>
+<li>Add all to selection - adds all users from the Available list to the Selected list.</li>
+<li>Clear selected users - removes selected users from the Selected list.</li>
+<li>Clear all users - removes all users from the Selected list.</li>
 </ul>