From 8af5201e7e24021b86092cd973fc12afa9dd28c0 Mon Sep 17 00:00:00 2001
From: David Mudrak <david.mudrak@gmail.com>
Date: Mon, 19 Jul 2010 17:27:39 +0000
Subject: [PATCH] MDL-21695 Replacing bulkusers help files

AMOS BEGIN
 HLP bulkusers/lists.html,[users_help,core_bulkusers]
 HLP bulkusers/selectedlist.html,[selectedlist_help,core_bulkusers]
AMOS END
---
 admin/user/user_bulk_forms.php           | 6 +++---
 lang/en/bulkusers.php                    | 9 +++++----
 lang/en/help/bulkusers/lists.html        | 6 ------
 lang/en/help/bulkusers/selectedlist.html | 9 ---------
 4 files changed, 8 insertions(+), 22 deletions(-)
 delete mode 100644 lang/en/help/bulkusers/lists.html
 delete mode 100644 lang/en/help/bulkusers/selectedlist.html

diff --git a/admin/user/user_bulk_forms.php b/admin/user/user_bulk_forms.php
index 1d3556aa54b..88a4516c88a 100644
--- a/admin/user/user_bulk_forms.php
+++ b/admin/user/user_bulk_forms.php
@@ -93,8 +93,8 @@ class user_bulk_form extends moodleform {
         $objs[1]->setMultiple(true);
 
 
-        $grp =& $mform->addElement('group', 'usersgrp', get_string('users'), $objs, ' ', false);
-        $mform->setHelpButton('usersgrp', array('lists', get_string('users'), 'bulkusers'));
+        $grp =& $mform->addElement('group', 'usersgrp', get_string('users', 'bulkusers'), $objs, ' ', false);
+        $mform->addHelpButton('usersgrp', 'users', 'bulkusers');
 
         $mform->addElement('static', 'comment');
 
@@ -104,7 +104,7 @@ class user_bulk_form extends moodleform {
         $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->setHelpButton('buttonsgrp', array('selectedlist', get_string('selectedlist', 'bulkusers'), 'bulkusers'));
+        $mform->addHelpButton('buttonsgrp', 'selectedlist', 'bulkusers');
 
         $renderer =& $mform->defaultRenderer();
         $template = '<label class="qflabel" style="vertical-align:top">{label}</label> {element}';
diff --git a/lang/en/bulkusers.php b/lang/en/bulkusers.php
index cbe52ab93e2..28571d25a83 100644
--- a/lang/en/bulkusers.php
+++ b/lang/en/bulkusers.php
@@ -16,11 +16,12 @@
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
 /**
- * Strings for component 'bulkusers', language 'en', branch 'MOODLE_20_STABLE'
+ * Strings for core component 'bulkusers'
  *
- * @package   bulkusers
- * @copyright 1999 onwards Martin Dougiamas  {@link http://moodle.com}
- * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ * @package    core
+ * @subpackage bulkusers
+ * @copyright  1999 onwards Martin Dougiamas  {@link http://moodle.com}
+ * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 
 $string['addall'] = 'Add all';
diff --git a/lang/en/help/bulkusers/lists.html b/lang/en/help/bulkusers/lists.html
deleted file mode 100644
index fe229b56123..00000000000
--- a/lang/en/help/bulkusers/lists.html
+++ /dev/null
@@ -1,6 +0,0 @@
-<h2>User lists</h2>
-
-<p>The <strong>Available</strong> list contains the users who passed the active filters. For example, if the Active filters sections contains only one filter for users which country is Romania, then the Available list contains only users which have set Romania as their country in the profile page.</p>
-
-<p>The <strong>Selected</strong> list contains the users who have been added to this list by you, using the buttons from the <em>Selected user list...</em> section. When the <em>Go</em> button from the <em>With selected users...</em> is pressed, the operation selected in this section will be performed on the users from this list.</p>
-
diff --git a/lang/en/help/bulkusers/selectedlist.html b/lang/en/help/bulkusers/selectedlist.html
deleted file mode 100644
index 1a11a5b556c..00000000000
--- a/lang/en/help/bulkusers/selectedlist.html
+++ /dev/null
@@ -1,9 +0,0 @@
-<h2>Selected user list...</h2>
-
-<ul>
-<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 - adds all users from the Available list to the Selected list.</li>
-<li>Remove from selection - removes selected users from the Selected list.</li>
-<li>Remove all - removes all users from the Selected list.</li>
-</ul>